diff options
| author | delphij <delphij@FreeBSD.org> | 2015-06-10 19:22:41 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-06-10 19:22:41 +0000 |
| commit | 7d7b7b5da36a9fbecf1110d65e3693b9347630d9 (patch) | |
| tree | bf2d8b473f0726bcdeb36d064078c17b8e7d13cf /contrib/file/src/file.c | |
| parent | 352275060a62b930cc38ca67aff50948c9441845 (diff) | |
| parent | c042ae22175d978baeb8b11c92152e4aa035e36a (diff) | |
| download | FreeBSD-src-7d7b7b5da36a9fbecf1110d65e3693b9347630d9.zip FreeBSD-src-7d7b7b5da36a9fbecf1110d65e3693b9347630d9.tar.gz | |
MFV r284234:
Update file to 5.23.
MFC after: 2 weeks
Diffstat (limited to 'contrib/file/src/file.c')
| -rw-r--r-- | contrib/file/src/file.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/contrib/file/src/file.c b/contrib/file/src/file.c index 546fd8b..2b15e21 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.160 2014/12/16 23:18:40 christos Exp $") +FILE_RCSID("@(#)$File: file.c,v 1.164 2015/06/03 18:21:24 christos Exp $") #endif /* lint */ #include "magic.h" @@ -68,14 +68,14 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc #endif #ifdef S_IFLNK -#define FILE_FLAGS "-bcEhikLlNnprsvz0" +#define FILE_FLAGS "-bcEhikLlNnprsvzZ0" #else -#define FILE_FLAGS "-bcEiklNnprsvz0" +#define FILE_FLAGS "-bcEiklNnprsvzZ0" #endif # define USAGE \ "Usage: %s [" FILE_FLAGS \ - "] [--apple] [--mime-encoding] [--mime-type]\n" \ + "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \ " [-e testname] [-F separator] [-f namefile] [-m magicfiles] " \ "file ...\n" \ " %s -C [-m magicfiles]\n" \ @@ -98,7 +98,7 @@ private const struct option long_options[] = { #undef OPT_LONGONLY {0, 0, NULL, 0} }; -#define OPTSTRING "bcCde:Ef:F:hiklLm:nNpP:rsvz0" +#define OPTSTRING "bcCde:Ef:F:hiklLm:nNpP:rsvzZ0" private const struct { const char *name; @@ -130,8 +130,14 @@ private struct { private char *progname; /* used throughout */ +#ifdef __dead +__dead +#endif private void usage(void); private void docprint(const char *); +#ifdef __dead +__dead +#endif private void help(void); private int unwrap(struct magic_set *, const char *); @@ -185,9 +191,12 @@ main(int argc, char *argv[]) flags |= MAGIC_APPLE; break; case 11: - flags |= MAGIC_MIME_TYPE; + flags |= MAGIC_EXTENSION; break; case 12: + flags |= MAGIC_MIME_TYPE; + break; + case 13: flags |= MAGIC_MIME_ENCODING; break; } @@ -262,7 +271,6 @@ main(int argc, char *argv[]) case 'r': flags |= MAGIC_RAW; break; - break; case 's': flags |= MAGIC_DEVICES; break; @@ -276,6 +284,10 @@ main(int argc, char *argv[]) case 'z': flags |= MAGIC_COMPRESS; break; + + case 'Z': + flags |= MAGIC_COMPRESS|MAGIC_COMPRESS_TRANSP; + break; #ifdef S_IFLNK case 'L': flags |= MAGIC_SYMLINK; |
