From 3de094e271ada070530f578d16362effb008b55f Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Mon, 14 Apr 2003 21:34:45 +0000 Subject: [PATCH] Handle multiline output from grep and don't grep for empty strings. --- tools/c2man.pl | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 6d23bed7669..8dedfdbd2b2 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -761,27 +761,29 @@ sub process_comment # FIXME: If we have no parameters, make sure we have a PARAMS: None. section # Find header file - # FIXME: This sometimes gives the error "sh: .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`;