[src/trunk]: src/dist/file merge local changes

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e92c30fb4e58
branches:  trunk
changeset: 543371:e92c30fb4e58
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Feb 23 23:34:21 2003 +0000

description:
merge local changes

diffstat:

 dist/file/apprentice.c       |  6 +++---
 dist/file/file.c             |  6 +++---
 dist/file/magdir/elf         |  2 ++
 dist/file/magdir/filesystems |  4 ++++
 dist/file/magdir/macintosh   |  4 ++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diffs (101 lines):

diff -r 7cdf67352d45 -r e92c30fb4e58 dist/file/apprentice.c
--- a/dist/file/apprentice.c    Sun Feb 23 23:30:39 2003 +0000
+++ b/dist/file/apprentice.c    Sun Feb 23 23:34:21 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apprentice.c,v 1.1.1.1 2003/02/23 23:08:23 pooka Exp $ */
+/*     $NetBSD: apprentice.c,v 1.2 2003/02/23 23:34:21 pooka Exp $     */
 
 /*
  * apprentice - make one pass through /etc/magic, learning its secrets.
@@ -43,7 +43,7 @@
 #if 0
 FILE_RCSID("@(#)Id: apprentice.c,v 1.49 2002/07/03 19:00:41 christos Exp ")
 #else
-__RCSID("$NetBSD: apprentice.c,v 1.1.1.1 2003/02/23 23:08:23 pooka Exp $");
+__RCSID("$NetBSD: apprentice.c,v 1.2 2003/02/23 23:34:21 pooka Exp $");
 #endif
 #endif /* lint */
 
@@ -237,7 +237,7 @@
        }
 
         maxmagic = MAXMAGIS;
-       *magicp = (struct magic *) calloc(sizeof(struct magic), maxmagic);
+       *magicp = (struct magic *) calloc(maxmagic, sizeof(struct magic));
        if (*magicp == NULL) {
                (void) fprintf(stderr, "%s: Out of memory (%s).\n", progname,
                    strerror(errno));
diff -r 7cdf67352d45 -r e92c30fb4e58 dist/file/file.c
--- a/dist/file/file.c  Sun Feb 23 23:30:39 2003 +0000
+++ b/dist/file/file.c  Sun Feb 23 23:34:21 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: file.c,v 1.1.1.1 2003/02/23 23:08:25 pooka Exp $       */
+/*     $NetBSD: file.c,v 1.2 2003/02/23 23:34:21 pooka Exp $   */
 
 /*
  * file - find type of a file or files - main program.
@@ -63,7 +63,7 @@
 #if 0
 FILE_RCSID("@(#)Id: file.c,v 1.68 2003/02/08 18:33:53 christos Exp ")
 #else
-__RCSID("$NetBSD: file.c,v 1.1.1.1 2003/02/23 23:08:25 pooka Exp $");
+__RCSID("$NetBSD: file.c,v 1.2 2003/02/23 23:34:21 pooka Exp $");
 #endif
 #endif /* lint */
 
@@ -435,7 +435,7 @@
 
                if ((fd = open(inname, O_RDONLY)) < 0) {
                        /* We can't open it, but we were able to stat it. */
-                       if (sb.st_mode & 0002) ckfputs("writeable, ", stdout);
+                       if (sb.st_mode & 0002) ckfputs("writable, ", stdout);
                        if (sb.st_mode & 0111) ckfputs("executable, ", stdout);
                        ckfprintf(stdout, "can't read `%s' (%s).\n",
                            inname, strerror(errno));
diff -r 7cdf67352d45 -r e92c30fb4e58 dist/file/magdir/elf
--- a/dist/file/magdir/elf      Sun Feb 23 23:30:39 2003 +0000
+++ b/dist/file/magdir/elf      Sun Feb 23 23:34:21 2003 +0000
@@ -97,6 +97,7 @@
 >>18   leshort         53              Motorola M68HC12,
 >>18   leshort         62              AMD x86-64,
 >>18   leshort         75              Digital VAX,
+>>18   leshort         97              NatSemi 32k,
 >>18   leshort         0x9026          Alpha (unofficial),
 >>20   lelong          0               invalid version
 >>20   lelong          1               version 1
@@ -183,6 +184,7 @@
 >>18   beshort         53              Motorola M68HC12,
 >>18   beshort         73              Cray NV1,
 >>18   beshort         75              Digital VAX,
+>>18   beshort         97              NatSemi 32k,
 >>18   beshort         0x9026          Alpha (unofficial),
 >>20   belong          0               invalid version
 >>20   belong          1               version 1
diff -r 7cdf67352d45 -r e92c30fb4e58 dist/file/magdir/filesystems
--- a/dist/file/magdir/filesystems      Sun Feb 23 23:30:39 2003 +0000
+++ b/dist/file/magdir/filesystems      Sun Feb 23 23:34:21 2003 +0000
@@ -167,6 +167,10 @@
 >8320  lelong          1               SPACE optimization
 
 9564   belong          0x00011954      Unix Fast File system (big-endian),
+>7168   long           0x4c41424c      Apple UFS Volume
+>>7186  string         x               named %s,
+>>7176  belong         x               volume label version %d,
+>>7180  bedate         x               created on %s,
 >8404  string          x               last mounted on %s,
 #>9504 bedate          x               last checked at %s,
 >8224  bedate          x               last written at %s,
diff -r 7cdf67352d45 -r e92c30fb4e58 dist/file/magdir/macintosh
--- a/dist/file/magdir/macintosh        Sun Feb 23 23:30:39 2003 +0000
+++ b/dist/file/magdir/macintosh        Sun Feb 23 23:34:21 2003 +0000
@@ -16,6 +16,10 @@
 0      string          Seg                     StuffIt Deluxe Segment (data)
 >2     string          x                       : %s
 
+# Newer StuffIt archives (grant%netbsd.org@localhost)
+0      string          StuffIt                 StuffIt Archive
+>162   string          >0                      : %s
+
 # Macintosh Applications and Installation binaries (franklsm%tuns.ca@localhost)
 0      string          APPL                    Macintosh Application (data)
 >2     string          x                       \b: %s