Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/archival/libunarchive/get_header_ar.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/archival/libunarchive/get_header_ar.c (modified) (9 diffs)

branches/2.2.5/mindi-busybox/archival/libunarchive/get_header_ar.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* Copyright 2001 Glenn McGrath.
  *
@@ -4 +5 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "libbb.h"
 #include "unarchive.h"
-#include "libbb.h"
 
 char get_header_ar(archive_handle_t *archive_handle)
 {
+    int err;
     file_header_t *typed = archive_handle->file_header;
     union {
@@ -24 +22 @@
             char size[10];
             char magic[2];
-        } formated;
+        } formatted;
     } ar;
-#ifdef CONFIG_FEATURE_AR_LONG_FILENAMES
+#if ENABLE_FEATURE_AR_LONG_FILENAMES
     static char *ar_long_names;
-    static unsigned int ar_long_name_size;
+    static unsigned ar_long_name_size;
 #endif
 
-    /* dont use bb_xread as we want to handle the error ourself */
+    /* dont use xread as we want to handle the error ourself */
     if (read(archive_handle->src_fd, ar.raw, 60) != 60) {
         /* End Of File */
-        return(EXIT_FAILURE);
+        return EXIT_FAILURE;
     }
 
@@ -43 +41 @@
         /* fix up the header, we started reading 1 byte too early */
         memmove(ar.raw, &ar.raw[1], 59);
-        ar.raw[59] = bb_xread_char(archive_handle->src_fd);
+        ar.raw[59] = xread_char(archive_handle->src_fd);
         archive_handle->offset++;
     }
@@ -49 +47 @@
 
     /* align the headers based on the header magic */
-    if ((ar.formated.magic[0] != '`') || (ar.formated.magic[1] != '\n')) {
-        bb_error_msg_and_die("Invalid ar header");
-    }
+    if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
+        bb_error_msg_and_die("invalid ar header");
 
-    typed->mode = strtol(ar.formated.mode, NULL, 8);
-    typed->mtime = atoi(ar.formated.date);
-    typed->uid = atoi(ar.formated.uid);
-    typed->gid = atoi(ar.formated.gid);
-    typed->size = atoi(ar.formated.size);
+    /* FIXME: more thorough routine would be in order here */
+    /* (we have something like that in tar) */
+    /* but for now we are lax. This code works because */
+    /* on misformatted numbers bb_strtou returns all-ones */
+    typed->mode = err = bb_strtou(ar.formatted.mode, NULL, 8);
+    if (err == -1) bb_error_msg_and_die("invalid ar header");
+    typed->mtime = err = bb_strtou(ar.formatted.date, NULL, 10);
+    if (err == -1) bb_error_msg_and_die("invalid ar header");
+    typed->uid = err = bb_strtou(ar.formatted.uid, NULL, 10);
+    if (err == -1) bb_error_msg_and_die("invalid ar header");
+    typed->gid = err = bb_strtou(ar.formatted.gid, NULL, 10);
+    if (err == -1) bb_error_msg_and_die("invalid ar header");
+    typed->size = err = bb_strtou(ar.formatted.size, NULL, 10);
+    if (err == -1) bb_error_msg_and_die("invalid ar header");
 
     /* long filenames have '/' as the first character */
-    if (ar.formated.name[0] == '/') {
-#ifdef CONFIG_FEATURE_AR_LONG_FILENAMES
-        if (ar.formated.name[1] == '/') {
+    if (ar.formatted.name[0] == '/') {
+#if ENABLE_FEATURE_AR_LONG_FILENAMES
+        unsigned long_offset;
+
+        if (ar.formatted.name[1] == '/') {
             /* If the second char is a '/' then this entries data section
              * stores long filename for multiple entries, they are stored
@@ -68 +76 @@
             ar_long_name_size = typed->size;
             ar_long_names = xmalloc(ar_long_name_size);
-            bb_xread_all(archive_handle->src_fd, ar_long_names, ar_long_name_size);
+            xread(archive_handle->src_fd, ar_long_names, ar_long_name_size);
             archive_handle->offset += ar_long_name_size;
             /* This ar entries data section only contained filenames for other records
              * they are stored in the static ar_long_names for future reference */
-            return (get_header_ar(archive_handle)); /* Return next header */
-        } else if (ar.formated.name[1] == ' ') {
+            return get_header_ar(archive_handle); /* Return next header */
+        }
+
+        if (ar.formatted.name[1] == ' ') {
             /* This is the index of symbols in the file for compilers */
             data_skip(archive_handle);
             archive_handle->offset += typed->size;
-            return (get_header_ar(archive_handle)); /* Return next header */
-        } else {
-            /* The number after the '/' indicates the offset in the ar data section
-            (saved in variable long_name) that conatains the real filename */
-            const unsigned int long_offset = atoi(&ar.formated.name[1]);
-            if (long_offset >= ar_long_name_size) {
-                bb_error_msg_and_die("Cant resolve long filename");
-            }
-            typed->name = bb_xstrdup(ar_long_names + long_offset);
+            return get_header_ar(archive_handle); /* Return next header */
         }
+
+        /* The number after the '/' indicates the offset in the ar data section
+         * (saved in variable long_name) that conatains the real filename */
+        long_offset = atoi(&ar.formatted.name[1]);
+        if (long_offset >= ar_long_name_size) {
+            bb_error_msg_and_die("can't resolve long filename");
+        }
+        typed->name = xstrdup(ar_long_names + long_offset);
 #else
         bb_error_msg_and_die("long filenames not supported");
@@ -92 +102 @@
     } else {
         /* short filenames */
-           typed->name = bb_xstrndup(ar.formated.name, 16);
+        typed->name = xstrndup(ar.formatted.name, 16);
     }
 
@@ -100 +110 @@
         archive_handle->action_header(typed);
         if (archive_handle->sub_archive) {
-            while (archive_handle->action_data_subarchive(archive_handle->sub_archive) == EXIT_SUCCESS);
+            while (archive_handle->action_data_subarchive(archive_handle->sub_archive) == EXIT_SUCCESS)
+                /* repeat */;
         } else {
             archive_handle->action_data(archive_handle);
@@ -112 +123 @@
     lseek(archive_handle->src_fd, archive_handle->offset, SEEK_SET);
 
-    return(EXIT_SUCCESS);
+    return EXIT_SUCCESS;
 }