tftpd: options -c (allow _new_ files to be uploaded) and -u USER

[oweals/busybox.git] / archival / unzip.c

diff --git a/archival/unzip.c b/archival/unzip.c
index 001f2e128b99a4df18dd15e9ab0605f552712a23..c7d39daefc8f5bbfcddd91d3b83cc97819f2f80a 100644 (file)
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -57,7 +57,7 @@ typedef union {
                uint16_t filename_len;                  /* 22-23 */
                uint16_t extra_len;                     /* 24-25 */
        } formatted ATTRIBUTE_PACKED;
-} zip_header_t ATTRIBUTE_PACKED;
+} zip_header_t; /* ATTRIBUTE_PACKED - gcc 4.2.1 doesn't like it (spews warning) */
 
 /* Check the offset of the last element, not the length.  This leniency
  * allows for poor packing, whereby the overall struct may be too long,
@@ -66,7 +66,7 @@ typedef union {
 struct BUG_zip_header_must_be_26_bytes {
        char BUG_zip_header_must_be_26_bytes[
                offsetof(zip_header_t, formatted.extra_len) + 2 ==
-                       ZIP_HEADER_LEN ? 1 : -1];
+                       ZIP_HEADER_LEN ? 1 : -1];
 };
 
 #define FIX_ENDIANNESS(zip_header) do { \