emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uudecode: tolerate text input with CR+LF line ends

Browse Source 
function                                             old     new   delta
read_stduu                                           265     308     +43
uudecode_main                                        313     317      +4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2015-10-05 15:10:44 +02:00
parent e6b578761a
commit 2b48c38be6
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coreutils/uudecode.c
View File

@ -29,9 +29,19 @@ static void FAST_FUNC read_stduu(FILE *src_stream, FILE *dst_stream, int flags U
{
char *line;
while ((line = xmalloc_fgetline(src_stream)) != NULL) {
for (;;) {
int encoded_len, str_len;
char *line_ptr, *dst;
size_t line_len;
line_len = 64 * 1024;
line = xmalloc_fgets_str_len(src_stream, "\n", &line_len);
if (!line)
break;
/* Handle both Unix and MSDOS text, and stray trailing spaces */
str_len = line_len;
while (--str_len >= 0 && isspace(line[str_len]))
line[str_len] = '\0';
if (strcmp(line, "end") == 0) {
return; /* the only non-error exit */
@ -128,6 +138,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
if (!outname)
break;
outname++;
trim(outname); /* remove trailing space (and '\r' for DOS text) */
if (!outname[0])
break;
}