Changeset 1117 for trunk/src/kmk/kmkbuiltin/cmp_regular.c

Timestamp:

Sep 25, 2007, 7:03:31 AM (18 years ago)

Author:

bird

Message:

kmk_builtin_cmp.

File:

• trunk/src/kmk/kmkbuiltin/cmp_regular.c (modified) (7 diffs, 1 prop)

trunk/src/kmk/kmkbuiltin/cmp_regular.c

@@ -30 +30 @@
  */
 
-#include <sys/cdefs.h>
+/*#include <sys/cdefs.h>*/
 #ifndef lint
-#if 0
+/*#if 0
 static char sccsid[] = "@(#)regular.c   8.3 (Berkeley) 4/2/94";
 #else
 __RCSID("$NetBSD: regular.c,v 1.20 2006/06/03 21:47:55 christos Exp $");
-#endif
+#endif*/
 #endif /* not lint */
 
@@ -43 +43 @@
 #include <sys/stat.h>
 
-#include <err.h>
+#include "err.h"
 #include <limits.h>
 #include <stdlib.h>
@@ -49 +49 @@
 #include <string.h>
 
-#include "extern.h"
+#include "cmp_extern.h"
 
-void
+static int
 c_regular(int fd1, char *file1, off_t skip1, off_t len1,
     int fd2, char *file2, off_t skip2, off_t len2)
 {
-        u_char ch, *p1, *p2;
+        u_char ch, *p1, *p2, *b1, *b2;
         off_t byte, length, line;
         int dfound;
@@ -61 +61 @@
 
         if (sflag && len1 != len2)
-                exit(1);
+                return(1);
 
         if (skip1 > len1)
-                eofmsg(file1, len1 + 1, 0);
+                return eofmsg(file1, len1 + 1, 0);
         len1 -= skip1;
         if (skip2 > len2)
-                eofmsg(file2, len2 + 1, 0);
+                return eofmsg(file2, len2 + 1, 0);
         len2 -= skip2;
 
@@ -76 +76 @@
                 if (blk_sz > length)
                         blk_sz = length;
-                p1 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
+                b1 = p1 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
                     fd1, skip1);
                 if (p1 == MAP_FAILED)
                         goto mmap_failed;
 
-                p2 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
+                b2 = p2 = mmap(NULL, blk_sz, PROT_READ, MAP_FILE|MAP_SHARED,
                     fd2, skip2);
                 if (p2 == MAP_FAILED) {
@@ -92 +92 @@
                         if ((ch = *p1) != *p2) {
                                 if (!lflag) {
-                                        diffmsg(file1, file2, byte, line);
-                                        /* NOTREACHED */
+                                        munmap(b1, blk_sz);
+                                        munmap(b2, blk_sz);
+                                        return diffmsg(file1, file2, byte, line);
                                 }
                                 dfound = 1;
@@ -109 +110 @@
 
         if (len1 != len2)
-                eofmsg(len1 > len2 ? file2 : file1, byte, line);
+                return eofmsg(len1 > len2 ? file2 : file1, byte, line);
         if (dfound)
-                exit(DIFF_EXIT);
-        return;
+                return(DIFF_EXIT);
+        return(0);
 
 mmap_failed:
-        c_special(fd1, file1, skip1, fd2, file2, skip2);
+        return c_special(fd1, file1, skip1, fd2, file2, skip2);
 }
+