Changeset 4259 for zzuf/trunk/srcTweet

Timestamp:

Jan 13, 2010, 12:54:38 AM (11 years ago)

Author:

Sam Hocevar

Message:

Minor zzcat refactoring.

File:

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

zzuf/trunk/src/zzcat.c

@@ -56 +56 @@
 
 static int run(char const *sequence, char const *file);
+static void output(char const *buf, size_t len);
 
 static void syntax(void);
@@ -165 +166 @@
 
 /*
+ * File output method.
+ */
+
+static void output(char const *buf, size_t len)
+{
+    size_t i;
+
+    if (!(escape_tabs || escape_ends || escape_other
+           || number_lines || number_nonblank))
+    {
+        fwrite(buf, len, 1, stdout);
+        return;
+    }
+
+    for (i = 0; i < len; i++)
+    {
+        int ch = (unsigned int)(unsigned char)buf[i];
+
+        if (escape_other && ch >= 0x80)
+        {
+            if (ch - 0x80 < 0x20 || ch - 0x80 == 0x7f)
+                fprintf(stdout, "M-^%c", (ch - 0x80) ^ 0x40);
+            else
+                fprintf(stdout, "M-%c", ch - 0x80);
+        }
+        else if (escape_tabs && ch == '\t')
+            fprintf(stdout, "^I");
+        else if (escape_ends && ch == '\n')
+            puts("$");
+        else if (escape_other && (ch < 0x20 || ch == 0x7f))
+            fprintf(stdout, "^%c", ch ^ 0x40);
+        else
+            putchar(ch);
+    }
+}
+
+/*
  * Command intepreter
  */
@@ -187 +225 @@
     } while(0)
 
+#define ROUNDUP(size) (((size) + 0xfff) & ~0xfff)
+
 #define MERGE(address, cnt, off) \
     do { \
@@ -193 +233 @@
         { \
             retlen = retoff + _cnt; \
-            retbuf = realloc(retbuf, retlen); \
+            if (ROUNDUP(retlen) != ROUNDUP(retlen - _cnt)) \
+                retbuf = realloc(retbuf, ROUNDUP(retlen)); \
         } \
         if (_cnt > 0) \
@@ -488 +529 @@
         close(fd);
 
-    if (escape_tabs || escape_ends || escape_other || number_lines)
-    {
-        size_t i;
-
-        for (i = 0; i < retlen; i++)
-        {
-            int ch = (unsigned int)(unsigned char)retbuf[i];
-
-            if (escape_other && ch >= 0x80)
-            {
-                if (ch - 0x80 < 0x20 || ch - 0x80 == 0x7f)
-                    fprintf(stdout, "M-^%c", (ch - 0x80) ^ 0x40);
-                else
-                    fprintf(stdout, "M-%c", ch - 0x80);
-            }
-            else if (escape_tabs && ch == '\t')
-                fprintf(stdout, "^I");
-            else if (escape_ends && ch == '\n')
-                puts("$");
-            else if (escape_other && (ch < 0x20 || ch == 0x7f))
-                fprintf(stdout, "^%c", ch ^ 0x40);
-            else
-                putchar(ch);
-        }
-    }
-    else
-    {
-        fwrite(retbuf, retlen, 1, stdout);
-    }
-
+    output(retbuf, retlen);
     free(retbuf);
     free(tmp);