Changeset 1799Tweet

Timestamp:

Jul 10, 2007, 4:26:08 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Rename ZZUF_RLIMIT_CONST into ZZUF_RLIMIT_MEM because we're going to have the _CPU one as well.

File:

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

zzuf/trunk/src/zzuf.c

@@ -77 +77 @@
 
 #if defined RLIMIT_AS
-#   define ZZUF_RLIMIT_CONST RLIMIT_AS
+#   define ZZUF_RLIMIT_MEM RLIMIT_AS
 #elif defined RLIMIT_VMEM
-#   define ZZUF_RLIMIT_CONST RLIMIT_VMEM
+#   define ZZUF_RLIMIT_MEM RLIMIT_VMEM
 #elif defined RLIMIT_DATA
-#   define ZZUF_RLIMIT_CONST RLIMIT_DATA
+#   define ZZUF_RLIMIT_MEM RLIMIT_DATA
 #else
-#   undef HAVE_SETRLIMIT
+#   undef ZZUF_RLIMIT_MEM
+#endif
+
+#if defined RLIMIT_CPU
+#   define ZZUF_RLIMIT_CPU RLIMIT_CPU
+#else
+#   undef ZZUF_RLIMIT_CPU
 #endif
 
@@ -152 +158 @@
 #   define OPTSTR_REGEX ""
 #endif
-#if defined HAVE_SETRLIMIT
-#   define OPTSTR_RLIMIT "M:"
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
+#   define OPTSTR_RLIMIT_MEM "M:"
 #else
-#   define OPTSTR_RLIMIT ""
-#endif
-#define OPTSTR OPTSTR_REGEX OPTSTR_RLIMIT \
+#   define OPTSTR_RLIMIT_MEM ""
+#endif
+#define OPTSTR OPTSTR_REGEX OPTSTR_RLIMIT_MEM \
             "Ab:B:C:dD:f:F:imnp:P:qr:R:s:ST:vxhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
@@ -267 +273 @@
             opts->md5 = 1;
             break;
-#if defined HAVE_SETRLIMIT
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
         case 'M': /* --max-memory */
             setenv("ZZUF_MEMORY", "1", 1);
@@ -891 +897 @@
 #endif
 
-#if defined HAVE_SETRLIMIT
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
     if(opts->maxmem >= 0)
     {
@@ -897 +903 @@
         rlim.rlim_cur = opts->maxmem * 1000000;
         rlim.rlim_max = opts->maxmem * 1000000;
-        setrlimit(ZZUF_RLIMIT_CONST, &rlim);
+        setrlimit(ZZUF_RLIMIT_MEM, &rlim);
     }
 #endif
@@ -1104 +1110 @@
 #endif
     printf("              [-f fuzzing] [-D delay] [-F forks] [-C crashes] [-B bytes]\n");
-#if defined HAVE_SETRLIMIT
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
     printf("              [-T seconds] [-M bytes] [-b ranges] [-P protect] [-R refuse]\n");
 #else
@@ -1139 +1145 @@
 #endif
     printf("  -m, --md5                 compute the output's MD5 hash\n");
-#if defined HAVE_SETRLIMIT
+#if defined HAVE_SETRLIMIT && defined ZZUF_RLIMIT_MEM
     printf("  -M, --max-memory <n>      maximum child virtual memory size in MB\n");
 #endif