Wrap a table (bg set to black, width=80%) around the screenshot

[oweals/busybox.git] / grep.c

diff --git a/grep.c b/grep.c
index 10ad76c46a17acf49723cd92c49b4b6e4a5c3f7c..320655bf4eb71b1c17f32a6d1d642c40acec9890 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1,8 +1,8 @@
 /*
  * Mini grep implementation for busybox using libc regex.
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Mark Whitley <markw@lineo.com>, <markw@enol.com>
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
+ * Written by Mark Whitley <markw@lineo.com>, <markw@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,9 @@
 #include <regex.h>
 #include <string.h> /* for strerror() */
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
+
+extern void xregcomp(regex_t *preg, const char *regex, int cflags);
 
 extern int optind; /* in unistd.h */
 extern int errno;  /* for use with strerror() */
@@ -42,18 +44,21 @@ static int suppress_err_msgs = 0;
 
 /* globals */
 static regex_t regex; /* storage space for compiled regular expression */
-static int nmatches = 0; /* keeps track of the number of matches */
+static int matched; /* keeps track of whether we ever matched */
 static char *cur_file = NULL; /* the current file we are reading */
 
 
 static void print_matched_line(char *line, int linenum)
 {
+       if (print_count_only)
+               return;
+
        if (print_filename)
                printf("%s:", cur_file);
        if (print_line_num)
                printf("%i:", linenum);
 
-       printf("%s", line);
+       puts(line);
 }
 
 static void grep_file(FILE *file)
@@ -61,8 +66,11 @@ static void grep_file(FILE *file)
        char *line = NULL;
        int ret;
        int linenum = 0;
+       int nmatches = 0;
 
        while ((line = get_line_from_file(file)) != NULL) {
+               if (line[strlen(line)-1] == '\n')
+                       line[strlen(line)-1] = '\0';
                linenum++;
                ret = regexec(&regex, line, 0, NULL, 0);
                if (ret == 0 && !invert_search) { /* match */
@@ -75,16 +83,17 @@ static void grep_file(FILE *file)
                        }
 
                        nmatches++;
+                       print_matched_line(line, linenum);
 
-                       if (!print_count_only)
-                               print_matched_line(line, linenum);
-
-               } else if (ret == REG_NOMATCH && invert_search) {
+               }
+               else if (ret == REG_NOMATCH && invert_search) {
+                       if (be_quiet) {
+                               regfree(&regex);
+                               exit(0);
+                       }
 
                        nmatches++;
-                       
-                       if (!print_count_only)
-                               print_matched_line(line, linenum);
+                       print_matched_line(line, linenum);
                }
 
                free(line);
@@ -97,8 +106,9 @@ static void grep_file(FILE *file)
                printf("%i\n", nmatches);
        }
 
-       /* reset number of matches found to zero */
-       nmatches = 0;
+       /* record if we matched */
+       if (nmatches != 0)
+               matched = 1;
 }
 
 extern int grep_main(int argc, char **argv)
@@ -106,10 +116,6 @@ extern int grep_main(int argc, char **argv)
        int opt;
        int reflags;
 
-       /* do special-case option parsing */
-       if (argv[1] && (strcmp(argv[1], "--help") == 0))
-               usage(grep_usage);
-
        /* do normal option parsing */
        while ((opt = getopt(argc, argv, "iHhnqvsc")) > 0) {
                switch (opt) {
@@ -147,7 +153,7 @@ extern int grep_main(int argc, char **argv)
        /* compile the regular expression
         * we're not going to mess with sub-expressions, and we need to
         * treat newlines right. */
-       reflags = REG_NOSUB | REG_NEWLINE; 
+       reflags = REG_NOSUB; 
        if (ignore_case)
                reflags |= REG_ICASE;
        xregcomp(&regex, argv[optind], reflags);
@@ -161,7 +167,8 @@ extern int grep_main(int argc, char **argv)
         * stdin. Otherwise, we grep through all the files specified. */
        if (argv[optind+1] == NULL || (strcmp(argv[optind+1], "-") == 0)) {
                grep_file(stdin);
-       } else {
+       }
+       else {
                int i;
                FILE *file;
                for (i = optind + 1; i < argc; i++) {
@@ -169,8 +176,9 @@ extern int grep_main(int argc, char **argv)
                        file = fopen(cur_file, "r");
                        if (file == NULL) {
                                if (!suppress_err_msgs)
-                                       errorMsg("%s: %s\n", cur_file, strerror(errno));
-                       } else {
+                                       perror_msg("%s", cur_file);
+                       }
+                       else {
                                grep_file(file);
                                fclose(file);
                        }
@@ -179,7 +187,7 @@ extern int grep_main(int argc, char **argv)
 
        regfree(&regex);
 
-       if (nmatches == 0)
+       if (!matched)
                return 1;
 
        return 0;