Changeset 2344 for zzuf/trunk/src/zzuf.cTweet

Timestamp:

May 19, 2008, 1:25:01 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Change -F to -j, to mimic make.

File:

• zzuf/trunk/src/zzuf.c (modified) (6 diffs)

zzuf/trunk/src/zzuf.c

@@ -170 +170 @@
 #endif
 #define OPTSTR "+" OPTSTR_REGEX OPTSTR_RLIMIT_MEM OPTSTR_RLIMIT_CPU \
-                "Ab:B:C:dD:f:F:il:mnp:P:qr:R:s:St:vxhV"
+                "Ab:B:C:dD:f:F:ij:l:mnp:P:qr:R:s:St:vxhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
@@ -189 +189 @@
 #endif
             { "fuzzing",     1, NULL, 'f' },
-            { "max-forks",   1, NULL, 'F' },
             { "stdin",       0, NULL, 'i' },
 #if defined HAVE_REGEX_H
             { "include",     1, NULL, 'I' },
 #endif
+            { "jobs",        1, NULL, 'j' },
             { "list",        1, NULL, 'l' },
             { "md5",         0, NULL, 'm' },
@@ -260 +260 @@
             opts->fuzzing = myoptarg;
             break;
-        case 'F': /* --max-forks */
-            opts->maxchild = atoi(myoptarg) > 1 ? atoi(myoptarg) : 1;
-            break;
+        case 'F':
+            fprintf(stderr, "%s: `-F' is deprecated, use `-j'\n", argv[0]);
+            return EXIT_FAILURE;
         case 'i': /* --stdin */
             setenv("ZZUF_STDIN", "1", 1);
@@ -278 +278 @@
             break;
 #endif
+        case 'j': /* --jobs */
+            opts->maxchild = atoi(myoptarg) > 1 ? atoi(myoptarg) : 1;
+            break;
         case 'l': /* --list */
             opts->list = myoptarg;
@@ -1161 +1164 @@
     printf("Usage: zzuf [-AdimnqSvx] [-s seed|-s start:stop] [-r ratio|-r min:max]\n");
 #endif
-    printf("              [-f fuzzing] [-D delay] [-F forks] [-C crashes] [-B bytes]\n");
+    printf("              [-f fuzzing] [-D delay] [-j jobs] [-C crashes] [-B bytes]\n");
     printf("              [-t seconds] ");
 #if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
@@ -1194 +1197 @@
 #endif
     printf("  -f, --fuzzing <mode>      use fuzzing mode <mode> ([xor] set unset)\n");
-    printf("  -F, --max-forks <n>       number of concurrent children (default 1)\n");
     printf("  -i, --stdin               fuzz standard input\n");
 #if defined HAVE_REGEX_H
     printf("  -I, --include <regex>     only fuzz files matching <regex>\n");
 #endif
+    printf("  -j, --jobs <n>            number of simultaneous jobs (default 1)\n");
     printf("  -l, --list <list>         only fuzz Nth descriptor with N in <list>\n");
     printf("  -m, --md5                 compute the output's MD5 hash\n");