commit 3de094e271ada070530f578d16362effb008b55f
author Hans Leidekker <hans@it.vu.nl> Mon Apr 14 21:34:45 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 14 21:34:45 2003 +0000
tree 64dd2e04bea3135f8c28faabf7151a185307de67
parent 5a96cbfc741e5c74f3fc1f54d3977d7e11234d4b

Handle multiline output from grep and don't grep for empty strings.

tools/c2man.pl

diff --git a/tools/c2man.pl b/tools/c2man.pl
index 6d23bed..8dedfdb 100755
--- a/tools/c2man.pl
+++ b/tools/c2man.pl
@@ -761,27 +761,29 @@
   # FIXME: If we have no parameters, make sure we have a PARAMS: None. section
 
   # Find header file
-  # FIXME: This sometimes gives the error "sh: <file>.h: Permission denied" - why?
   my $h_file = "";
-  my $tmp = "grep -s -l $comment->{COMMENT_NAME} @opt_header_file_list 2>/dev/null";
-  $tmp = `$tmp`;
-  my $exit_value  = $? >> 8;
-  if ($exit_value == 0)
+  if ($comment->{COMMENT_NAME} ne "")
   {
-    $tmp =~ s/\n.*//;
-    if ($tmp ne "")
-    {
-      $h_file = `basename $tmp`;
-    }
-  }
-  else
-  {
-    $tmp = "grep -s -l $comment->{ALT_NAME} @opt_header_file_list"." 2>/dev/null";
+    my $tmp = "grep -s -l $comment->{COMMENT_NAME} @opt_header_file_list 2>/dev/null";
     $tmp = `$tmp`;
-    $exit_value  = $? >> 8;
+    my $exit_value  = $? >> 8;
     if ($exit_value == 0)
     {
-      $tmp =~ s/\n.*//;
+      $tmp =~ s/\n.*//g;
+      if ($tmp ne "")
+      {
+        $h_file = `basename $tmp`;
+      }
+    }
+  }
+  elsif ($comment->{ALT_NAME} ne "")
+  {
+    my $tmp = "grep -s -l $comment->{ALT_NAME} @opt_header_file_list"." 2>/dev/null";
+    $tmp = `$tmp`;
+    my $exit_value  = $? >> 8;
+    if ($exit_value == 0)
+    {
+      $tmp =~ s/\n.*//g;
       if ($tmp ne "")
       {
         $h_file = `basename $tmp`;