Changeset 1200Tweet

Timestamp:

Oct 13, 2006, 3:19:45 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Use fgets() instead of fscanf(). Uses an additional memory buffer, but paves the way for custom IO functions.

File:

• toilet/trunk/src/figlet.c (modified) (5 diffs)

toilet/trunk/src/figlet.c

@@ -120 +120 @@
     char *data = NULL;
     char path[2048];
+    char buf[2048];
     char hardblank[10];
     cucul_buffer_t *b;
@@ -145 +146 @@
     cx->full_layout = 0;
     cx->codetag_count = 0;
-    if(fscanf(f, "%*[ft]lf2a%6s %u %u %u %i %u %u %u %u\n", hardblank,
+    fgets(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,
               &cx->old_layout, &comment_lines, &cx->print_direction,
@@ -159 +161 @@
     /* Skip comment lines */
     for(i = 0; i < comment_lines; i++)
-    {
-        fscanf(f, "%*[^\n]");
-        fscanf(f, "%*c");
-    }
+        fgets(buf, 2048, f);
 
     /* Read mandatory characters (32-127, 196, 214, 220, 228, 246, 252, 223)
@@ -186 +185 @@
         else
         {
-            char number[10];
-            int ret = fscanf(f, "%s %*[^\n]", number);
-
-            if(ret == EOF)
+            if(fgets(buf, 2048, f) == NULL)
                 break;
 
-            if(!ret)
+            if(!buf[0])
             {
                 free(data);
@@ -201 +197 @@
             }
 
-            if(number[1] == 'x')
-                sscanf(number, "%x", &cx->lookup[cx->glyphs * 2]);
+            if(buf[1] == 'x')
+                sscanf(buf, "%x", &cx->lookup[cx->glyphs * 2]);
             else
-                sscanf(number, "%u", &cx->lookup[cx->glyphs * 2]);
-
-            fscanf(f, "%*c");
+                sscanf(buf, "%u", &cx->lookup[cx->glyphs * 2]);
         }