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

Timestamp:

Jan 25, 2007, 2:28:40 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Version 0.6.
• Updated NEWS and ChangeLog?.

File:

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

zzuf/trunk/src/zzuf.c

@@ -83 +83 @@
 static void *get_entry(char const *);
 #endif
+static void finfo(FILE *, struct opts *);
 #if defined HAVE_REGEX_H
 static char *merge_regex(char *, char *);
@@ -425 +426 @@
     {
         _zz_md5_fini(md5sum, ctx);
-        fprintf(stdout, "zzuf[s=%i,r=%g]: %.02x%.02x%.02x%.02x%.02x"
-                "%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x\n",
-                opts->seed, opts->minratio, md5sum[0], md5sum[1], md5sum[2],
-                md5sum[3], md5sum[4], md5sum[5], md5sum[6], md5sum[7],
-                md5sum[8], md5sum[9], md5sum[10], md5sum[11], md5sum[12],
-                md5sum[13], md5sum[14], md5sum[15]);
+        finfo(stdout, opts);
+        fprintf(stdout, "%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x"
+                "%.02x%.02x%.02x%.02x%.02x%.02x\n", md5sum[0], md5sum[1],
+                md5sum[2], md5sum[3], md5sum[4], md5sum[5], md5sum[6],
+                md5sum[7], md5sum[8], md5sum[9], md5sum[10], md5sum[11],
+                md5sum[12], md5sum[13], md5sum[14], md5sum[15]);
         fflush(stdout);
     }
@@ -436 +437 @@
     _zz_unregister(0);
     _zz_fd_fini();
+}
+
+static void finfo(FILE *fp, struct opts *opts)
+{
+    if(opts->minratio == opts->maxratio)
+        fprintf(fp, "zzuf[s=%i,r=%g]: ", opts->seed, opts->minratio);
+    else
+        fprintf(fp, "zzuf[s=%i,r=%g:%g]: ", opts->seed,
+                opts->minratio, opts->maxratio);
 }
 
@@ -602 +612 @@
 
     if(opts->verbose)
-        fprintf(stderr, "zzuf[s=%i,r=%g]: launched %s\n",
-                opts->child[i].seed, opts->child[i].ratio,
-                opts->newargv[0]);
+    {
+        finfo(stderr, opts);
+        fprintf(stderr, "launched %s\n", opts->newargv[0]);
+    }
 
     opts->lastlaunch = now;
@@ -629 +640 @@
         {
             if(opts->verbose)
-                fprintf(stderr, "zzuf[s=%i,r=%g]: "
-                        "data output exceeded, sending SIGTERM\n", 
-                        opts->child[i].seed, opts->child[i].ratio);
+            {
+                finfo(stderr, opts);
+                fprintf(stderr, "data output exceeded, sending SIGTERM\n");
+            }
             kill(opts->child[i].pid, SIGTERM);
             opts->child[i].date = now;
@@ -642 +654 @@
         {
             if(opts->verbose)
-                fprintf(stderr, "zzuf[s=%i,r=%g]: "
-                        "running time exceeded, sending SIGTERM\n", 
-                        opts->child[i].seed, opts->child[i].ratio);
+            {
+                finfo(stderr, opts);
+                fprintf(stderr, "running time exceeded, sending SIGTERM\n");
+            }
             kill(opts->child[i].pid, SIGTERM);
             opts->child[i].date = now;
@@ -658 +671 @@
         {
             if(opts->verbose)
-                fprintf(stderr, "zzuf[s=%i,r=%g]: "
-                        "not responding, sending SIGKILL\n", 
-                        opts->child[i].seed, opts->child[i].ratio);
+            {
+                finfo(stderr, opts);
+                fprintf(stderr, "not responding, sending SIGKILL\n");
+            }
             kill(opts->child[i].pid, SIGKILL);
             opts->child[i].status = STATUS_SIGKILL;
@@ -688 +702 @@
         if(opts->checkexit && WIFEXITED(status) && WEXITSTATUS(status))
         {
-            fprintf(stderr, "zzuf[s=%i,r=%g]: exit %i\n",
-                    opts->child[i].seed, opts->child[i].ratio,
-                    WEXITSTATUS(status));
+            finfo(stderr, opts);
+            fprintf(stderr, "exit %i\n", WEXITSTATUS(status));
             opts->crashes++;
         }
@@ -697 +710 @@
                        && opts->child[i].status == STATUS_SIGTERM))
         {
-            fprintf(stderr, "zzuf[s=%i,r=%g]: signal %i%s%s\n",
-                    opts->child[i].seed, opts->child[i].ratio,
+            finfo(stderr, opts);
+            fprintf(stderr, "signal %i%s%s\n",
                     WTERMSIG(status), sig2str(WTERMSIG(status)),
                       (WTERMSIG(status) == SIGKILL && opts->maxmem >= 0) ?
@@ -713 +726 @@
         {
             _zz_md5_fini(md5sum, opts->child[i].ctx);
-            fprintf(stdout, "zzuf[s=%i,r=%g]: %.02x%.02x%.02x%.02x%.02x%.02x"
-                    "%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x\n",
-                    opts->child[i].seed, opts->child[i].ratio,
-                    md5sum[0], md5sum[1], md5sum[2], md5sum[3], md5sum[4],
-                    md5sum[5], md5sum[6], md5sum[7], md5sum[8], md5sum[9],
-                    md5sum[10], md5sum[11], md5sum[12], md5sum[13],
-                    md5sum[14], md5sum[15]);
+            finfo(stdout, opts);
+            fprintf(stdout, "%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x%.02x"
+                    "%.02x%.02x%.02x%.02x%.02x%.02x%.02x\n", md5sum[0],
+                    md5sum[1], md5sum[2], md5sum[3], md5sum[4], md5sum[5],
+                    md5sum[6], md5sum[7], md5sum[8], md5sum[9], md5sum[10],
+                    md5sum[11], md5sum[12], md5sum[13], md5sum[14], md5sum[15]);
             fflush(stdout);
         }