BSD 3 development

[unix-history] / usr / src / cmd / fgrep.c

diff --git a/usr/src/cmd/fgrep.c b/usr/src/cmd/fgrep.c
index 1c8eba9..ff48d94 100644 (file)
--- a/usr/src/cmd/fgrep.c
+++ b/usr/src/cmd/fgrep.c
@@ -78,7 +78,7 @@ char **argv;
                        continue;
 
                default:
                        continue;
 
                default:

-                       fprintf(stderr, "egrep: unknown flag\n");
+                       fprintf(stderr, "fgrep: unknown flag\n");

                        continue;
                }
 out:
                        continue;
                }
 out:


@@ -87,7 +87,7 @@ out:
        if (fflag) {
                wordf = fopen(*argv, "r");
                if (wordf==NULL) {
        if (fflag) {
                wordf = fopen(*argv, "r");
                if (wordf==NULL) {

-                       fprintf(stderr, "egrep: can't open %s\n", *argv);
+                       fprintf(stderr, "fgrep: can't open %s\n", *argv);

                        exit(2);
                }
        }
                        exit(2);
                }
        }


@@ -115,7 +115,7 @@ char *file;
        register char *p;
        register struct words *c;
        register ccount;
        register char *p;
        register struct words *c;
        register ccount;

-       char buf[1024];
+       char buf[BUFSIZ*2];

        int f;
        int failed, ecnt;
        char *nlp;
        int f;
        int failed, ecnt;
        char *nlp;


@@ -136,11 +136,11 @@ char *file;
        c = w;
        for (;;) {
                if (--ccount <= 0) {
        c = w;
        for (;;) {
                if (--ccount <= 0) {

-                       if (p == &buf[1024]) p = buf;
-                       if (p > &buf[512]) {
-                               if ((ccount = read(f, p, &buf[1024] - p)) <= 0) break;
+                       if (p == &buf[BUFSIZ*2]) p = buf;
+                       if (p > &buf[BUFSIZ]) {
+                               if ((ccount = read(f, p, &buf[BUFSIZ] - p)) <= 0) break;

                        }
                        }

-                       else if ((ccount = read(f, p, 512)) <= 0) break;
+                       else if ((ccount = read(f, p, BUFSIZ)) <= 0) break;

                        blkno++;
                }
                nstate:
                        blkno++;
                }
                nstate:


@@ -172,11 +172,11 @@ char *file;
                        while (*p++ != '\n') {
                                ecnt++;
                                   if (--ccount <= 0) {
                        while (*p++ != '\n') {
                                ecnt++;
                                   if (--ccount <= 0) {

-                                       if (p == &buf[1024]) p = buf;
-                                       if (p > &buf[512]) {
-                                               if ((ccount = read(f, p, &buf[1024] - p)) <= 0) break;
+                                       if (p == &buf[BUFSIZ*2]) p = buf;
+                                       if (p > &buf[BUFSIZ]) {
+                                               if ((ccount = read(f, p, &buf[BUFSIZ] - p)) <= 0) break;

                                        }
                                        }

-                                       else if ((ccount = read(f, p, 512)) <= 0) break;
+                                       else if ((ccount = read(f, p, BUFSIZ)) <= 0) break;

                                        blkno++;
                                   }
                        }
                                        blkno++;
                                   }
                        }


@@ -197,7 +197,7 @@ char *file;
                                        if (bflag) printf("%d:", blkno);
                                        if (nflag) printf("%ld:", lnum);
                                        if (p <= nlp) {
                                        if (bflag) printf("%d:", blkno);
                                        if (nflag) printf("%ld:", lnum);
                                        if (p <= nlp) {

-                                               while (nlp < &buf[1024]) putchar(*nlp++);
+                                               while (nlp < &buf[BUFSIZ*2]) putchar(*nlp++);

                                                nlp = buf;
                                        }
                                        while (nlp < p) putchar(*nlp++);
                                                nlp = buf;
                                        }
                                        while (nlp < p) putchar(*nlp++);