2013-09-30 16:29:55 +02:00
|
|
|
--- src/file.c
|
2014-02-18 11:22:22 +01:00
|
|
|
+++ src/file.c 2014-02-18 08:50:59.990452075 +0000
|
|
|
|
|
@@ -198,6 +198,8 @@ main(int argc, char *argv[])
|
|
|
|
|
flags |= MAGIC_ERROR;
|
2007-05-17 11:31:52 +02:00
|
|
|
break;
|
|
|
|
|
case 'e':
|
|
|
|
|
+ if (!optarg)
|
|
|
|
|
+ usage();
|
|
|
|
|
for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
|
|
|
|
|
if (strcmp(nv[i].name, optarg) == 0)
|
|
|
|
|
break;
|
2014-02-18 11:22:22 +01:00
|
|
|
@@ -209,7 +211,7 @@ main(int argc, char *argv[])
|
2007-05-17 11:31:52 +02:00
|
|
|
break;
|
2009-05-06 18:38:39 +02:00
|
|
|
|
2007-05-17 11:31:52 +02:00
|
|
|
case 'f':
|
|
|
|
|
- if(action)
|
|
|
|
|
+ if(action || !optarg)
|
|
|
|
|
usage();
|
2009-05-06 18:38:39 +02:00
|
|
|
if (magic == NULL)
|
|
|
|
|
if ((magic = load(magicfile, flags)) == NULL)
|
2014-02-18 11:22:22 +01:00
|
|
|
@@ -218,6 +220,8 @@ main(int argc, char *argv[])
|
2007-05-17 11:31:52 +02:00
|
|
|
++didsomefiles;
|
|
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
+ if (!optarg)
|
|
|
|
|
+ usage();
|
|
|
|
|
separator = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'i':
|
2014-02-18 11:22:22 +01:00
|
|
|
@@ -230,6 +234,8 @@ main(int argc, char *argv[])
|
2011-06-14 19:53:47 +02:00
|
|
|
action = FILE_LIST;
|
2007-05-17 11:31:52 +02:00
|
|
|
break;
|
|
|
|
|
case 'm':
|
|
|
|
|
+ if (!optarg)
|
|
|
|
|
+ usage();
|
|
|
|
|
magicfile = optarg;
|
|
|
|
|
break;
|
|
|
|
|
case 'n':
|
