add open_read_close() and similar stuff

[oweals/busybox.git] / archival / libunarchive / get_header_ar.c

diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index 48d7a5ad8bdcdcd64252c419c6aafcf623f53ebe..b91c6f97d76e99a618c3ef5cd3aeaaa7967c220f 100644 (file)
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -4,12 +4,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "unarchive.h"
 #include "libbb.h"
+#include "unarchive.h"
 
 char get_header_ar(archive_handle_t *archive_handle)
 {
@@ -24,14 +20,14 @@ char get_header_ar(archive_handle_t *archive_handle)
                        char mode[8];
                        char size[10];
                        char magic[2];
-               } formated;
+               } formatted;
        } ar;
 #ifdef CONFIG_FEATURE_AR_LONG_FILENAMES
        static char *ar_long_names;
        static unsigned int 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);
@@ -49,20 +45,20 @@ char get_header_ar(archive_handle_t *archive_handle)
        archive_handle->offset += 60;
 
        /* 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);
+       typed->mode = xstrtoul(ar.formatted.mode, 8);
+       typed->mtime = xatou(ar.formatted.date);
+       typed->uid = xatou(ar.formatted.uid);
+       typed->gid = xatou(ar.formatted.gid);
+       typed->size = xatoul(ar.formatted.size);
 
        /* long filenames have '/' as the first character */
-       if (ar.formated.name[0] == '/') {
+       if (ar.formatted.name[0] == '/') {
 #ifdef CONFIG_FEATURE_AR_LONG_FILENAMES
-               if (ar.formated.name[1] == '/') {
+               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
                         * in static variable long_names for use in future entries */
@@ -73,7 +69,7 @@ char get_header_ar(archive_handle_t *archive_handle)
                        /* 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] == ' ') {
+               } else 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;
@@ -81,18 +77,18 @@ char get_header_ar(archive_handle_t *archive_handle)
                } 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]);
+                       const unsigned int long_offset = atoi(&ar.formatted.name[1]);
                        if (long_offset >= ar_long_name_size) {
-                               bb_error_msg_and_die("Cant resolve long filename");
+                               bb_error_msg_and_die("can't resolve long filename");
                        }
-                       typed->name = bb_xstrdup(ar_long_names + long_offset);
+                       typed->name = xstrdup(ar_long_names + long_offset);
                }
 #else
                bb_error_msg_and_die("long filenames not supported");
 #endif
        } else {
                /* short filenames */
-              typed->name = bb_xstrndup(ar.formated.name, 16);
+              typed->name = xstrndup(ar.formatted.name, 16);
        }
 
        typed->name[strcspn(typed->name, " /")] = '\0';