Changeset 4271

Timestamp:

01/15/10 01:17:03 (3 years ago)

Author:

sam

Message:

Implement zzcat -s (squeeze empty lines).

File:

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

zzuf/trunk/src/zzcat.c

@@ -68 +68 @@
 static int number_lines = 0;
 static int number_nonblank = 0;
+static int squeeze_lines = 0;
 
 /*
@@ -80 +81 @@
     for (;;)
     {
-#define OPTSTR "+AbeEntTvx:lhV"
+#define OPTSTR "+AbeEnstTvx:lhV"
 #define MOREINFO "Try `%s --help' for more information.\n"
         int option_index = 0;
@@ -89 +90 @@
             { "show-ends",        0, NULL, 'E' },
             { "number",           0, NULL, 'n' },
+            { "squeeze-blank",    0, NULL, 's' },
             { "show-tabs",        0, NULL, 'T' },
             { "show-nonprinting", 0, NULL, 'v' },
@@ -118 +120 @@
         case 'n': /* --number */
             number_lines = 1;
+            break;
+        case 's': /* --squeeze-blank */
+            squeeze_lines = 1;
             break;
         case 't':
@@ -175 +180 @@
 
     if (!(escape_tabs || escape_ends || escape_other
-           || number_lines || number_nonblank))
+           || number_lines || number_nonblank || squeeze_lines))
     {
         fwrite(buf, len, 1, stdout);
@@ -184 +189 @@
     {
         int ch = (unsigned int)(unsigned char)buf[i];
+
+        if (squeeze_lines && i > 1
+             && ch == '\n' && buf[i - 1] == '\n' && buf[i - 2] == '\n')
+            continue;
 
         if (number_lines || number_nonblank)