diff options
| author | delphij <delphij@FreeBSD.org> | 2016-12-11 07:37:20 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-12-11 07:37:20 +0000 |
| commit | 884efc61f7391700d81bb717ea62d897524b2184 (patch) | |
| tree | 4a428617338dba61584b97a48fed633f5f610466 /contrib/file/src/file.c | |
| parent | 90c02dc90566ee82971be44f1fe9fcf2016abc22 (diff) | |
| download | FreeBSD-src-884efc61f7391700d81bb717ea62d897524b2184.zip FreeBSD-src-884efc61f7391700d81bb717ea62d897524b2184.tar.gz | |
MFC r308420: MFV r308392: file 5.29.
Diffstat (limited to 'contrib/file/src/file.c')
| -rw-r--r-- | contrib/file/src/file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/file/src/file.c b/contrib/file/src/file.c index 9a8606d..fad3160 100644 --- a/contrib/file/src/file.c +++ b/contrib/file/src/file.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: file.c,v 1.171 2016/05/17 15:52:45 christos Exp $") +FILE_RCSID("@(#)$File: file.c,v 1.172 2016/10/24 15:21:07 christos Exp $") #endif /* lint */ #include "magic.h" @@ -431,6 +431,8 @@ private struct magic_set * load(const char *magicfile, int flags) { struct magic_set *magic = magic_open(flags); + const char *e; + if (magic == NULL) { (void)fprintf(stderr, "%s: %s\n", progname, strerror(errno)); return NULL; @@ -441,6 +443,8 @@ load(const char *magicfile, int flags) magic_close(magic); return NULL; } + if ((e = magic_error(magic)) != NULL) + (void)fprintf(stderr, "%s: Warning: %s\n", progname, e); return magic; } |
