aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-09-23 19:56:21 +0000
committerGravatar Rob Landley <rob@landley.net>2006-09-23 19:56:21 +0000
commit29d94b907f8e1849385e9a2ac5e286c5c2d40936 (patch)
tree15c270192cc99ea439c3a6093eef0b980c3962d3 /coreutils
parenta94554d010844e17ecf674fe738679f09cbc6c21 (diff)
downloadbusybox-29d94b907f8e1849385e9a2ac5e286c5c2d40936.tar.gz
busybox-29d94b907f8e1849385e9a2ac5e286c5c2d40936.tar.bz2
Another attempt at untangling the logic so the compiler can follow it and not
generate pointless warnings.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/uudecode.c47
1 files changed, 23 insertions, 24 deletions
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 1df143f9d..21ebce3ac 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -142,41 +142,40 @@ int uudecode_main(int argc, char **argv)
/* Search for the start of the encoding */
while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
int (*decode_fn_ptr)(FILE * src, FILE * dst);
- char *line_ptr = NULL;
-
+ char *line_ptr;
+ FILE *dst_stream;
+ int mode;
+ int ret;
+
if (strncmp(line, "begin-base64 ", 13) == 0) {
line_ptr = line + 13;
decode_fn_ptr = read_base64;
} else if (strncmp(line, "begin ", 6) == 0) {
line_ptr = line + 6;
decode_fn_ptr = read_stduu;
+ } else {
+ free(line);
+ continue;
}
- if (line_ptr) {
- FILE *dst_stream;
- int mode;
- int ret;
-
- mode = strtoul(line_ptr, NULL, 8);
- if (outname == NULL) {
- outname = strchr(line_ptr, ' ');
- if ((outname == NULL) || (*outname == '\0')) {
- break;
- }
- outname++;
- }
- if (strcmp(outname, "-") == 0) {
- dst_stream = stdout;
- } else {
- dst_stream = xfopen(outname, "w");
- chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
+ mode = strtoul(line_ptr, NULL, 8);
+ if (outname == NULL) {
+ outname = strchr(line_ptr, ' ');
+ if ((outname == NULL) || (*outname == '\0')) {
+ break;
}
- free(line);
- ret = decode_fn_ptr(src_stream, dst_stream);
- bb_fclose_nonstdin(src_stream);
- return(ret);
+ outname++;
+ }
+ if (strcmp(outname, "-") == 0) {
+ dst_stream = stdout;
+ } else {
+ dst_stream = xfopen(outname, "w");
+ chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
}
free(line);
+ ret = decode_fn_ptr(src_stream, dst_stream);
+ bb_fclose_nonstdin(src_stream);
+ return(ret);
}
bb_error_msg_and_die("No `begin' line");
}