Changeset 4278Tweet

Timestamp:

01/18/10 03:02:06 (3 years ago)

Author:

sam

Message:

Add a -r flag to zzcat to repeatedly cat file lists.

Location:

zzuf/trunk

Files:

• doc/zzcat.1.in (modified) (2 diffs)
• src/zzcat.c (modified) (6 diffs)

zzuf/trunk/doc/zzcat.1.in

@@ -3 +3 @@
 zzcat \- concatenate files using different instruction sequences
 .SH SYNOPSIS
-\fBzzcat\fR [\fB\-AbeEntTv\fR] [\fB\-x\fR \fIsequence\fR] [\fIFILE\fR]...
+\fBzzcat\fR [\fB\-AbeEntTv\fR] [\fB\-r\fR \fIloops\fR]
+[\fB\-x\fR \fIsequence\fR] [\fIFILE\fR]...
 .br
 \fBzzcat \-l\fR | \fB\-\-list\fR
@@ -34 +35 @@
 \fB\-n\fR, \fB\-\-number\fR
 Number all output lines.
+.TP
+\fB\-r\fR, \fB\-\-repeat\fR=\fIloops\fR
+Concatenate all files \fIloops\fR times.
 .TP
 \fB\-t\fR

zzuf/trunk/src/zzcat.c

@@ -63 +63 @@
 
 /* Global parameters */
+static int repeat = 1;
 static char escape_tabs = 0;
 static char escape_ends = 0;
@@ -86 +87 @@
     for (;;)
     {
-#define OPTSTR "+AbeEnstTvx:lhV"
+#define OPTSTR "+AbeEnr:stTvx:lhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
@@ -95 +96 @@
             { "show-ends",        0, NULL, 'E' },
             { "number",           0, NULL, 'n' },
+            { "repeat",           1, NULL, 'r' },
             { "squeeze-blank",    0, NULL, 's' },
             { "show-tabs",        0, NULL, 'T' },
@@ -125 +127 @@
         case 'n': /* --number */
             number_lines = 1;
+            break;
+        case 'r': /* --repeat */
+            repeat = atoi(optarg);
             break;
         case 's': /* --squeeze-blank */
@@ -165 +170 @@
     }
 
-    for (i = myoptind; i < argc; i++)
-    {
-        int ret = run(sequence, argv[i]);
-        if (ret)
-            return ret;
-    }
+    while (repeat-- > 0)
+        for (i = myoptind; i < argc; i++)
+        {
+            int ret = run(sequence, argv[i]);
+            if (ret)
+                return ret;
+        }
 
     return EXIT_SUCCESS;
@@ -789 +795 @@
     printf("  -E, --show-ends           display $ at end of each line\n");
     printf("  -n, --number              number all output lines\n");
+    printf("  -r, --repeat=<loops>      concatenate command line files <loops> times\n");
     printf("  -t                        equivalent to -vT\n");
     printf("  -T, --show-tabs           display TAB characters as ^I\n");
     printf("  -v, --show-nonprinting    use ^ and M- notation, except for LFD and TAB\n");
-    printf("  -x, --execute <sequence>  execute commands in <sequence>\n");
+    printf("  -x, --execute=<sequence>  execute commands in <sequence>\n");
     printf("  -l, --list                list available program functions\n");
     printf("  -h, --help                display this help and exit\n");