fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uudecode: fix error msgs (newlines, no output name)

Browse Source
This commit is contained in:
Tai Chi Minh Ralph Eastwood 2015-02-15 12:28:00 +00:00 committed by sin
parent 92b14e9c77
commit 26168d5c37
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
uudecode.c
View File

@ -52,13 +52,13 @@ parseheader(FILE *fp, const char *s, char **header, mode_t *mode,
eprintf("header string too long or non-newline terminated file\n"); eprintf("header string too long or non-newline terminated file\n");
p = bufs; p = bufs;
if (!(q = strchr(p, ' '))) if (!(q = strchr(p, ' ')))
eprintf("malformed mode string in header\n"); eprintf("malformed mode string in header, expected ' '\n");
*header = bufs; *header = bufs;
*q++ = '\0'; *q++ = '\0';
p = q; p = q;
/* now header should be null terminated, q points to mode */ /* now header should be null terminated, q points to mode */
if (!(q = strchr(p, ' '))) if (!(q = strchr(p, ' ')))
eprintf("malformed mode string in header\n"); eprintf("malformed mode string in header, expected ' '\n");
*q++ = '\0'; *q++ = '\0';
/* now mode should be null terminated, q points to fname */ /* now mode should be null terminated, q points to fname */
*mode = parsemode(p, *mode, 0); *mode = parsemode(p, *mode, 0);
@ -67,6 +67,8 @@ parseheader(FILE *fp, const char *s, char **header, mode_t *mode,
q[--n] = '\0'; q[--n] = '\0';
if (n > 0) if (n > 0)
*fname = q; *fname = q;
else
eprintf("header string does not contain output file\n");
} }
static const char b64dt[] = { static const char b64dt[] = {
@ -111,7 +113,7 @@ uudecodeb64(FILE *fp, FILE *outfp)
continue; continue;
case 1: case 1:
eprintf("%d: unexpected \"=\"" eprintf("%d: unexpected \"=\""
"appeared.", l); "appeared\n", l);
case 3: case 3:
*po++ = b24[0]; *po++ = b24[0];
*po++ = b24[1]; *po++ = b24[1];
@ -125,11 +127,12 @@ uudecodeb64(FILE *fp, FILE *outfp)
continue; continue;
} }
} else if ((e = b64dt[(int)*pb]) == -1) } else if ((e = b64dt[(int)*pb]) == -1)
eprintf("%d: invalid byte \"%c\"", l, *pb); eprintf("%d: invalid byte \"%c\"\n", l, *pb);
else if (e == -2) /* whitespace */ else if (e == -2) /* whitespace */
continue; continue;
else if (t > 0) /* state is parsing pad/footer */ else if (t > 0) /* state is parsing pad/footer */
eprintf("%d: invalid byte \"%c\" after padding", eprintf("%d: invalid byte \"%c\""
" after padding\n",
l, *pb); l, *pb);
switch (b) { /* decode next base64 chr based on state */ switch (b) { /* decode next base64 chr based on state */
case 0: b24[0] |= e << 2; break; case 0: b24[0] |= e << 2; break;