Changeset 1633 for zzufTweet

Timestamp:

Jan 9, 2007, 11:07:35 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Bah, reverted that. We'll use -O for --offset.

Location:

zzuf/trunk

Files:

• doc/zzuf.1 (modified) (5 diffs)
• src/zzuf.c (modified) (11 diffs)

zzuf/trunk/doc/zzuf.1

@@ -5 +5 @@
 \fBzzuf\fR [\fB\-cdiMnqS\fR] [\fB\-r\fR \fIratio\fR] [\fB\-s\fR \fIseed\fR | \fB\-s\fR \fIstart:stop\fR]
 .br
-                [\fB\-F\fR \fIforks\fR] [\fB\-C\fR \fIcrashes\fR] [\fB\-O\fR \fIbytes\fR] [\fB\-T\fR \fIseconds\fR]
+                [\fB\-F\fR \fIforks\fR] [\fB\-C\fR \fIcrashes\fR] [\fB\-B\fR \fIbytes\fR] [\fB\-T\fR \fIseconds\fR]
 .br
                 [\fB\-P\fR \fIprotect\fR] [\fB\-R\fR \fIrefuse\fR]
@@ -31 +31 @@
 interpret them as arguments for itself), eg:
 .PP
-\fB    zzuf \-O 1000 cat \-\- \-v /dev/zero\fR
+\fB    zzuf \-B 1000 cat \-\- \-v /dev/zero\fR
 .PP
 When no program is specified, \fBzzuf\fR simply fuzzes the standard input, as
@@ -38 +38 @@
 \fB    zzuf < /dev/zero\fR
 .SH OPTIONS
+.TP
+\fB\-B\fR, \fB\-\-max\-bytes\fR=\fIn\fR
+Automatically terminate child processes that output more than \fIn\fR bytes
+on the standard output and standard error channels. This is useful to detect
+infinite loops. See also the \fB\-T\fR flag.
 .TP
 \fB\-c\fR, \fB\-\-cmdline\fR
@@ -96 +101 @@
 \fB\-n\fR, \fB\-\-network\fR
 Fuzz the application's network input. By default \fBzzuf\fR only fuzzes files.
-.TP
-\fB\-O\fR, \fB\-\-max\-output\fR=\fIn\fR
-Automatically terminate child processes that output more than \fIn\fR bytes
-on the standard output and standard error channels. This is useful to detect
-infinite loops. See also the \fB\-T\fR flag.
 .TP
 \fB\-P\fR, \fB\-\-protect\fR=\fIlist\fR
@@ -187 +187 @@
 Automatically terminate child processes that run for more than \fIn\fR
 seconds. This is useful to detect infinite loops or processes stuck in other
-situations. See also the \fB\-O\fR flag.
+situations. See also the \fB\-B\fR flag.
 .TP
 \fB\-h\fR, \fB\-\-help\fR

zzuf/trunk/src/zzuf.c

@@ -78 +78 @@
 static int endseed = 1;
 static int quiet = 0;
-static int maxoutput = -1;
+static int maxbytes = -1;
 static int md5 = 0;
 static double maxtime = -1.0;
@@ -110 +110 @@
         {
             /* Long option, needs arg, flag, short option */
+            { "max-bytes",   1, NULL, 'B' },
             { "cmdline",     0, NULL, 'c' },
             { "max-crashes", 1, NULL, 'C' },
@@ -119 +120 @@
             { "md5",         0, NULL, 'M' },
             { "network",     0, NULL, 'n' },
-            { "max-output",  1, NULL, 'O' },
             { "protect",     1, NULL, 'P' },
             { "quiet",       0, NULL, 'q' },
@@ -130 +130 @@
             { "version",     0, NULL, 'v' },
         };
-        int c = getopt_long(argc, argv, "cC:dE:F:iI:MnO:P:qr:R:s:ST:hv",
+        int c = getopt_long(argc, argv, "B:cC:dE:F:iI:MnP:qr:R:s:ST:hv",
                             long_options, &option_index);
 #   else
 #       define MOREINFO "Try `%s -h' for more information.\n"
-        int c = getopt(argc, argv, "cC:dE:F:iI:MnO:P:qr:R:s:ST:hv");
+        int c = getopt(argc, argv, "B:cC:dE:F:iI:MnP:qr:R:s:ST:hv");
 #   endif
         if(c == -1)
@@ -141 +141 @@
         switch(c)
         {
+        case 'B': /* --max-bytes */
+            maxbytes = atoi(optarg);
+            break;
         case 'c': /* --cmdline */
             cmdline = 1;
@@ -179 +182 @@
         case 'n': /* --network */
             setenv("ZZUF_NETWORK", "1", 1);
-            break;
-        case 'O': /* --max-output */
-            maxoutput = atoi(optarg);
             break;
         case 'P': /* --protect */
@@ -466 +466 @@
     {
         if(child_list[i].status == STATUS_RUNNING
-            && maxoutput >= 0 && child_list[i].bytes > maxoutput)
+            && maxbytes >= 0 && child_list[i].bytes > maxbytes)
         {
             fprintf(stdout, "zzuf[seed=%i]: data exceeded, sending SIGTERM\n",
@@ -675 +675 @@
     printf("Mandatory arguments to long options are mandatory for short options too.\n");
 #   ifdef HAVE_GETOPT_LONG
+    printf("  -B, --max-bytes <n>      kill children that output more than <n> bytes\n");
     printf("  -c, --cmdline            only fuzz files specified in the command line\n");
     printf("  -C, --max-crashes <n>    stop after <n> children have crashed (default 1)\n");
@@ -684 +685 @@
     printf("  -M, --md5                compute the output's MD5 hash\n");
     printf("  -n, --network            fuzz network input\n");
-    printf("  -O, --max-output <n>     kill children that output more than <n> bytes\n");
     printf("  -P, --protect <list>     protect bytes and characters in <list>\n");
     printf("  -q, --quiet              do not print children's messages\n");
@@ -696 +696 @@
     printf("  -v, --version            output version information and exit\n");
 #   else
+    printf("  -B <n>           kill children that output more than <n> bytes\n");
     printf("  -c               only fuzz files specified in the command line\n");
     printf("  -C <n>           stop after <n> children have crashed (default 1)\n");
@@ -705 +706 @@
     printf("  -M               compute the output's MD5 hash\n");
     printf("  -n               fuzz network input\n");
-    printf("  -O <n>           kill children that output more than <n> bytes\n");
     printf("  -P <list>        protect bytes and characters in <list>\n");
     printf("  -q               do not print the fuzzed application's messages\n");