Changeset 1201Tweet

Timestamp:

Oct 13, 2006, 3:36:23 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Moved I/O functions into a separate module.

Location:

toilet/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• figlet.c (modified) (8 diffs)
• io.c (added)
• io.h (added)

toilet/trunk/src/Makefile.am

@@ -3 +3 @@
 
 toilet_SOURCES = main.c \
+        io.c io.h \
         render.c render.h \
         filters.c filter.h \

toilet/trunk/src/figlet.c

@@ -27 +27 @@
 
 #include "toilet.h"
+#include "io.h"
 #include "figlet.h"
 
@@ -123 +124 @@
     char hardblank[10];
     cucul_buffer_t *b;
-    FILE *f;
+    TOIFILE *f;
     unsigned int i, j, size, comment_lines;
 
@@ -129 +130 @@
     snprintf(path, 2047, "%s/%s.tlf", cx->dir, cx->font);
     path[2047] = '\0';
-    f = fopen(path, "r");
+    f = toiopen(path, "r");
     if(!f)
     {
         snprintf(path, 2047, "%s/%s.flf", cx->dir, cx->font);
         path[2047] = '\0';
-        f = fopen(path, "r");
+        f = toiopen(path, "r");
         if(!f)
         {
@@ -146 +147 @@
     cx->full_layout = 0;
     cx->codetag_count = 0;
-    fgets(buf, 2048, f);
+    toigets(buf, 2048, f);
     if(sscanf(buf, "%*[ft]lf2a%6s %u %u %u %i %u %u %u %u\n", hardblank,
               &cx->height, &cx->baseline, &cx->max_length,
@@ -153 +154 @@
     {
         fprintf(stderr, "font `%s' has invalid header\n", path);
-        fclose(f);
+        toiclose(f);
         return -1;
     }
@@ -161 +162 @@
     /* Skip comment lines */
     for(i = 0; i < comment_lines; i++)
-        fgets(buf, 2048, f);
+        toigets(buf, 2048, f);
 
     /* Read mandatory characters (32-127, 196, 214, 220, 228, 246, 252, 223)
@@ -185 +186 @@
         else
         {
-            if(fgets(buf, 2048, f) == NULL)
+            if(toigets(buf, 2048, f) == NULL)
                 break;
 
@@ -210 +211 @@
                 data = realloc(data, size += 2048);
 
-            fgets(data + i, 2048, f);
+            toigets(data + i, 2048, f);
             i = (uintptr_t)strchr(data + i, 0) - (uintptr_t)data;
         }
     }
 
-    fclose(f);
+    toiclose(f);
 
     if(cx->glyphs < EXT_GLYPHS)