Changeset 4270 for zzuf/trunk/srcTweet

Timestamp:

Jan 14, 2010, 1:27:03 AM (11 years ago)

Author:

Sam Hocevar

Message:

Implement zzcat -b and -n. Fixes #74.

File:

• zzuf/trunk/src/zzcat.c (modified) (4 diffs)

zzuf/trunk/src/zzcat.c

@@ -108 +108 @@
             break;
         case 'b': /* --number-nonblank */
-            number_lines = 1;
+            number_nonblank = 1;
             break;
         case 'e':
@@ -117 +117 @@
             break;
         case 'n': /* --number */
-            number_nonblank = 1;
+            number_lines = 1;
             break;
         case 't':
@@ -172 +172 @@
 {
     size_t i;
+    int line = 1, newline = 1;
 
     if (!(escape_tabs || escape_ends || escape_other
@@ -183 +184 @@
     {
         int ch = (unsigned int)(unsigned char)buf[i];
+
+        if (number_lines || number_nonblank)
+        {
+            if (newline)
+            {
+                newline = 0;
+                if (!number_nonblank || ch != '\n')
+                    fprintf(stdout, "% 6i\t", line++);
+            }
+
+            if (ch == '\n')
+                newline = 1;
+        }
 
         if (escape_other && ch >= 0x80)