This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / bin / cat / cat.c

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 631f7c4..39196e2 100644 (file)
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -58,9 +58,13 @@ int bflag, eflag, nflag, sflag, tflag, vflag;
 int rval;
 char *filename;
 
 int rval;
 char *filename;
 

-void cook_args(), cook_buf(), raw_args(), raw_cat();
-void err __P((int, const char *, ...));
+void cook_args __P((char **));
+void cook_buf  __P((FILE *));
+void raw_args  __P((char **));
+void raw_cat   __P((int));
+void err       __P((int, const char *, ...));

 
 

+int

 main(argc, argv)
        int argc;
        char **argv;
 main(argc, argv)
        int argc;
        char **argv;


@@ -68,7 +72,7 @@ main(argc, argv)
        extern int optind;
        int ch;
 
        extern int optind;
        int ch;
 

-       while ((ch = getopt(argc, argv, "benstuv")) != EOF)
+       while ((ch = getopt(argc, argv, "benstuv")) != -1)

                switch (ch) {
                case 'b':
                        bflag = nflag = 1;      /* -b implies -n */
                switch (ch) {
                case 'b':
                        bflag = nflag = 1;      /* -b implies -n */


@@ -91,6 +95,7 @@ main(argc, argv)
                case 'v':
                        vflag = 1;
                        break;
                case 'v':
                        vflag = 1;
                        break;

+               default:

                case '?':
                        (void)fprintf(stderr,
                            "usage: cat [-benstuv] [-] [file ...]\n");
                case '?':
                        (void)fprintf(stderr,
                            "usage: cat [-benstuv] [-] [file ...]\n");


@@ -188,7 +193,7 @@ cook_buf(fp)
                        break;
        }
        if (ferror(fp)) {
                        break;
        }
        if (ferror(fp)) {

-               err(0, "%s: %s", strerror(errno));
+               err(0, "%s: %s", filename, strerror(errno));

                clearerr(fp);
        }
        if (ferror(stdout))
                clearerr(fp);
        }
        if (ferror(stdout))