input.c

@@ -5,25 +5,20 @@
 int
 readb(FILE *fp, unsigned char *s, int slen)
 {
-    int read, tread;
+    unsigned char *send;
-    unsigned char *send, *sbeg;
+    unsigned char *sbeg;
     unsigned char *l, *r;
     
-    read = tread = 0;
+    sbeg = s;
-    sbeg = l = r = s;
+    send = s + fread(s, sizeof(*s), slen, fp);
-    while (tread < slen && (read = fread(l, sizeof(*l), slen-tread, fp))) {
+    for (l = r = sbeg; r < send; ++r)
-        tread += read;
-        send = s + tread;
-        for (r = l; r < send; ++r)
         if (*r != '\n')
             *l++ = *r;
-        tread -= r - l;
     if (l > sbeg) {
         for (--l; *l == PADDING; --l)
             ;
         ++l;
     }
-    }
 
     return l-sbeg;
 }