Changeset 2344


Ignore:
Timestamp:
May 19, 2008, 1:25:01 PM (12 years ago)
Author:
Sam Hocevar
Message:
  • Change -F to -j, to mimic make.
Location:
zzuf/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • zzuf/trunk/doc/zzuf.1

    r2343 r2344  
    55\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]
    66.br
    7        [\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]
     7       [\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]
    88.br
    99       [\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]
     
    9292\fB\-D\fR, \fB\-\-delay\fR=\fIdelay\fR
    9393Do not launch more than one process every \fIdelay\fR seconds. This option
    94 should be used together with \fB\-F\fR to avoid fork bombs.
     94should be used together with \fB\-j\fR to avoid fork bombs.
    9595.TP
    9696\fB\-E\fR, \fB\-\-exclude\fR=\fIregex\fR
     
    119119The default value for \fImode\fR is \fBxor\fR.
    120120.TP
    121 \fB\-F\fR, \fB\-\-max\-forks\fR=\fIforks\fR
     121\fB\-j\fR, \fB\-\-jobs\fR=\fIjobs\fR
    122122Specify the number of simultaneous children that can be run. By default,
    123123\fBzzuf\fR only launches one process at a time.
     
    351351by restricting fuzzing to offsets after 4 (\fB\-b4\-\fR), disabling its
    352352standard output messages (\fB\-q\fR), launching up to five simultaneous child
    353 processes (\fB\-F5\fR) but waiting at least half a second between launches
     353processes (\fB\-j5\fR) but waiting at least half a second between launches
    354354(\fB\-D0.5\fR), killing MPlayer if it takes more than one minute to
    355355read the file (\fB\-T60\fR) and disabling its \fBSIGSEGV\fR signal handler
    356356(\fB\-S\fR):
    357357.PP
    358 \fB    zzuf \-c \-r0.001:0.02 \-s0:10000 \-b4\- \-q \-F5 \-D0.5 \-T60 \-S \\\fR
     358\fB    zzuf \-c \-r0.001:0.02 \-s0:10000 \-b4\- \-q \-j5 \-D0.5 \-T60 \-S \\\fR
    359359.br
    360360\fB      mplayer \-benchmark \-vo null \-fps 1000 movie.avi\fR
  • zzuf/trunk/src/zzuf.c

    r2343 r2344  
    170170#endif
    171171#define OPTSTR "+" OPTSTR_REGEX OPTSTR_RLIMIT_MEM OPTSTR_RLIMIT_CPU \
    172                 "Ab:B:C:dD:f:F:il:mnp:P:qr:R:s:St:vxhV"
     172                "Ab:B:C:dD:f:F:ij:l:mnp:P:qr:R:s:St:vxhV"
    173173#define MOREINFO "Try `%s --help' for more information.\n"
    174174        int option_index = 0;
     
    189189#endif
    190190            { "fuzzing",     1, NULL, 'f' },
    191             { "max-forks",   1, NULL, 'F' },
    192191            { "stdin",       0, NULL, 'i' },
    193192#if defined HAVE_REGEX_H
    194193            { "include",     1, NULL, 'I' },
    195194#endif
     195            { "jobs",        1, NULL, 'j' },
    196196            { "list",        1, NULL, 'l' },
    197197            { "md5",         0, NULL, 'm' },
     
    260260            opts->fuzzing = myoptarg;
    261261            break;
    262         case 'F': /* --max-forks */
    263             opts->maxchild = atoi(myoptarg) > 1 ? atoi(myoptarg) : 1;
    264             break;
     262        case 'F':
     263            fprintf(stderr, "%s: `-F' is deprecated, use `-j'\n", argv[0]);
     264            return EXIT_FAILURE;
    265265        case 'i': /* --stdin */
    266266            setenv("ZZUF_STDIN", "1", 1);
     
    278278            break;
    279279#endif
     280        case 'j': /* --jobs */
     281            opts->maxchild = atoi(myoptarg) > 1 ? atoi(myoptarg) : 1;
     282            break;
    280283        case 'l': /* --list */
    281284            opts->list = myoptarg;
     
    11611164    printf("Usage: zzuf [-AdimnqSvx] [-s seed|-s start:stop] [-r ratio|-r min:max]\n");
    11621165#endif
    1163     printf("              [-f fuzzing] [-D delay] [-F forks] [-C crashes] [-B bytes]\n");
     1166    printf("              [-f fuzzing] [-D delay] [-j jobs] [-C crashes] [-B bytes]\n");
    11641167    printf("              [-t seconds] ");
    11651168#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_CPU
     
    11941197#endif
    11951198    printf("  -f, --fuzzing <mode>      use fuzzing mode <mode> ([xor] set unset)\n");
    1196     printf("  -F, --max-forks <n>       number of concurrent children (default 1)\n");
    11971199    printf("  -i, --stdin               fuzz standard input\n");
    11981200#if defined HAVE_REGEX_H
    11991201    printf("  -I, --include <regex>     only fuzz files matching <regex>\n");
    12001202#endif
     1203    printf("  -j, --jobs <n>            number of simultaneous jobs (default 1)\n");
    12011204    printf("  -l, --list <list>         only fuzz Nth descriptor with N in <list>\n");
    12021205    printf("  -m, --md5                 compute the output's MD5 hash\n");
Note: See TracChangeset for help on using the changeset viewer.