Changeset 4289Tweet

Timestamp:

01/21/10 02:17:21 (3 years ago)

Author:

sam

Message:

Add a debug mode to zzcat.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/doc/zzcat.1.in

@@ -3 +3 @@
 zzcat \- concatenate files using different instruction sequences
 .SH SYNOPSIS
-\fBzzcat\fR [\fB\-AbeEntTv\fR] [\fB\-r\fR \fIloops\fR]
+\fBzzcat\fR [\fB\-AbdeEntTv\fR] [\fB\-r\fR \fIloops\fR]
 [\fB\-x\fR \fIsequence\fR] [\fIFILE\fR]...
 .br
@@ -26 +26 @@
 \fB\-b\fR, \fB\-\-number\-nonblank\fR
 Number nonempty output lines.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Output debugging information.
 .TP
 \fB\-e\fR

zzuf/trunk/src/zzcat.c

@@ -65 +65 @@
 
 /* Global parameters */
+static int debug = 0;
 static int repeat = 1;
 static char escape_tabs = 0;
@@ -89 +90 @@
     for (;;)
     {
-#define OPTSTR "+AbeEnr:stTvx:lhV"
+#define OPTSTR "+AbdeEnr:stTvx:lhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
@@ -96 +97 @@
             { "show-all",         0, NULL, 'A' },
             { "number-nonblank",  0, NULL, 'b' },
+            { "debug",            0, NULL, 'd' },
             { "show-ends",        0, NULL, 'E' },
             { "number",           0, NULL, 'n' },
@@ -120 +122 @@
         case 'b': /* --number-nonblank */
             number_nonblank = 1;
+            break;
+        case 'd': /* --debug */
+            debug = 1;
             break;
         case 'e':
@@ -278 +283 @@
             retlen = retoff + _cnt; \
             if (!retbuf || ROUNDUP(retlen) != ROUNDUP(retlen - _cnt)) \
+            { \
+                if (debug) \
+                    fprintf(stderr, "D: zzcat: allocating %i bytes for %i\n", \
+                            (int)ROUNDUP(retlen), (int)retlen); \
                 retbuf = realloc(retbuf, ROUNDUP(retlen)); \
+            } \
         } \
         if (_cnt > 0) \
+        { \
+            if (debug) \
+                fprintf(stderr, "D: zzcat: writing %i byte%s at offset %i\n", \
+                        (int)_cnt, _cnt == 1 ? "" : "s", (int)retoff); \
             memcpy(retbuf + retoff, address, _cnt); \
+        } \
         retoff += _off; \
     } while(0)
@@ -785 +800 @@
 static void usage(void)
 {
-    printf("Usage: zzcat [AbeEntTv] [-x sequence] [FILE...]\n");
+    printf("Usage: zzcat [AbdeEntTv] [-x sequence] [FILE...]\n");
     printf("       zzcat -l | --list\n");
     printf("       zzcat -h | --help\n");
@@ -794 +809 @@
     printf("  -A, --show-all            equivalent to -vET\n");
     printf("  -b, --number-nonblank     number nonempty output lines\n");
+    printf("  -d, --debug               print debugging information\n");
     printf("  -e                        equivalent to -vE\n");
     printf("  -E, --show-ends           display $ at end of each line\n");