Changeset 7416d46a for tools/repeat.c

Timestamp:

Jan 30, 2018, 3:54:32 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

633a642

Parents:

f792cb8 (diff), 42be3c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tools/repeat.c (modified) (6 diffs)

tools/repeat.c

@@ -26 +26 @@
                 if(print_iterations) {
                         printf("\r%d / %d", i, repetitions);
+                        fflush(stdout);
                 }
                 int retcode = run();
@@ -47 +48 @@
         fprintf(out, "Repeat CMD N times\n\n");
         fprintf(out, "\t-h,--help\tprint this usage message\n");
-        fprintf(out, "\t-s\tstop on error\n");
-        fprintf(out, "\t-i\toutput iterations instead of CMD stdout\n");
-        fprintf(out, "\t-x\tprint CMD before running it\n");
+        fprintf(out, "\t-s\t\tstop on error\n");
+        fprintf(out, "\t-i\t\toutput iterations instead of CMD stdout\n");
+        fprintf(out, "\t-x\t\tprint CMD before running it\n");
+        fprintf(out, "\t-a FILE\t\tredirect output of command to append to FILE\n");
+        fprintf(out, "\t-r FILE\t\tredirect output of command to FILE\n");
         exit(code);
 }
@@ -55 +58 @@
 char ** cmd_to_run = NULL;
 bool print_cmd = false;
+bool redirect = false;
+bool redirect_append = false;
+char * redirect_to = "/dev/null";
 pid_t child_pid = 0;
 
@@ -73 +79 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "hsxi", long_opts, &long_index)) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "ahirsx", long_opts, &long_index)) != -1 ) {
                 switch ( c ) {
                         case Help:
@@ -87 +93 @@
                         case 'i':
                                 print_iterations = true;
+                                break;
+                        case 'a':
+                                if(redirect) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }
+                                redirect_append = true;
+                                redirect_to = argv[optind];
+                                optind++;
+                                break;
+                        case 'r':
+                                if(redirect_append) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }
+                                redirect = true;
+                                redirect_to = argv[optind];
+                                optind++;
                                 break;
                         default:
@@ -142 +160 @@
                         printf("\n");
                 }
-                if(print_iterations) {
+                if(print_iterations || redirect || redirect_append) {
                         __attribute__((unused)) FILE * ignore =
-                                freopen("/dev/null", "w", stdout);
+                                freopen(redirect_to, redirect_append ? "a" : "w" , stdout);
                 }
                 execvp ( *cmd_to_run, cmd_to_run);