diff --git a/Makefile b/Makefile index e6f82d7..ff2a3f4 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,13 @@ -CC = gcc -CFLAGS = -Og -g -Wall -Wextra -Werror +CFLAGS = -g -Wall -Wextra -Werror objects = main.o input.o output.o encode.o b64 : $(objects) - $(CC) -o b64 $(objects) + cc -o b64 $(objects) main.o input.o : input.h -main.o encode.o : encode.h main.o output.o : output.h +main.o encode.o : encode.h .PHONY : clean clean : diff --git a/encode.c b/encode.c index 861bae9..cee611f 100644 --- a/encode.c +++ b/encode.c @@ -7,83 +7,80 @@ unsigned char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ "0123456789" \ "+/"; -unsigned char b64url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ - "abcdefghijklmnopqrstuvwxyz" \ - "0123456789" \ - "-_"; +unsigned char b64u[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ + "abcdefghijklmnopqrstuvwxyz" \ + "0123456789" \ + "-_"; int encode(unsigned char *op, int olen, unsigned char *sp, int url) { - int tmp; - unsigned char *table; - unsigned char *sbeg; - unsigned char *tend; + int n; + unsigned char *sb, *enc; - table = (!url) ? b64 : b64url; - - sbeg = sp; - tend = op + olen - (olen % 3); - while (op < tend) { - *sp++ = table[(*op & ~3) >> 2]; - tmp = (*op++ & 3) << 4; - *sp++ = table[tmp + ((*op & ~15) >> 4)]; - tmp = (*op++ & 15) << 2; - *sp++ = table[tmp + ((*op & 192) >> 6)]; - *sp++ = table[*op++ & ~192]; - } - switch (olen % 3) { + 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++ = table[(*op & ~3) >> 2]; - tmp = (*op++ & 3) << 4; - *sp++ = table[tmp + ((*op & ~15) >> 4)]; - *sp++ = table[(*op & 15) << 2]; - *sp++ = PADDING; + *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++ = table[(*op & ~3) >> 2]; - *sp++ = table[(*op & 3) << 4]; - *sp++ = PADDING; + *sp++ = enc[(*op & ~3) >> 2]; + *sp++ = enc[(*op & 3) << 4]; *sp++ = PADDING; + *sp = PADDING; break; } - return sp-sbeg; + return sp-sb+1; } int decode(unsigned char *sp, int slen, unsigned char *op, int url) { - int tmp, b, atob(int c, int url); - unsigned char *obeg; - unsigned char *qend; + int n, b, atob(int c, int url); + unsigned char *ob; - obeg = op; - qend = sp + slen - (slen % 4); - while (sp < qend) { - tmp = atob(*sp++, url) << 2; - b = atob(*sp++, url); - *op++ = tmp + ((b & ~15) >> 4); - tmp = (b & 15) << 4; - b = atob(*sp++, url); - *op++ = tmp + ((b & ~3) >> 2); - *op++ = ((b & 3) << 6) + atob(*sp++, url); - } - switch (slen % 4) { - case 3: - tmp = atob(*sp++, url) << 2; + ob = op; + switch (slen) { + case 4: + n = atob(*sp++, url) << 2; b = atob(*sp++, url); - *op++ = tmp + ((b & ~15) >> 4); - tmp = (b & 15) << 4; - *op++ = tmp + ((atob(*sp++, url) & ~3) >> 2); + *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: - tmp = atob(*sp++, url) << 2; - *op++ = tmp + ((atob(*sp++, url) & ~15) >> 4); + n = atob(*sp++, url) << 2; + *op = n + ((atob(*sp, url) & ~15) >> 4); break; } - return op-obeg; + return op-ob+1; } int atob(int c, int url) diff --git a/encode.h b/encode.h index 425038c..2ea285a 100644 --- a/encode.h +++ b/encode.h @@ -1,5 +1,5 @@ -#ifndef ENCODE_H -#define ENCODE_H +#ifndef HEADER_ENCODE +#define HEADER_ENCODE int encode(unsigned char *op, int olen, unsigned char *sp, int url); diff --git a/input.c b/input.c index 8e500b3..cfe80b1 100644 --- a/input.c +++ b/input.c @@ -1,29 +1,30 @@ #include "input.h" -#define PADDING '=' +#define PADDING '=' int -readb(FILE *fp, unsigned char *s, int slen) +getocts(FILE *fp, unsigned char *o, int olen) { - int read, tread; - unsigned char *send, *sbeg; - unsigned char *l, *r; - - read = tread = 0; - sbeg = l = r = s; - while (tread < slen && (read = fread(l, sizeof(*l), slen-tread, fp))) { - 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; - } - } + int c, n; - return l-sbeg; + n = 0; + while (n < olen-1 && (c = fgetc(fp)) != EOF) + o[n++] = c; + + return n; +} + +int +getsxts(FILE *fp, unsigned char *s, int slen) +{ + int c, n, pad; + + n = pad = 0; + while (n < slen-1 && (c = fgetc(fp)) != EOF && c != PADDING) + if (c != '\n') + s[n++] = c; + while (n+pad < slen-1) + s[n+pad++] = PADDING; + + return n; } diff --git a/input.h b/input.h index 901b2c4..42bd4a6 100644 --- a/input.h +++ b/input.h @@ -1,9 +1,12 @@ -#ifndef INPUT_H -#define INPUT_H +#ifndef HEADER_INPUT +#define HEADER_INPUT #include int -readb(FILE *fp, unsigned char *s, int slen); +getocts(FILE *fp, unsigned char *o, int olen); + +int +getsxts(FILE *fp, unsigned char *s, int slen); #endif diff --git a/main.c b/main.c index d7d8530..0cf51bc 100644 --- a/main.c +++ b/main.c @@ -4,21 +4,20 @@ #include "output.h" #include "encode.h" -#define OCTETBUF 300 -#define SXTETBUF 400 +#define OBUFSIZE 4 +#define SBUFSIZE 5 -unsigned char obuf[OCTETBUF]; -unsigned char sbuf[SXTETBUF]; +unsigned char obuf[OBUFSIZE]; +unsigned char sbuf[SBUFSIZE]; int main(int argc, char *argv[]) { - int c, n, last; + int c, n, l; int dec, url, hlp, wrp; + char *prog = *argv; FILE *in, *out; - char *prog; - prog = *argv; dec = url = hlp = wrp = 0; while (--argc > 0 && (*++argv)[0] == '-') while ((c = *++argv[0])) @@ -43,7 +42,6 @@ main(int argc, char *argv[]) if (hlp) { fprintf(stdout, "Usage: %s -duhw infile outfile\n", prog); } else { - in = out = NULL; if (argc >= 1 && (in = fopen(*argv, "r")) == NULL) { fprintf(stderr, "%s: can't open %s\n", prog, *argv); exit(EXIT_FAILURE); @@ -53,23 +51,22 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } if (dec) { - while ((n = readb((in) ? in : stdin, sbuf, SXTETBUF))) { + while ((n = getsxts((argc >= 1) ? in : stdin, sbuf, SBUFSIZE))) { n = decode(sbuf, n, obuf, url); - fwrite(obuf, sizeof(*obuf), n, (out) ? out : stdout); + fwrite(obuf, sizeof(*obuf), n, (argc == 2) ? out : stdout); } - } else if (wrp) { - last = 0; - while ((n = fread(obuf, sizeof(*obuf), OCTETBUF, (in) ? in : stdin))) { - n = encode(obuf, n, sbuf, url); - last = printw((out) ? out : stdout, sbuf, n); - } - if (last != '\n') - fprintf((out) ? out : stdout, "\n"); } else { - while ((n = fread(obuf, sizeof(*obuf), OCTETBUF, (in) ? in : stdin))) { - n = encode(obuf, n, sbuf, url); - fwrite(sbuf, sizeof(*sbuf), n, (out) ? out : stdout); + while ((n = getocts((argc >= 1) ? in : stdin, obuf, OBUFSIZE))) { + if (wrp) { + n = encode(obuf, n, sbuf, url); + l = printw((argc == 2) ? out : stdout, sbuf, n); + } else { + encode(obuf, n, sbuf, url); + fprintf((argc == 2) ? out : stdout, "%s", sbuf); + } } + if (wrp && l != '\n') + fprintf((argc == 2) ? out : stdout, "\n"); } if (in) fclose(in); diff --git a/output.c b/output.c index 171c083..d5c1a3a 100644 --- a/output.c +++ b/output.c @@ -8,30 +8,11 @@ printw(FILE *fp, unsigned char *s, int slen) static int col; int c; - c = '\n'; - if (col) { - if (slen >= WRAPCOL-col) { - fwrite(s, sizeof(*s), WRAPCOL-col, fp); - s += WRAPCOL-col; - slen -= WRAPCOL-col; - col = 0; - fputc('\n', fp); - } else { - fwrite(s, sizeof(*s), slen, fp); - s += slen; - col += slen; - slen -= slen; - c = *(s+slen-1); - } - } - for (; slen >= WRAPCOL; slen -= WRAPCOL, s += WRAPCOL) { - fwrite(s, sizeof(*s), WRAPCOL, fp); - fputc('\n', fp); - } - if (slen > 0) { - fwrite(s, sizeof(*s), slen, fp); - col += slen; - c = *(s+slen-1); + while (slen--) { + fputc((c = *s++), fp); + ++col; + if (!(col %= WRAPCOL)) + fputc((c = '\n'), fp); } return c; diff --git a/output.h b/output.h index 85736f2..8135e20 100644 --- a/output.h +++ b/output.h @@ -1,5 +1,5 @@ -#ifndef OUTPUT_H -#define OUTPUT_H +#ifndef HEADER_OUTPUT +#define HEADER_OUTPUT #include