BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.bin / cmp / cmp.c

diff --git a/usr/src/usr.bin/cmp/cmp.c b/usr/src/usr.bin/cmp/cmp.c
index 820d94e..dc6c64e 100644 (file)
--- a/usr/src/usr.bin/cmp/cmp.c
+++ b/usr/src/usr.bin/cmp/cmp.c
@@ -1,122 +1,146 @@
-static char *sccsid = "@(#)cmp.c       4.1 (Berkeley) %G%";
+/*
+ * Copyright (c) 1987, 1990, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)cmp.c      8.3 (Berkeley) 4/2/94";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <fcntl.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "extern.h"

 
 

-FILE   *file1,*file2;
-int    eflg;
-int    lflg    = 1;
-long   line    = 1;
-long   chr     = 0;
-long   skip1;
-long   skip2;
+int    lflag, sflag;

 
 

-long   otoi();
+static void usage __P((void));

 
 

+int

 main(argc, argv)
 main(argc, argv)

-char **argv;
+       int argc;
+       char *argv[];

 {
 {

-       register c1, c2;
-       char *arg;
-
-       if(argc < 3)
-               goto narg;
-       arg = argv[1];
-       if(arg[0] == '-' && arg[1] == 's') {
-               lflg--;
-               argv++;
-               argc--;
-       }
-       arg = argv[1];
-       if(arg[0] == '-' && arg[1] == 'l') {
-               lflg++;
-               argv++;
-               argc--;
-       }
-       if(argc < 3)
-               goto narg;
-       arg = argv[1];
-       if( arg[0]=='-' && arg[1]==0 )
-               file1 = stdin;
-       else if((file1 = fopen(arg, "r")) == NULL)
-               goto barg;
-       arg = argv[2];
-       if((file2 = fopen(arg, "r")) == NULL)
-               goto barg;
-       if (argc>3)
-               skip1 = otoi(argv[3]);
-       if (argc>4)
-               skip2 = otoi(argv[4]);
-       while (skip1) {
-               if ((c1 = getc(file1)) == EOF) {
-                       arg = argv[1];
-                       goto earg;
+       struct stat sb1, sb2;
+       off_t skip1, skip2;
+       int ch, fd1, fd2, special;
+       char *file1, *file2;
+
+       while ((ch = getopt(argc, argv, "-ls")) != EOF)
+               switch (ch) {
+               case 'l':               /* print all differences */
+                       lflag = 1;
+                       break;
+               case 's':               /* silent run */
+                       sflag = 1;
+                       break;
+               case '-':               /* stdin (must be after options) */
+                       --optind;
+                       goto endargs;
+               case '?':
+               default:
+                       usage();

                }
                }

-               skip1--;
+endargs:
+       argv += optind;
+       argc -= optind;
+
+       if (lflag && sflag)
+               errx(ERR_EXIT, "only one of -l and -s may be specified");
+
+       if (argc < 2 || argc > 4)
+               usage();
+
+       /* Backward compatibility -- handle "-" meaning stdin. */
+       special = 0;
+       if (strcmp(file1 = argv[0], "-") == 0) {
+               special = 1;
+               fd1 = 0;
+               file1 = "stdin";

        }
        }

-       while (skip2) {
-               if ((c2 = getc(file2)) == EOF) {
-                       arg = argv[2];
-                       goto earg;
-               }
-               skip2--;
+       else if ((fd1 = open(file1, O_RDONLY, 0)) < 0)
+               err(ERR_EXIT, "%s", file1);
+       if (strcmp(file2 = argv[1], "-") == 0) {
+               if (special)
+                       errx(ERR_EXIT,
+                               "standard input may only be specified once");
+               special = 1;
+               fd2 = 0;
+               file2 = "stdin";

        }
        }

+       else if ((fd2 = open(file2, O_RDONLY, 0)) < 0)
+               err(ERR_EXIT, "%s", file2);
+
+       skip1 = argc > 2 ? strtol(argv[2], NULL, 10) : 0;
+       skip2 = argc == 4 ? strtol(argv[3], NULL, 10) : 0;

 
 

-loop:
-       chr++;
-       c1 = getc(file1);
-       c2 = getc(file2);
-       if(c1 == c2) {
-               if (c1 == '\n')
-                       line++;
-               if(c1 == EOF) {
-                       if(eflg)
-                               exit(1);
-                       exit(0);
+       if (!special) {
+               if (fstat(fd1, &sb1))
+                       err(ERR_EXIT, "%s", file1);
+               if (!S_ISREG(sb1.st_mode))
+                       special = 1;
+               else {
+                       if (fstat(fd2, &sb2))
+                               err(ERR_EXIT, "%s", file2);
+                       if (!S_ISREG(sb2.st_mode))
+                               special = 1;

                }
                }

-               goto loop;

        }
        }

-       if(lflg == 0)
-               exit(1);
-       if(c1 == EOF) {
-               arg = argv[1];
-               goto earg;
-       }
-       if(c2 == EOF)
-               goto earg;
-       if(lflg == 1) {
-               printf("%s %s differ: char %ld, line %ld\n", argv[1], arg,
-                       chr, line);
-               exit(1);
-       }
-       eflg = 1;
-       printf("%6ld %3o %3o\n", chr, c1, c2);
-       goto loop;
-
-narg:
-       printf("cmp: arg count\n");
-       exit(2);
-
-barg:
-       if (lflg)
-       printf("cmp: cannot open %s\n", arg);
-       exit(2);
-
-earg:
-       printf("cmp: EOF on %s\n", arg);
-       exit(1);
+
+       if (special)
+               c_special(fd1, file1, skip1, fd2, file2, skip2);
+       else
+               c_regular(fd1, file1, skip1, sb1.st_size,
+                   fd2, file2, skip2, sb2.st_size);
+       exit(0);

 }
 
 }
 

-long otoi(s)
-char *s;
+static void
+usage()

 {
 {

-       long v;
-       int base;
-
-       v = 0;
-       base = 10;
-       if (*s == '0')
-               base = 8;
-       while(isdigit(*s))
-               v = v*base + *s++ - '0';
-       return(v);
+
+       (void)fprintf(stderr,
+           "usage: cmp [-l | s] file1 file2 [skip1 [skip2]]\n");
+       exit(ERR_EXIT);

 }
 }