From 114be8061f77db28b1cfd4daf5dd38cfb10740c0 Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 15 Apr 2003 15:19:30 +0000 Subject: [PATCH] Gratuitous name changes from file-4.02. CVS patchset: 6744 CVS date: 2003/04/15 15:19:30 --- file/src/Makefile.am | 2 +- file/src/apprentice.c | 42 +++++++++++++++++++-------------------- file/src/ascmagic.c | 48 ++++++++++++++++++++++----------------------- file/src/compress.c | 2 +- file/src/file.h | 14 ++++++------- file/src/fsmagic.c | 54 +++++++++++++++++++++++++-------------------------- file/src/print.c | 20 ++++++++++--------- file/src/readelf.c | 38 ++++++++++++++++++------------------ file/src/softmagic.c | 38 ++++++++++++++++++------------------ 9 files changed, 130 insertions(+), 128 deletions(-) diff --git a/file/src/Makefile.am b/file/src/Makefile.am index 6251a5d..0a5f251 100644 --- a/file/src/Makefile.am +++ b/file/src/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign LINT = splint EXTRA_DIST = LEGAL.NOTICE MAINT Makefile.std magic2mime magic.mime \ - Localstuff Header $(magic_FRAGMENTS) file.man magic.man + Localstuff Header file.man BUILT_SOURCES = listobjs $(man_MANS) diff --git a/file/src/apprentice.c b/file/src/apprentice.c index fdcb594..38e3add 100644 --- a/file/src/apprentice.c +++ b/file/src/apprentice.c @@ -85,7 +85,7 @@ const char *default_magicfile = MAGIC; * extend the sign bit if the comparison is to be signed */ uint32_t -signextend(struct magic *m, uint32_t v) +file_signextend(struct magic *m, uint32_t v) { if (!(m->flag & UNSIGNED)) switch(m->type) { @@ -119,7 +119,7 @@ signextend(struct magic *m, uint32_t v) case FILE_REGEX: break; default: - magwarn("can't happen: m->type=%d\n", m->type); + file_magwarn("can't happen: m->type=%d\n", m->type); return -1; } return v; @@ -298,7 +298,7 @@ getvalue(struct magic *m, /*@out@*/ char **p) m->vallen = slen; } else if (m->reln != 'x') { - m->value.l = signextend(m, strtoul(*p, p, 0)); + m->value.l = file_signextend(m, strtoul(*p, p, 0)); eatsize(p); } return 0; @@ -349,7 +349,7 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, /* get offset, then skip over it */ m->offset = (int) strtoul(l,&t,0); if (l == t) - magwarn("offset %s invalid", l); + file_magwarn("offset %s invalid", l); l = t; if (m->flag & INDIR) { @@ -382,7 +382,7 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, m->in_type = FILE_BYTE; break; default: - magwarn("indirect offset type %c invalid", *l); + file_magwarn("indirect offset type %c invalid", *l); break; } l++; @@ -430,7 +430,7 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, else t = l; if (*t++ != ')') - magwarn("missing ')' in indirect offset"); + file_magwarn("missing ')' in indirect offset"); l = t; } @@ -514,13 +514,13 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, m->type = FILE_REGEX; l += sizeof("regex"); } else { - magwarn("type %s invalid", l); + file_magwarn("type %s invalid", l); return -1; } /* New-style anding: "0 byte&0x80 =0x80 dynamically linked" */ /* New and improved: ~ & | ^ + - * / % -- exciting, isn't it? */ if (*l == '~') { - if (FILE_STRING != m->type && FILE_PSTRING != m->type) + if (m->type != FILE_STRING && m->type != FILE_PSTRING) m->mask_op = FILE_OPINVERSE; ++l; } @@ -528,50 +528,50 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, case '&': m->mask_op |= FILE_OPAND; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '|': m->mask_op |= FILE_OPOR; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '^': m->mask_op |= FILE_OPXOR; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '+': m->mask_op |= FILE_OPADD; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '-': m->mask_op |= FILE_OPMINUS; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '*': m->mask_op |= FILE_OPMULTIPLY; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '%': m->mask_op |= FILE_OPMODULO; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); break; case '/': - if (FILE_STRING != m->type && FILE_PSTRING != m->type) { + if (m->type != FILE_STRING && m->type != FILE_PSTRING) { m->mask_op |= FILE_OPDIVIDE; ++l; - m->mask = signextend(m, strtoul(l, &l, 0)); + m->mask = file_signextend(m, strtoul(l, &l, 0)); eatsize(&l); } else { m->mask = 0L; @@ -588,7 +588,7 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, STRING_COMPACT_OPTIONAL_BLANK; /*@switchbreak@*/ break; default: - magwarn("string extension %c invalid", + file_magwarn("string extension %c invalid", *l); return -1; } @@ -638,7 +638,7 @@ parse(/*@out@*/ struct magic **magicp, /*@out@*/ uint32_t *nmagicp, /* * TODO finish this macro and start using it! * #define offsetcheck {if (offset > HOWMANY-1) - * magwarn("offset too big"); } + * file_magwarn("offset too big"); } */ /* @@ -660,7 +660,7 @@ GetDesc: #ifndef COMPILE_ONLY if (action == FILE_CHECK) { - mdump(m); + file_mdump(m); } #endif ++(*nmagicp); /* make room for next */ @@ -672,7 +672,7 @@ GetDesc: * Print a string containing C character escapes. */ void -showstr(FILE *fp, const char *s, int len) +file_showstr(FILE *fp, const char *s, size_t len) { char c; diff --git a/file/src/ascmagic.c b/file/src/ascmagic.c index 37ef00b..226b2dd 100644 --- a/file/src/ascmagic.c +++ b/file/src/ascmagic.c @@ -542,11 +542,11 @@ fmagicA(fmagic fm) */ switch (is_tar(fm)) { case 1: - fmagicPrintf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) + file_printf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) ? "application/x-tar" : "tar archive")); return 1; case 2: - fmagicPrintf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) + file_printf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) ? "application/x-tar, POSIX" : "POSIX tar archive")); return 1; } @@ -708,26 +708,26 @@ subtype_identified: if ((fm->flags & FMAGIC_FLAGS_MIME)) { if (subtype_mime != NULL) - fmagicPrintf(fm, subtype_mime); + file_printf(fm, subtype_mime); else - fmagicPrintf(fm, "text/plain"); + file_printf(fm, "text/plain"); if (code_mime != NULL) { - fmagicPrintf(fm, "; charset="); - fmagicPrintf(fm, code_mime); + file_printf(fm, "; charset="); + file_printf(fm, code_mime); } } else { - fmagicPrintf(fm, code); + file_printf(fm, code); if (subtype != NULL) { - fmagicPrintf(fm, " "); - fmagicPrintf(fm, subtype); + file_printf(fm, " "); + file_printf(fm, subtype); } - fmagicPrintf(fm, " "); - fmagicPrintf(fm, type); + file_printf(fm, " "); + file_printf(fm, type); if (has_long_lines) - fmagicPrintf(fm, ", with very long lines"); + file_printf(fm, ", with very long lines"); /* * Only report line terminators if we find one other than LF, @@ -735,37 +735,37 @@ subtype_identified: */ if ((n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) || (n_crlf != 0 || n_cr != 0 || n_nel != 0)) { - fmagicPrintf(fm, ", with"); + file_printf(fm, ", with"); if (n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) - fmagicPrintf(fm, " no"); + file_printf(fm, " no"); else { if (n_crlf) { - fmagicPrintf(fm, " CRLF"); + file_printf(fm, " CRLF"); if (n_cr || n_lf || n_nel) - fmagicPrintf(fm, ","); + file_printf(fm, ","); } if (n_cr) { - fmagicPrintf(fm, " CR"); + file_printf(fm, " CR"); if (n_lf || n_nel) - fmagicPrintf(fm, ","); + file_printf(fm, ","); } if (n_lf) { - fmagicPrintf(fm, " LF"); + file_printf(fm, " LF"); if (n_nel) - fmagicPrintf(fm, ","); + file_printf(fm, ","); } if (n_nel) - fmagicPrintf(fm, " NEL"); + file_printf(fm, " NEL"); } - fmagicPrintf(fm, " line terminators"); + file_printf(fm, " line terminators"); } if (has_escapes) - fmagicPrintf(fm, ", with escape sequences"); + file_printf(fm, ", with escape sequences"); if (has_backspace) - fmagicPrintf(fm, ", with overstriking"); + file_printf(fm, ", with overstriking"); } return 1; diff --git a/file/src/compress.c b/file/src/compress.c index 6fd8de3..b8ede4c 100644 --- a/file/src/compress.c +++ b/file/src/compress.c @@ -87,7 +87,7 @@ sread(int fd, /*@out@*/ void *buf, size_t n) } int -pipe2file(int fd, void *startbuf, size_t nbytes) +file_pipe2file(int fd, const void *startbuf, size_t nbytes) { char buf[4096]; int r, tfd; diff --git a/file/src/file.h b/file/src/file.h index deec95d..a5a7e9f 100644 --- a/file/src/file.h +++ b/file/src/file.h @@ -220,27 +220,27 @@ extern int fmagicZ(fmagic fm) /*@globals fileSystem, internalState @*/ /*@modifies fm, fileSystem, internalState @*/; -extern void fmagicPrintf(const fmagic fm, const char *f, ...) +extern void file_printf(const fmagic fm, const char *f, ...) /*@modifies fm @*/; /*@observer@*/ -extern char *fmttime(long v, int local) +extern const char *file_fmttime(uint32_t v, int local) /*@*/; -extern void magwarn(const char *f, ...) +extern void file_magwarn(const char *f, ...) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; -extern void mdump(struct magic *m) +extern void file_mdump(struct magic *m) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; -extern void showstr(FILE *fp, const char *s, int len) +extern void file_showstr(FILE *fp, const char *s, size_t len) /*@globals fileSystem @*/ /*@modifies fp, fileSystem @*/; -extern uint32_t signextend(struct magic *m, uint32_t v) +extern uint32_t file_signextend(struct magic *m, uint32_t v) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; -extern int pipe2file(int fd, void *startbuf, size_t nbytes) +extern int file_pipe2file(int fd, const void *startbuf, size_t nbytes) /*@globals errno, fileSystem, internalState @*/ /*@modifies errno, fileSystem, internalState @*/; diff --git a/file/src/fsmagic.c b/file/src/fsmagic.c index 81e7a0e..ec225f1 100644 --- a/file/src/fsmagic.c +++ b/file/src/fsmagic.c @@ -56,31 +56,31 @@ fmagicD(fmagic fm) if (ret) { /* Yes, I do mean stdout. */ /* No \n, caller will provide. */ - fmagicPrintf(fm, "can't stat `%s' (%s).", fn, strerror(errno)); + file_printf(fm, "can't stat `%s' (%s).", fn, strerror(errno)); return 1; } if ((fm->flags & FMAGIC_FLAGS_MIME)) { if ((st->st_mode & S_IFMT) != S_IFREG) { - fmagicPrintf(fm, "application/x-not-regular-file"); + file_printf(fm, "application/x-not-regular-file"); return 1; } } else { #if defined(S_ISUID) || defined(__LCLINT__) - if (st->st_mode & S_ISUID) fmagicPrintf(fm, "setuid "); + if (st->st_mode & S_ISUID) file_printf(fm, "setuid "); #endif #if defined(S_ISGID) || defined(__LCLINT__) - if (st->st_mode & S_ISGID) fmagicPrintf(fm, "setgid "); + if (st->st_mode & S_ISGID) file_printf(fm, "setgid "); #endif #if defined(S_ISVTX) || defined(__LCLINT__) - if (st->st_mode & S_ISVTX) fmagicPrintf(fm, "sticky "); + if (st->st_mode & S_ISVTX) file_printf(fm, "sticky "); #endif } switch (st->st_mode & S_IFMT) { case S_IFDIR: - fmagicPrintf(fm, "directory"); + file_printf(fm, "directory"); return 1; #if defined(S_IFCHR) || defined(__LCLINT__) case S_IFCHR: @@ -93,18 +93,18 @@ fmagicD(fmagic fm) break; #ifdef HAVE_STRUCT_STAT_ST_RDEV # ifdef dv_unit - fmagicPrintf(fm, "character special (%d/%d/%d)", + file_printf(fm, "character special (%d/%d/%d)", major(st->st_rdev), dv_unit(st->st_rdev), dv_subunit(st->st_rdev)); # else /*@-shiftimplementation@*/ - fmagicPrintf(fm, "character special (%ld/%ld)", + file_printf(fm, "character special (%ld/%ld)", (long) major(st->st_rdev), (long) minor(st->st_rdev)); /*@=shiftimplementation@*/ # endif #else - fmagicPrintf(fm, "character special"); + file_printf(fm, "character special"); #endif return 1; #endif @@ -119,30 +119,30 @@ fmagicD(fmagic fm) break; #ifdef HAVE_STRUCT_STAT_ST_RDEV # ifdef dv_unit - fmagicPrintf(fm, "block special (%d/%d/%d)", + file_printf(fm, "block special (%d/%d/%d)", major(st->st_rdev), dv_unit(st->st_rdev), dv_subunit(st->st_rdev)); # else /*@-shiftimplementation@*/ - fmagicPrintf(fm, "block special (%ld/%ld)", + file_printf(fm, "block special (%ld/%ld)", (long) major(st->st_rdev), (long) minor(st->st_rdev)); /*@=shiftimplementation@*/ # endif #else - fmagicPrintf(fm, "block special"); + file_printf(fm, "block special"); #endif return 1; #endif /* TODO add code to handle V7 MUX and Blit MUX files */ #if defined(S_IFIFO) || defined(__LCLINT__) case S_IFIFO: - fmagicPrintf(fm, "fifo (named pipe)"); + file_printf(fm, "fifo (named pipe)"); return 1; #endif #if defined(S_IFDOOR) case S_IFDOOR: - fmagicPrintf(fm, "door"); + file_printf(fm, "door"); return 1; #endif #if defined(S_IFLNK) || defined(__LCLINT__) @@ -154,7 +154,7 @@ fmagicD(fmagic fm) buf[0] = '\0'; if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) { - fmagicPrintf(fm, "unreadable symlink (%s).", strerror(errno)); + file_printf(fm, "unreadable symlink (%s).", strerror(errno)); return 1; } buf[nch] = '\0'; /* readlink(2) needs this */ @@ -163,7 +163,7 @@ fmagicD(fmagic fm) /*@-branchstate@*/ if (*buf == '/') { if (stat(buf, &tstatbuf) < 0) { - fmagicPrintf(fm, "broken symbolic link to %s", buf); + file_printf(fm, "broken symbolic link to %s", buf); return 1; } } @@ -181,7 +181,7 @@ fmagicD(fmagic fm) tmp = buf2; } if (stat(tmp, &tstatbuf) < 0) { - fmagicPrintf(fm, "broken symbolic link to %s", buf); + file_printf(fm, "broken symbolic link to %s", buf); return 1; } } @@ -189,11 +189,11 @@ fmagicD(fmagic fm) /* Otherwise, handle it. */ if ((fm->flags & FMAGIC_FLAGS_FOLLOW)) { - fmagicPrintf(fm, "\n"); + file_printf(fm, "\n"); xx = fmagicProcess(fm, buf, strlen(buf)); return 1; } else { /* just print what it points to */ - fmagicPrintf(fm, "symbolic link to %s", buf); + file_printf(fm, "symbolic link to %s", buf); } } return 1; @@ -201,7 +201,7 @@ fmagicD(fmagic fm) #if defined(S_IFSOCK) #ifndef __COHERENT__ case S_IFSOCK: - fmagicPrintf(fm, "socket"); + file_printf(fm, "socket"); return 1; #endif #endif @@ -225,7 +225,7 @@ fmagicD(fmagic fm) * when we read the file.) */ if (!(fm->flags & FMAGIC_FLAGS_SPECIAL) && st->st_size == 0) { - fmagicPrintf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) + file_printf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) ? "application/x-empty" : "empty")); return 1; } @@ -262,7 +262,7 @@ fmagicF(fmagic fm, int zfl) return 'a'; /* abandon hope, all ye who remain here */ - fmagicPrintf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) + file_printf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) ? "application/octet-stream" : "data")); return '\0'; } @@ -297,7 +297,7 @@ fmagicProcess(fmagic fm, const char *fn, int wid) /*@=branchstate@*/ if (wid > 0 && !(fm->flags & FMAGIC_FLAGS_BRIEF)) - fmagicPrintf(fm, "%s:%*s ", fm->fn, + file_printf(fm, "%s:%*s ", fm->fn, (int) (wid - strlen(fm->fn)), ""); if (fm->fn != stdname) { @@ -310,10 +310,10 @@ fmagicProcess(fmagic fm, const char *fn, int wid) if ((fm->fd = open(fm->fn, O_RDONLY)) < 0) { /* We can't open it, but we were able to stat it. */ if (fm->sb.st_mode & 0002) - fmagicPrintf(fm, "writeable, "); + file_printf(fm, "writeable, "); if (fm->sb.st_mode & 0111) - fmagicPrintf(fm, "executable, "); - fmagicPrintf(fm, "can't read `%s' (%s).", fm->fn, strerror(errno)); + file_printf(fm, "executable, "); + file_printf(fm, "can't read `%s' (%s).", fm->fn, strerror(errno)); goto exit; } } @@ -328,7 +328,7 @@ fmagicProcess(fmagic fm, const char *fn, int wid) } if (fm->nb == 0) - fmagicPrintf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) + file_printf(fm, ((fm->flags & FMAGIC_FLAGS_MIME) ? "application/x-empty" : "empty"), fm); else { fm->buf[fm->nb++] = '\0'; /* null-terminate data buffer */ diff --git a/file/src/print.c b/file/src/print.c index 9954ff9..0bc0054 100644 --- a/file/src/print.c +++ b/file/src/print.c @@ -44,7 +44,7 @@ fmagic global_fmagic = &myfmagic; #ifndef COMPILE_ONLY void -mdump(struct magic *m) +file_mdump(struct magic *m) { /*@observer@*/ static const char *typ[] = { "invalid", "byte", "short", "invalid", @@ -81,7 +81,7 @@ mdump(struct magic *m) ((m->mask_op&0x7F) < SZOF(optyp)) ? (void) fputc(optyp[m->mask_op&0x7F], stderr) : (void) fputc('?', stderr); - if (FILE_STRING != m->type || FILE_PSTRING != m->type) + if (m->type != FILE_STRING || m->type != FILE_PSTRING) (void) fprintf(stderr, "%.8x", m->mask); else { if (m->mask & STRING_IGNORE_LOWERCASE) @@ -110,17 +110,19 @@ mdump(struct magic *m) case FILE_STRING: case FILE_PSTRING: case FILE_REGEX: - showstr(stderr, m->value.s, -1); + file_showstr(stderr, m->value.s, ~0U); break; case FILE_DATE: case FILE_LEDATE: case FILE_BEDATE: - (void)fprintf(stderr, "%s,", fmttime(m->value.l, 1)); + (void)fprintf(stderr, "%s,", + file_fmttime(m->value.l, 1)); break; case FILE_LDATE: case FILE_LELDATE: case FILE_BELDATE: - (void)fprintf(stderr, "%s,", fmttime(m->value.l, 0)); + (void)fprintf(stderr, "%s,", + file_fmttime(m->value.l, 0)); break; default: (void) fputs("*bad*", stderr); @@ -158,7 +160,7 @@ error(int status, /*@unused@*/ int errnum, const char * format, ...) /*VARARGS*/ void -magwarn(const char *f, ...) +file_magwarn(const char *f, ...) { fmagic fm = global_fmagic; va_list va; @@ -179,7 +181,7 @@ magwarn(const char *f, ...) } void -fmagicPrintf(const fmagic fm, const char *f, ...) +file_printf(const fmagic fm, const char *f, ...) { va_list va; size_t nob; @@ -199,8 +201,8 @@ fmagicPrintf(const fmagic fm, const char *f, ...) #ifndef COMPILE_ONLY -char * -fmttime(long v, int local) +const char * +file_fmttime(uint32_t v, int local) { char *pp = "???"; char *rt; diff --git a/file/src/readelf.c b/file/src/readelf.c index ca2138e..6e22073 100644 --- a/file/src/readelf.c +++ b/file/src/readelf.c @@ -144,11 +144,11 @@ doshn(fmagic fm, off_t off, int num, size_t size) /*@notreached@*/ } if (shs_type == SHT_SYMTAB /* || shs_type == SHT_DYNSYM */) { - fmagicPrintf(fm, ", not stripped"); + file_printf(fm, ", not stripped"); return; } } - fmagicPrintf(fm, ", stripped"); + file_printf(fm, ", stripped"); } /*@=bounds@*/ @@ -249,22 +249,22 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) uint32_t *desc = (uint32_t *)&nbuf[offset]; - fmagicPrintf(fm, ", for GNU/"); + file_printf(fm, ", for GNU/"); switch (getu32(fm, desc[0])) { case GNU_OS_LINUX: - fmagicPrintf(fm, "Linux"); + file_printf(fm, "Linux"); /*@switchbreak@*/ break; case GNU_OS_HURD: - fmagicPrintf(fm, "Hurd"); + file_printf(fm, "Hurd"); /*@switchbreak@*/ break; case GNU_OS_SOLARIS: - fmagicPrintf(fm, "Solaris"); + file_printf(fm, "Solaris"); /*@switchbreak@*/ break; default: - fmagicPrintf(fm, ""); + file_printf(fm, ""); /*@switchbreak@*/ break; } - fmagicPrintf(fm, " %d.%d.%d", + file_printf(fm, " %d.%d.%d", getu32(fm, desc[1]), getu32(fm, desc[2]), getu32(fm, desc[3])); @@ -274,7 +274,7 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) strcmp(&nbuf[nameoffset], "NetBSD") == 0 && nh_type == NT_NETBSD_VERSION && nh_descsz == 4) { - fmagicPrintf(fm, ", for NetBSD"); + file_printf(fm, ", for NetBSD"); /* * Version number is stuck at 199905, * and hence is basically content-free. @@ -287,7 +287,7 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) nh_descsz == 4) { uint32_t desc = getu32(fm, *(uint32_t *)&nbuf[offset]); - fmagicPrintf(fm, ", for FreeBSD"); + file_printf(fm, ", for FreeBSD"); /* * Contents is __FreeBSD_version, * whose relation to OS versions is @@ -298,10 +298,10 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) * FreeBSD that use this note. */ - fmagicPrintf(fm, " %d.%d", desc / 100000, + file_printf(fm, " %d.%d", desc / 100000, desc / 10000 % 10); if (desc / 1000 % 10 > 0) - fmagicPrintf(fm, ".%d", + file_printf(fm, ".%d", desc / 1000 % 10); } @@ -309,7 +309,7 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) strcmp(&nbuf[nameoffset], "OpenBSD") == 0 && nh_type == NT_OPENBSD_VERSION && nh_descsz == 4) { - fmagicPrintf(fm, ", for OpenBSD"); + file_printf(fm, ", for OpenBSD"); /* Content of note is always 0 */ } } @@ -320,7 +320,7 @@ dophn_exec(fmagic fm, off_t off, int num, size_t size) /*@switchbreak@*/ break; } } - fmagicPrintf(fm, ", %s linked%s", linking_style, shared_libraries); + file_printf(fm, ", %s linked%s", linking_style, shared_libraries); } /*@=bounds@*/ @@ -485,7 +485,7 @@ dophn_core(fmagic fm, off_t off, int num, size_t size) os_style = OS_STYLE_NETBSD; } else /*@innercontinue@*/ continue; - fmagicPrintf(fm, ", %s-style", os_style_names[os_style]); + file_printf(fm, ", %s-style", os_style_names[os_style]); } if (os_style == OS_STYLE_NETBSD && @@ -497,7 +497,7 @@ dophn_core(fmagic fm, off_t off, int num, size_t size) * offset 0x7c, and is up to 32-bytes, * including the terminating NUL. */ - fmagicPrintf(fm, ", from '%.31s'", &nbuf[offset + 0x7c]); + file_printf(fm, ", from '%.31s'", &nbuf[offset + 0x7c]); /* * Extract the signal number. It is at @@ -505,7 +505,7 @@ dophn_core(fmagic fm, off_t off, int num, size_t size) */ memcpy(&signo, &nbuf[offset + 0x08], sizeof(signo)); - fmagicPrintf(fm, " (signal %u)", getu32(fm, signo)); + file_printf(fm, " (signal %u)", getu32(fm, signo)); } else if (os_style != OS_STYLE_NETBSD && nh_type == NT_PRPSINFO) { @@ -570,7 +570,7 @@ dophn_core(fmagic fm, off_t off, int num, size_t size) /* * Well, that worked. */ - fmagicPrintf(fm, ", from '%.16s'", + file_printf(fm, ", from '%.16s'", &nbuf[offset + prpsoffsets(i)]); /*@innerbreak@*/ break; @@ -602,7 +602,7 @@ fmagicE(fmagic fm) * If we can't seek, it must be a pipe, socket or fifo. */ if((lseek(fm->fd, (off_t)0, SEEK_SET) == (off_t)-1) && (errno == ESPIPE)) - fm->fd = pipe2file(fm->fd, fm->buf, fm->nb); + fm->fd = file_pipe2file(fm->fd, fm->buf, fm->nb); /* * ELF executables have multiple section headers in arbitrary diff --git a/file/src/softmagic.c b/file/src/softmagic.c index 220d506..63041b6 100644 --- a/file/src/softmagic.c +++ b/file/src/softmagic.c @@ -45,8 +45,8 @@ fmagicSPrint(const fmagic fm, struct magic *m) switch (m->type) { case FILE_BYTE: - v = signextend(m, p->b); - fmagicPrintf(fm, m->desc, (unsigned char) v); + v = file_signextend(m, p->b); + file_printf(fm, m->desc, (unsigned char) v); /*@-sizeoftype@*/ t = m->offset + sizeof(char); /*@=sizeoftype@*/ @@ -55,8 +55,8 @@ fmagicSPrint(const fmagic fm, struct magic *m) case FILE_SHORT: case FILE_BESHORT: case FILE_LESHORT: - v = signextend(m, p->h); - fmagicPrintf(fm, m->desc, (unsigned short) v); + v = file_signextend(m, p->h); + file_printf(fm, m->desc, (unsigned short) v); /*@-sizeoftype@*/ t = m->offset + sizeof(short); /*@=sizeoftype@*/ @@ -65,8 +65,8 @@ fmagicSPrint(const fmagic fm, struct magic *m) case FILE_LONG: case FILE_BELONG: case FILE_LELONG: - v = signextend(m, p->l); - fmagicPrintf(fm, m->desc, (uint32_t) v); + v = file_signextend(m, p->l); + file_printf(fm, m->desc, (uint32_t) v); /*@-sizeoftype@*/ t = m->offset + sizeof(int32_t); /*@=sizeoftype@*/ @@ -75,7 +75,7 @@ fmagicSPrint(const fmagic fm, struct magic *m) case FILE_STRING: case FILE_PSTRING: if (m->reln == '=') { - fmagicPrintf(fm, m->desc, m->value.s); + file_printf(fm, m->desc, m->value.s); t = m->offset + strlen(m->value.s); } else { if (*m->value.s == '\0') { @@ -83,7 +83,7 @@ fmagicSPrint(const fmagic fm, struct magic *m) if (cp != NULL) *cp = '\0'; } - fmagicPrintf(fm, m->desc, p->s); + file_printf(fm, m->desc, p->s); t = m->offset + strlen(p->s); } break; @@ -91,7 +91,7 @@ fmagicSPrint(const fmagic fm, struct magic *m) case FILE_DATE: case FILE_BEDATE: case FILE_LEDATE: - fmagicPrintf(fm, m->desc, fmttime(p->l, 1)); + file_printf(fm, m->desc, file_fmttime(p->l, 1)); /*@-sizeoftype@*/ t = m->offset + sizeof(time_t); /*@=sizeoftype@*/ @@ -100,14 +100,14 @@ fmagicSPrint(const fmagic fm, struct magic *m) case FILE_LDATE: case FILE_BELDATE: case FILE_LELDATE: - fmagicPrintf(fm, m->desc, fmttime(p->l, 0)); + file_printf(fm, m->desc, file_fmttime(p->l, 0)); /*@-sizeoftype@*/ t = m->offset + sizeof(time_t); /*@=sizeoftype@*/ break; case FILE_REGEX: - fmagicPrintf(fm, m->desc, p->s); + file_printf(fm, m->desc, p->s); t = m->offset + strlen(p->s); break; @@ -399,12 +399,12 @@ fmagicSConvert(fmagic fm, struct magic *m) static void -fmagicSDebug(int32_t offset, char *str, int len) +fmagicSDebug(int32_t offset, char *str, size_t len) /*@globals fileSystem @*/ /*@modifies fileSystem @*/ { (void) fprintf(stderr, "fmagicSGet @%d: ", offset); - showstr(stderr, (char *) str, len); + file_showstr(stderr, (char *) str, len); (void) fputc('\n', stderr); (void) fputc('\n', stderr); } @@ -450,7 +450,7 @@ fmagicSGet(fmagic fm, struct magic *m) if (fm->flags & FMAGIC_FLAGS_DEBUG) { fmagicSDebug(offset, (char *) p, sizeof(*p)); - mdump(m); + file_mdump(m); } if (m->flag & INDIR) { @@ -738,7 +738,7 @@ fmagicSGet(fmagic fm, struct magic *m) if (fm->flags & FMAGIC_FLAGS_DEBUG) { fmagicSDebug(offset, (char *) p, sizeof(*p)); - mdump(m); + file_mdump(m); } } /*@-compmempass@*/ @@ -857,8 +857,8 @@ fmagicSCheck(const fmagic fm, struct magic *m) return 0; } - if(m->type != FILE_STRING && m->type != FILE_PSTRING) - v = signextend(m, v); + if (m->type != FILE_STRING && m->type != FILE_PSTRING) + v = file_signextend(m, v); switch (m->reln) { case 'x': @@ -987,7 +987,7 @@ fmagicSMatch(const fmagic fm) if (! firstline) { /* we found another match */ /* put a newline and '-' to do some simple formatting */ - fmagicPrintf(fm, "\n- "); + file_printf(fm, "\n- "); } if ((cont_level+1) >= tmplen) { @@ -1027,7 +1027,7 @@ fmagicSMatch(const fmagic fm) if (need_separator && (m->nospflag == 0) && (m->desc[0] != '\0')) { - fmagicPrintf(fm, " "); + file_printf(fm, " "); need_separator = 0; } if ((cont_level+1) >= tmplen) { -- 2.7.4