penpen/b64
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: penpen:main
Branches Tags
penpen:main
penpen:dev
penpen:v0.3
penpen:v0.2
penpen:v0.1
..
compare: penpen:v0.2
Branches Tags
penpen:dev
penpen:main
penpen:v0.3
penpen:v0.2
penpen:v0.1

No commits in common. "main" and "v0.2" have entirely different histories.
main ... v0.2

8 changed files with 132 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -1,14 +1,13 @@
CC = gcc CFLAGS = -g -Wall -Wextra -Werror
CFLAGS = -Og -g -Wall -Wextra -Werror
objects = main.o input.o output.o encode.o objects = main.o input.o output.o encode.o
b64 : $(objects) b64 : $(objects)
$(CC) -o b64 $(objects) cc -o b64 $(objects)
main.o input.o : input.h main.o input.o : input.h
main.o encode.o : encode.h
main.o output.o : output.h main.o output.o : output.h
main.o encode.o : encode.h
.PHONY : clean .PHONY : clean
clean : clean :

137
encode.c
View file

@ -2,106 +2,99 @@
#define PADDING '=' #define PADDING '='
static unsigned char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
unsigned char b64toascii[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"abcdefghijklmnopqrstuvwxyz" \ "abcdefghijklmnopqrstuvwxyz" \
"0123456789" \ "0123456789" \
"+/"; "+/";
static unsigned char b64u[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
unsigned char b64urltoascii[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"abcdefghijklmnopqrstuvwxyz" \ "abcdefghijklmnopqrstuvwxyz" \
"0123456789" \ "0123456789" \
"-_"; "-_";
static
unsigned char asciitob64[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 62, 0, 62, 0, 63, 52, 53,
54, 55, 56, 57, 58, 59, 60, 61, 0, 0,
0, 0, 0, 0, 0, 0, 1, 2, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 0, 0, 0, 0, 63, 0, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
49, 50, 51
};
int int
encode(unsigned char *op, int olen, unsigned char *sp, int url) encode(unsigned char *op, int olen, unsigned char *sp, int url)
{ {
int tmp; int n;
unsigned char *table; unsigned char *sb, *enc;
unsigned char *sbeg;
unsigned char *tend;
table = (!url) ? b64toascii : b64urltoascii; sb = sp;
enc = (!url) ? b64 : b64u;
sbeg = sp; switch (olen) {
tend = op + olen - (olen % 3); case 3:
while (op < tend) { *sp++ = enc[(*op & ~3) >> 2];
*sp++ = table[(*op & ~3) >> 2]; n = (*op++ & 3) << 4;
tmp = (*op++ & 3) << 4; *sp++ = enc[n + ((*op & ~15) >> 4)];
*sp++ = table[tmp + ((*op & ~15) >> 4)]; n = (*op++ & 15) << 2;
tmp = (*op++ & 15) << 2; *sp++ = enc[n + ((*op & 192) >> 6)];
*sp++ = table[tmp + ((*op & 192) >> 6)]; *sp = enc[*op & ~192];
*sp++ = table[*op++ & ~192]; break;
}
switch (olen % 3) {
case 2: case 2:
*sp++ = table[(*op & ~3) >> 2]; *sp++ = enc[(*op & ~3) >> 2];
tmp = (*op++ & 3) << 4; n = (*op++ & 3) << 4;
*sp++ = table[tmp + ((*op & ~15) >> 4)]; *sp++ = enc[n + ((*op & ~15) >> 4)];
*sp++ = table[(*op & 15) << 2]; *sp++ = enc[(*op & 15) << 2];
*sp++ = PADDING; *sp = PADDING;
break; break;
case 1: case 1:
*sp++ = table[(*op & ~3) >> 2]; *sp++ = enc[(*op & ~3) >> 2];
*sp++ = table[(*op & 3) << 4]; *sp++ = enc[(*op & 3) << 4];
*sp++ = PADDING;
*sp++ = PADDING; *sp++ = PADDING;
*sp = PADDING;
break; break;
} }
return sp-sbeg; return sp-sb+1;
} }
int int
decode(unsigned char *sp, int slen, unsigned char *op) decode(unsigned char *sp, int slen, unsigned char *op, int url)
{ {
int tmp, b; int n, b, atob(int c, int url);
unsigned char *obeg; unsigned char *ob;
unsigned char *qend;
obeg = op; ob = op;
qend = sp + slen - (slen % 4); switch (slen) {
while (sp < qend) { case 4:
tmp = asciitob64[*sp++] << 2; n = atob(*sp++, url) << 2;
b = asciitob64[*sp++]; b = atob(*sp++, url);
*op++ = tmp + ((b & ~15) >> 4); *op++ = n + ((b & ~15) >> 4);
tmp = (b & 15) << 4;
b = asciitob64[*sp++]; n = (b & 15) << 4;
*op++ = tmp + ((b & ~3) >> 2); b = atob(*sp++, url);
*op++ = ((b & 3) << 6) + asciitob64[*sp++]; *op++ = n + ((b & ~3) >> 2);
}
switch (slen % 4) { *op = ((b & 3) << 6) + atob(*sp, url);
break;
case 3: case 3:
tmp = asciitob64[*sp++] << 2; n = atob(*sp++, url) << 2;
b = asciitob64[*sp++]; b = atob(*sp++, url);
*op++ = tmp + ((b & ~15) >> 4); *op++ = n + ((b & ~15) >> 4);
tmp = (b & 15) << 4;
*op++ = tmp + ((asciitob64[*sp++] & ~3) >> 2); n = (b & 15) << 4;
*op = n + ((atob(*sp, url) & ~3) >> 2);
break; break;
case 2: case 2:
tmp = asciitob64[*sp++] << 2; n = atob(*sp++, url) << 2;
*op++ = tmp + ((asciitob64[*sp++] & ~15) >> 4); *op = n + ((atob(*sp, url) & ~15) >> 4);
break; break;
} }
return op-obeg; 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;
} }

6
encode.h
View file

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

41
input.c
View file

@ -3,27 +3,28 @@
#define PADDING '=' #define PADDING '='
int int
readb(FILE *fp, unsigned char *s, int slen) getocts(FILE *fp, unsigned char *o, int olen)
{ {
int read, tread; int c, n;
unsigned char *send, *sbeg;
unsigned char *l, *r;
read = tread = 0; n = 0;
sbeg = l = r = s; while (n < olen-1 && (c = fgetc(fp)) != EOF)
while (tread < slen && (read = fread(l, sizeof(*l), slen-tread, fp))) { o[n++] = c;
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; 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;
} }

9
input.h
View file

@ -1,9 +1,12 @@
#ifndef INPUT_H #ifndef HEADER_INPUT
#define INPUT_H #define HEADER_INPUT
#include <stdio.h> #include <stdio.h>
int 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 #endif

39
main.c
View file

@ -4,21 +4,20 @@
#include "output.h" #include "output.h"
#include "encode.h" #include "encode.h"
#define OCTETBUF 1500 #define OBUFSIZE 4
#define SXTETBUF 2000 #define SBUFSIZE 5
unsigned char obuf[OCTETBUF]; unsigned char obuf[OBUFSIZE];
unsigned char sbuf[SXTETBUF]; unsigned char sbuf[SBUFSIZE];
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c, n, last; int c, n, l;
int dec, url, hlp, wrp; int dec, url, hlp, wrp;
char *prog = *argv;
FILE *in, *out; FILE *in, *out;
char *prog;
prog = *argv;
dec = url = hlp = wrp = 0; dec = url = hlp = wrp = 0;
while (--argc > 0 && (*++argv)[0] == '-') while (--argc > 0 && (*++argv)[0] == '-')
while ((c = *++argv[0])) while ((c = *++argv[0]))
@ -43,7 +42,6 @@ main(int argc, char *argv[])
if (hlp) { if (hlp) {
fprintf(stdout, "Usage: %s -duhw infile outfile\n", prog); fprintf(stdout, "Usage: %s -duhw infile outfile\n", prog);
} else { } else {
in = out = NULL;
if (argc >= 1 && (in = fopen(*argv, "r")) == NULL) { if (argc >= 1 && (in = fopen(*argv, "r")) == NULL) {
fprintf(stderr, "%s: can't open %s\n", prog, *argv); fprintf(stderr, "%s: can't open %s\n", prog, *argv);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -53,24 +51,23 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (dec) { if (dec) {
while ((n = readb((in) ? in : stdin, sbuf, SXTETBUF))) { while ((n = getsxts((argc >= 1) ? in : stdin, sbuf, SBUFSIZE))) {
n = decode(sbuf, n, obuf); 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 { } else {
while ((n = fread(obuf, sizeof(*obuf), OCTETBUF, (in) ? in : stdin))) { while ((n = getocts((argc >= 1) ? in : stdin, obuf, OBUFSIZE))) {
if (wrp) {
n = encode(obuf, n, sbuf, url); n = encode(obuf, n, sbuf, url);
fwrite(sbuf, sizeof(*sbuf), n, (out) ? out : stdout); 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) if (in)
fclose(in); fclose(in);
if (out) if (out)

29
output.c
View file

@ -8,30 +8,11 @@ printw(FILE *fp, unsigned char *s, int slen)
static int col; static int col;
int c; int c;
c = '\n'; while (slen--) {
if (col) { fputc((c = *s++), fp);
if (slen >= WRAPCOL-col) { ++col;
fwrite(s, sizeof(*s), WRAPCOL-col, fp); if (!(col %= WRAPCOL))
s += WRAPCOL-col; fputc((c = '\n'), fp);
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);
} }
return c; return c;

4
output.h
View file

@ -1,5 +1,5 @@
#ifndef OUTPUT_H #ifndef HEADER_OUTPUT
#define OUTPUT_H #define HEADER_OUTPUT
#include <stdio.h> #include <stdio.h>