Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/archival/libunarchive/check_header_gzip.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/check_header_gzip.c (modified) (3 diffs)

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

@@ -1 @@
-#include <stdlib.h>
-#include <unistd.h>
+/* vi: set sw=4 ts=4: */
+/*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
 #include "libbb.h"
-#include "unarchive.h" /* for external decl of check_header_gzip */
+#include "unarchive.h" /* for external decl of check_header_gzip_or_die */
 
-void check_header_gzip(int src_fd)
+void check_header_gzip_or_die(int src_fd)
 {
     union {
@@ -14 +17 @@
             unsigned char xtra_flags;
             unsigned char os_flags;
-        } formated;
+        } formatted;
     } header;
 
-    bb_xread_all(src_fd, header.raw, 8);
+    xread(src_fd, header.raw, 8);
 
     /* Check the compression method */
-    if (header.formated.method != 8) {
-        bb_error_msg_and_die("Unknown compression method %d",
-                          header.formated.method);
+    if (header.formatted.method != 8) {
+        bb_error_msg_and_die("unknown compression method %d",
+                          header.formatted.method);
     }
 
-    if (header.formated.flags & 0x04) {
+    if (header.formatted.flags & 0x04) {
         /* bit 2 set: extra field present */
-        unsigned char extra_short;
+        unsigned extra_short;
 
-        extra_short = bb_xread_char(src_fd) + (bb_xread_char(src_fd) << 8);
+        extra_short = xread_char(src_fd) + (xread_char(src_fd) << 8);
         while (extra_short > 0) {
             /* Ignore extra field */
-            bb_xread_char(src_fd);
+            xread_char(src_fd);
             extra_short--;
         }
@@ -38 +41 @@
 
     /* Discard original name if any */
-    if (header.formated.flags & 0x08) {
+    if (header.formatted.flags & 0x08) {
         /* bit 3 set: original file name present */
-        while(bb_xread_char(src_fd) != 0);
+        while (xread_char(src_fd) != 0);
     }
 
     /* Discard file comment if any */
-    if (header.formated.flags & 0x10) {
+    if (header.formatted.flags & 0x10) {
         /* bit 4 set: file comment present */
-        while(bb_xread_char(src_fd) != 0);
+        while (xread_char(src_fd) != 0);
     }
 
     /* Read the header checksum */
-    if (header.formated.flags & 0x02) {
-        bb_xread_char(src_fd);
-        bb_xread_char(src_fd);
+    if (header.formatted.flags & 0x02) {
+        xread_char(src_fd);
+        xread_char(src_fd);
     }
-
-    return;
 }