Changeset 2344Tweet

Timestamp:

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

Author:

Sam Hocevar

Message:

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

Location:

zzuf/trunk

Files:

• doc/zzuf.1 (modified) (4 diffs)
• src/zzuf.c (modified) (6 diffs)

zzuf/trunk/doc/zzuf.1

@@ -5 +5 @@
 \fBzzuf\fR [\fB\-AcdimnqSvx\fR] [\fB\-s\fR \fIseed\fR|\fB\-s\fR \fIstart:stop\fR] [\fB\-r\fR \fIratio\fR|\fB\-r\fR \fImin:max\fR]
 .br
-       [\fB\-f\fR \fIfuzzing\fR] [\fB\-D\fR \fIdelay\fR] [\fB\-F\fR \fIforks\fR] [\fB\-C\fR \fIcrashes\fR] [\fB\-B\fR \fIbytes\fR]
+       [\fB\-f\fR \fIfuzzing\fR] [\fB\-D\fR \fIdelay\fR] [\fB\-j\fR \fIjobs\fR] [\fB\-C\fR \fIcrashes\fR] [\fB\-B\fR \fIbytes\fR]
 .br
        [\fB\-t\fR \fIseconds\fR] [\fB\-T\fR \fIseconds\fR] [\fB\-M\fR \fImegabytes\fR] [\fB\-b\fR \fIranges\fR] [\fB\-p\fR \fIports\fR]
@@ -92 +92 @@
 \fB\-D\fR, \fB\-\-delay\fR=\fIdelay\fR
 Do not launch more than one process every \fIdelay\fR seconds. This option
-should be used together with \fB\-F\fR to avoid fork bombs.
+should be used together with \fB\-j\fR to avoid fork bombs.
 .TP
 \fB\-E\fR, \fB\-\-exclude\fR=\fIregex\fR
@@ -119 +119 @@
 The default value for \fImode\fR is \fBxor\fR.
 .TP
-\fB\-F\fR, \fB\-\-max\-forks\fR=\fIforks\fR
+\fB\-j\fR, \fB\-\-jobs\fR=\fIjobs\fR
 Specify the number of simultaneous children that can be run. By default,
 \fBzzuf\fR only launches one process at a time.
@@ -351 +351 @@
 by restricting fuzzing to offsets after 4 (\fB\-b4\-\fR), disabling its
 standard output messages (\fB\-q\fR), launching up to five simultaneous child
-processes (\fB\-F5\fR) but waiting at least half a second between launches
+processes (\fB\-j5\fR) but waiting at least half a second between launches
 (\fB\-D0.5\fR), killing MPlayer if it takes more than one minute to
 read the file (\fB\-T60\fR) and disabling its \fBSIGSEGV\fR signal handler
 (\fB\-S\fR):
 .PP
-\fB    zzuf \-c \-r0.001:0.02 \-s0:10000 \-b4\- \-q \-F5 \-D0.5 \-T60 \-S \\\fR
+\fB    zzuf \-c \-r0.001:0.02 \-s0:10000 \-b4\- \-q \-j5 \-D0.5 \-T60 \-S \\\fR
 .br
 \fB      mplayer \-benchmark \-vo null \-fps 1000 movie.avi\fR

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");