Makefile

@@ -1,12 +1,12 @@
 CFLAGS = -g -Wall -Wextra -Werror
 
-objects = main.o input.o encode.o
+objects = main.o input.o trans.o
 
 b64 : $(objects)
 	cc -o b64 $(objects)
 
-main.o input.o : input.h
+main.o trans.o input.o : input.h
-main.o encode.o : encode.h
+main.o trans.o : trans.h
 
 .PHONY : clean
 clean :

encode.c

@@ -1,100 +0,0 @@
-#include "encode.h"
-
-#define PADDING '='
-
-unsigned char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-                      "abcdefghijklmnopqrstuvwxyz" \
-                      "0123456789" \
-                      "+/";
-
-unsigned char b64u[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-                       "abcdefghijklmnopqrstuvwxyz" \
-                       "0123456789" \
-                       "-_";
-
-int
-encode(unsigned char *op, int olen, unsigned char *sp, int url)
-{
-    int n;
-    unsigned char *sb, *enc;
-
-    sb = sp;
-    enc = (!url) ? b64 : b64u;
-    switch (olen) {
-        case 3:
-            *sp++ = enc[(*op & ~3) >> 2];
-            n = (*op++ & 3) << 4;
-            *sp++ = enc[n + ((*op & ~15) >> 4)];
-            n = (*op++ & 15) << 2;
-            *sp++ = enc[n + ((*op & 192) >> 6)];
-            *sp = enc[*op & ~192];
-            break;
-        case 2:
-            *sp++ = enc[(*op & ~3) >> 2];
-            n = (*op++ & 3) << 4;
-            *sp++ = enc[n + ((*op & ~15) >> 4)];
-            *sp++ = enc[(*op & 15) << 2];
-            *sp = PADDING;
-            break;
-        case 1:
-            *sp++ = enc[(*op & ~3) >> 2];
-            *sp++ = enc[(*op & 3) << 4];
-            *sp++ = PADDING;
-            *sp = PADDING;
-            break;
-    }
-
-    return sp-sb+1;
-}
-
-int
-decode(unsigned char *sp, int slen, unsigned char *op, int url)
-{
-    int n, b, atob(int c, int url);
-    unsigned char *ob;
-
-    ob = op;
-    switch (slen) {
-        case 4:
-            n = atob(*sp++, url) << 2;
-            b = atob(*sp++, url);
-            *op++ = n + ((b & ~15) >> 4);
-
-            n = (b & 15) << 4;
-            b = atob(*sp++, url);
-            *op++ = n + ((b & ~3) >> 2);
-
-            *op = ((b & 3) << 6) + atob(*sp, url);
-            break;
-        case 3:
-            n = atob(*sp++, url) << 2;
-            b = atob(*sp++, url);
-            *op++ = n + ((b & ~15) >> 4);
-
-            n = (b & 15) << 4;
-            *op = n + ((atob(*sp, url) & ~3) >> 2);
-            break;
-        case 2:
-            n = atob(*sp++, url) << 2;
-            *op = n + ((atob(*sp, url) & ~15) >> 4);
-            break;
-    }
-
-    return op-ob+1;
-}
-
-int atob(int c, int url)
-{
-    if (c >= 'A' && c <= 'Z')
-        c -= 'A';
-    else if (c >= 'a' && c <= 'z')
-        c = c - 'a' + 26;
-    else if (c >= '0' && c <= '9')
-        c = c - '0' + 26 * 2;
-    else if (c == ((!url) ? '+' : '-'))
-        c = 62;
-    else
-        c = 63;
-
-    return c;
-}

encode.h

@@ -1,10 +0,0 @@
-#ifndef HEADER_ENCODE
-#define HEADER_ENCODE
-
-int
-encode(unsigned char *op, int olen, unsigned char *sp, int url);
-
-int
-decode(unsigned char *sp, int slen, unsigned char *op, int url);
-
-#endif

input.c

@@ -1,30 +1,37 @@
 #include "input.h"
 
+#define OBUFSIZE  4
+#define SBUFSIZE  5
+
 #define PADDING '='
 
-int
+unsigned char o[OBUFSIZE];
-getocts(FILE *fp, unsigned char *o, int olen)
+unsigned char s[SBUFSIZE];
+
+unsigned char *
+getocts(FILE *fp, int *np)
 {
-    int c, n;
+    int n, c;
 
     n = 0;
-    while (n < olen-1 && (c = fgetc(fp)) != EOF)
+    while (n < OBUFSIZE-1 && (c = fgetc(fp)) != EOF)
         o[n++] = c;
+    *np = n;
 
-    return n;
+    return (*np) ? o : NULL;
 }
 
-int
+unsigned char *
-getsxts(FILE *fp, unsigned char *s, int slen)
+getsxts(FILE *fp, int *np)
 {
-    int c, n, pad;
+    int n, p, c;
 
-    n = pad = 0;
+    n = p = 0;
-    while (n < slen-1 && (c = fgetc(fp)) != EOF && c != PADDING)
+    while (n < SBUFSIZE-1 && (c = fgetc(fp)) != EOF && c != PADDING)
-        if (c != '\n')
+        s[n++] = c;
-            s[n++] = c;
+    while (n+p < SBUFSIZE-1)
-    while (n+pad < slen-1)
+        s[n+p++] = PADDING;
-        s[n+pad++] = PADDING;
+    *np = n;
 
-    return n;
+    return (n) ? s : NULL;
 }

input.h

@@ -3,10 +3,13 @@
 
 #include <stdio.h>
 
-int
+extern unsigned char o[];
-getocts(FILE *fp, unsigned char *o, int olen);
+extern unsigned char s[];
 
-int
+unsigned char *
-getsxts(FILE *fp, unsigned char *s, int slen);
+getocts(FILE *fp, int *np);
+
+unsigned char *
+getsxts(FILE *fp, int *np);
 
 #endif

main.c

@@ -1,31 +1,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "input.h"
-#include "encode.h"
+#include "trans.h"
-
-#define OBUFSIZE 4
-#define SBUFSIZE 5
-
-unsigned char obuf[OBUFSIZE];
-unsigned char sbuf[SBUFSIZE];
 
 int
 main(int argc, char *argv[])
 {
-    int c, n, dec, url, hlp;
+    int c, n, dec, hlp;
     char *prog = *argv;
-    FILE *in, *out;
+    unsigned char *b;
+    FILE *fp;
 
-    dec = url = hlp = 0;
+    dec = hlp = 0;
     while (--argc > 0 && (*++argv)[0] == '-')
         while ((c = *++argv[0]))
             switch (c) {
                 case 'd':
                     dec = 1;
                     break;
-                case 'u':
-                    url = 1;
-                    break;
                 case 'h':
                     hlp = 1;
                     break;
@@ -35,32 +27,32 @@ main(int argc, char *argv[])
                     break;
             }
     if (hlp) {
-        fprintf(stdout, "Usage: %s -d -h infile outfile\n", prog);
+        fprintf(stdout, "Usage: %s -d -h file\n", prog);
+    } else if (argc != 1) {
+        if (dec) {
+            while ((b = getsxts(stdin, &n))) {
+                    b = decode(b, &n);
+                    fwrite(b, sizeof(*b), n, stdout);
+            }
+        } else {
+            while ((b = getocts(stdin, &n)))
+                    printf("%s", encode(b, n));
+        }
     } else {
-        if (argc >= 1 && (in = fopen(*argv, "r")) == NULL) {
+        if ((fp = fopen(*argv, "r")) == NULL) {
             fprintf(stderr, "%s: can't open %s\n", prog, *argv);
             exit(EXIT_FAILURE);
         }
-        if (argc == 2 && (out = fopen(*(argv+1), "w")) == NULL) {
+        else if (dec) {
-            fprintf(stderr, "%s: can't open %s\n", prog, *(argv+1));
+            while ((b = getsxts(fp, &n))) {
-            exit(EXIT_FAILURE);
+                    b = decode(b, &n);
-        }
+                    fwrite(b, sizeof(*b), n, stdout);
-        if (dec) {
-            while ((n = getsxts((argc >= 1) ? in : stdin, sbuf, SBUFSIZE))) {
-                n = decode(sbuf, n, obuf, url);
-                fwrite(obuf, sizeof(*obuf), n, (argc == 2) ? out : stdout);
             }
         } else {
-            while ((n = getocts((argc >= 1) ? in : stdin, obuf, OBUFSIZE))) {
+            while ((b = getocts(fp, &n)))
-                encode(obuf, n, sbuf, url);
+                    printf("%s", encode(b, n));
-                fprintf((argc == 2) ? out : stdout, "%s", sbuf);
-            }
-            fprintf((argc == 2) ? out : stdout, "\n");
         }
-        if (in)
+        fclose(fp);
-            fclose(in);
-        if (out)
-            fclose(out);
     }
     exit(EXIT_SUCCESS);
 }

trans.c

@@ -0,0 +1,97 @@
+#include "trans.h"
+
+#define PADDING '='
+
+unsigned char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+                      "abcdefghijklmnopqrstuvwxyz" \
+                      "0123456789" \
+                      "+/";
+
+unsigned char *
+encode(unsigned char *op, int np)
+{
+    extern unsigned char s[];
+    unsigned char *sp;
+    int n;
+
+    sp = s;
+    switch (np) {
+        case 3:
+            *sp++ = b64[(*op & ~3) >> 2];
+            n = (*op++ & 3) << 4;
+            *sp++ = b64[n + ((*op & ~15) >> 4)];
+            n = (*op++ & 15) << 2;
+            *sp++ = b64[n + ((*op & 192) >> 6)];
+            *sp = b64[*op & ~192];
+            break;
+        case 2:
+            *sp++ = b64[(*op & ~3) >> 2];
+            n = (*op++ & 3) << 4;
+            *sp++ = b64[n + ((*op & ~15) >> 4)];
+            *sp++ = b64[(*op & 15) << 2];
+            *sp = PADDING;
+            break;
+        case 1:
+            *sp++ = b64[(*op & ~3) >> 2];
+            *sp++ = b64[(*op & 3) << 4];
+            *sp++ = PADDING;
+            *sp = PADDING;
+            break;
+    }
+
+    return s;
+}
+
+unsigned char *
+decode(unsigned char *sp, int *np)
+{
+    extern unsigned char o[];
+    unsigned char *op;
+    int n, b, atob(int c);
+
+    op = o;
+    switch (*np) {
+        case 4:
+            n = atob(*sp++) << 2;
+            b = atob(*sp++);
+            *op++ = n + ((b & ~15) >> 4);
+
+            n = (b & 15) << 4;
+            b = atob(*sp++);
+            *op++ = n + ((b & ~3) >> 2);
+
+            *op = ((b & 3) << 6) + atob(*sp);
+            break;
+        case 3:
+            n = atob(*sp++) << 2;
+            b = atob(*sp++);
+            *op++ = n + ((b & ~15) >> 4);
+
+            n = (b & 15) << 4;
+            *op = n + ((atob(*sp) & ~3) >> 2);
+            break;
+        case 2:
+            n = atob(*sp++) << 2;
+            *op = n + ((atob(*sp) & ~15) >> 4);
+            break;
+    }
+    *np = op-o+1;
+
+    return o;
+}
+
+int atob(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c -= 'A';
+    else if (c >= 'a' && c <= 'z')
+        c = c - 'a' + 26;
+    else if (c >= '0' && c <= '9')
+        c = c - '0' + 26 * 2;
+    else if (c == '+')
+        c = 62;
+    else
+        c = 63;
+
+    return c;
+}

trans.h

@@ -0,0 +1,12 @@
+#ifndef HEADER_TRANS
+#define HEADER_TRANS
+
+#include "input.h"
+
+unsigned char *
+encode(unsigned char *op, int np);
+
+unsigned char *
+decode(unsigned char *sp, int *np);
+
+#endif