/[grep]/grep/src/grep.c
ViewVC logotype

Diff of /grep/src/grep.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.86 by kasal, Tue Nov 23 10:00:48 2004 UTC revision 1.87 by kasal, Wed Dec 8 14:18:29 2004 UTC
# Line 677  prtext (char const *beg, char const *lim Line 677  prtext (char const *beg, char const *lim
677              --p;              --p;
678            while (p[-1] != eol);            while (p[-1] != eol);
679    
680        /* We only print the "--" separator if our output is        /* We print the "--" separator only if our output is
681           discontiguous from the last output in the file. */           discontiguous from the last output in the file. */
682        if ((out_before || out_after) && used && p != lastout)        if ((out_before || out_after) && used && p != lastout)
683          puts ("--");          puts ("--");
# Line 1123  Output control:\n\ Line 1123  Output control:\n\
1123        --label=LABEL         print LABEL as filename for standard input\n\        --label=LABEL         print LABEL as filename for standard input\n\
1124    -o, --only-matching       show only the part of a line matching PATTERN\n\    -o, --only-matching       show only the part of a line matching PATTERN\n\
1125    -q, --quiet, --silent     suppress all normal output\n\    -q, --quiet, --silent     suppress all normal output\n\
1126        --binary-files=TYPE   assume that binary files are TYPE\n\        --binary-files=TYPE   assume that binary files are TYPE;\n\
1127                              TYPE is 'binary', 'text', or 'without-match'\n\                              TYPE is `binary', `text', or `without-match'\n\
1128    -a, --text                equivalent to --binary-files=text\n\    -a, --text                equivalent to --binary-files=text\n\
1129    -I                        equivalent to --binary-files=without-match\n\    -I                        equivalent to --binary-files=without-match\n\
1130    -d, --directories=ACTION  how to handle directories\n\    -d, --directories=ACTION  how to handle directories;\n\
1131                              ACTION is 'read', 'recurse', or 'skip'\n\                              ACTION is `read', `recurse', or `skip'\n\
1132    -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n\    -D, --devices=ACTION      how to handle devices, FIFOs and sockets;\n\
1133                              ACTION is 'read' or 'skip'\n\                              ACTION is `read' or `skip'\n\
1134    -R, -r, --recursive       equivalent to --directories=recurse\n\    -R, -r, --recursive       equivalent to --directories=recurse\n\
1135        --include=PATTERN     files that match PATTERN will be examined\n\        --include=FILE_PATTERN  search only files that match FILE_PATTERN\n\
1136        --exclude=PATTERN     files that match PATTERN will be skipped.\n\        --exclude=FILE_PATTERN  skip files and directories matching FILE_PATTERN\n\
1137        --exclude-from=FILE   files that match PATTERN in FILE will be skipped.\n\        --exclude-from=FILE   skip files matching any file pattern from FILE\n\
1138    -L, --files-without-match only print FILE names containing no match\n\    -L, --files-without-match print only names of FILEs containing no match\n\
1139    -l, --files-with-matches  only print FILE names containing matches\n\    -l, --files-with-matches  print only names of FILEs containing matches\n\
1140    -c, --count               only print a count of matching lines per FILE\n\    -c, --count               print only a count of matching lines per FILE\n\
1141    -Z, --null                print 0 byte after FILE name\n"));    -Z, --null                print 0 byte after FILE name\n"));
1142        printf (_("\        printf (_("\
1143  \n\  \n\
# Line 1147  Context control:\n\ Line 1147  Context control:\n\
1147    -C, --context=NUM         print NUM lines of output context\n\    -C, --context=NUM         print NUM lines of output context\n\
1148    -NUM                      same as --context=NUM\n\    -NUM                      same as --context=NUM\n\
1149        --color[=WHEN],\n\        --color[=WHEN],\n\
1150        --colour[=WHEN]       use markers to distinguish the matching string\n\        --colour[=WHEN]       use markers to distinguish the matching string;\n\
1151                              WHEN may be `always', `never' or `auto'.\n\                              WHEN may be `always', `never', or `auto'\n\
1152    -U, --binary              do not strip CR characters at EOL (MSDOS)\n\    -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
1153    -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\    -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\
1154  \n\  \n\
1155  `egrep' means `grep -E'.  `fgrep' means `grep -F'.\n\  `egrep' means `grep -E'.  `fgrep' means `grep -F'.\n\
1156  With no FILE, or when FILE is -, read standard input.  If less than\n\  With no FILE, or when FILE is -, read standard input.  If less than two FILEs\n\
1157  two FILEs given, assume -h.  Exit status is 0 if match, 1 if no match,\n\  are given, assume -h.  Exit status is 0 if any line was selected, 1 otherwise;\n\
1158  and 2 if trouble.\n"));  if any error occurs and -q was not given, the exit status is 2.\n"));
1159        printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);        printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
1160      }      }
1161    exit (status);    exit (status);

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.87

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26