Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge local changes

This commit is contained in:
pooka 2003-02-23 23:34:21 +00:00
parent 02468768a6
commit c650965ed3
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/file/apprentice.c vendored
View File

@ -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 @@ apprentice_file(struct magic **magicp, uint32_t *nmagicp, const char *fn,
}
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));

6
dist/file/file.c vendored
View File

@ -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 @@ process(const char *inname, int wid)
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));

2
dist/file/magdir/elf vendored
View File

@ -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

4
dist/file/magdir/filesystems vendored
View File

@ -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,

4
dist/file/magdir/macintosh vendored
View File

@ -16,6 +16,10 @@
0 string Seg StuffIt Deluxe Segment (data)
>2 string x : %s
# Newer StuffIt archives (grant@netbsd.org)
0 string StuffIt StuffIt Archive
>162 string >0 : %s
# Macintosh Applications and Installation binaries (franklsm@tuns.ca)
0 string APPL Macintosh Application (data)
>2 string x \b: %s