Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/uudecode.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/uudecode.c (modified) (4 diffs)

branches/3.3/mindi-busybox/coreutils/uudecode.c

@@ -30 +30 @@
     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) {
@@ -47 +57 @@
         encoded_len = line[0] * 4 / 3;
         /* Check that line is not too short. (we tolerate
-         * overly _long_ line to accomodate possible extra '`').
+         * overly _long_ line to accommodate possible extra '`').
          * Empty line case is also caught here. */
         if (str_len <= encoded_len) {
@@ -111 +121 @@
         int mode;
 
-        if (strncmp(line, "begin-base64 ", 13) == 0) {
+        if (is_prefixed_with(line, "begin-base64 ")) {
             line_ptr = line + 13;
             decode_fn_ptr = read_base64;
-        } else if (strncmp(line, "begin ", 6) == 0) {
+        } else if (is_prefixed_with(line, "begin ")) {
             line_ptr = line + 6;
             decode_fn_ptr = read_stduu;
@@ -129 +139 @@
                 break;
             outname++;
+            trim(outname); /* remove trailing space (and '\r' for DOS text) */
             if (!outname[0])
                 break;