diff options
| author | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
| commit | 729acffa050ba99227c27884a5760fdd3d6959b2 (patch) | |
| tree | d5289d633f1b84fbbf947f98b34ff58109fccca7 /contrib/file/print.c | |
| parent | 964611a3050b11c026667dbb4ae98380fe18252a (diff) | |
| parent | 05dd1f1bd993ec12015e6782ea5c46b6a0b69ecb (diff) | |
| download | FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.zip FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.tar.gz | |
Record that base/vendor/file/dist@186675 was merged.
Merge base/vendor/file/dist@186675@186690, bringing FILE 4.26 to 8-CURRENT.
Diffstat (limited to 'contrib/file/print.c')
| -rw-r--r-- | contrib/file/print.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/file/print.c b/contrib/file/print.c index c28ee2e..c41e71e 100644 --- a/contrib/file/print.c +++ b/contrib/file/print.c @@ -41,7 +41,7 @@ #include <time.h> #ifndef lint -FILE_RCSID("@(#)$File: print.c,v 1.61 2007/12/27 16:35:59 christos Exp $") +FILE_RCSID("@(#)$File: print.c,v 1.63 2008/02/17 19:28:54 rrt Exp $") #endif /* lint */ #define SZOF(a) (sizeof(a) / sizeof(a[0])) @@ -89,8 +89,8 @@ file_mdump(struct magic *m) if (m->str_flags & REGEX_OFFSET_START) (void) fputc(CHAR_REGEX_OFFSET_START, stderr); } - if (m->str_count) - (void) fprintf(stderr, "/%u", m->str_count); + if (m->str_range) + (void) fprintf(stderr, "/%u", m->str_range); } else { if ((m->mask_op & FILE_OPS_MASK) < SZOF(optyp)) @@ -184,13 +184,15 @@ protected void file_magwarn(struct magic_set *ms, const char *f, ...) { va_list va; - va_start(va, f); /* cuz we use stdout for most, stderr here */ (void) fflush(stdout); - (void) fprintf(stderr, "%s, %lu: Warning ", ms->file, - (unsigned long)ms->line); + if (ms->file) + (void) fprintf(stderr, "%s, %lu: ", ms->file, + (unsigned long)ms->line); + (void) fprintf(stderr, "Warning: "); + va_start(va, f); (void) vfprintf(stderr, f, va); va_end(va); (void) fputc('\n', stderr); |
