Changeset 4f3d72f in rtems

Timestamp:

Jul 27, 2010, 6:11:42 PM (10 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, master

Children:

270434cc

Parents:

234a36c

Message:

2010-07-27 Joel Sherrill <joel.sherrill@…>

• libfs/src/imfs/imfs_load_tar.c, libmisc/untar/untar.c: Now supports both pax and GNU tar created tar files.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libfs/src/imfs/imfs_load_tar.c (modified) (2 diffs)
• libmisc/untar/untar.c (modified) (3 diffs)

cpukit/ChangeLog

@@ +1 @@
+2010-07-27      Joel Sherrill <joel.sherrill@oarcorp.com>
+
+        * libfs/src/imfs/imfs_load_tar.c, libmisc/untar/untar.c: Now supports
+        both pax and GNU tar created tar files.
+
 2010-07-27      Joel Sherrill <joel.sherrilL@OARcorp.com>
 

cpukit/libfs/src/imfs/imfs_load_tar.c

@@ -47 +47 @@
  *   156      1 bytes  Link flag
  *   157    100 bytes  Linkname ('\0' terminated, 99 maxmum length)
- *   257      8 bytes  Magic ("ustar  \0")
+ *   257      8 bytes  Magic PAX ("ustar\0" + 2 bytes padding)
+ *   257      8 bytes  Magic GNU tar ("ustar  \0")
  *   265     32 bytes  User name ('\0' terminated, 31 maxmum length)
  *   297     32 bytes  Group name ('\0' terminated, 31 maxmum length)
@@ -125 +126 @@
     hdr_ptr = (char *) &tar_image[offset];
     offset += 512;
-    if (strncmp(&hdr_ptr[257], "ustar  ", 7))
+    if (strncmp(&hdr_ptr[257], "ustar", 5))
       break;
 

cpukit/libmisc/untar/untar.c

@@ -40 +40 @@
  *   156      1 bytes  Link flag
  *   157    100 bytes  Linkname ('\0' terminated, 99 maxmum length)
- *   257      8 bytes  Magic ("ustar  \0")
+ *   257      8 bytes  Magic PAX ("ustar\0" + 2 bytes padding)
+ *   257      8 bytes  Magic GNU tar ("ustar  \0")
  *   265     32 bytes  User name ('\0' terminated, 31 maxmum length)
  *   297     32 bytes  Group name ('\0' terminated, 31 maxmum length)
@@ -144 +145 @@
       bufr = &tar_ptr[ptr];
       ptr += 512;
-      if (strncmp(&bufr[257], "ustar  ", 7))
+      if (strncmp(&bufr[257], "ustar", 5))
       {
          retval = UNTAR_SUCCESSFUL;
@@ -284 +285 @@
       }
 
-      if (strncmp(&bufr[257], "ustar  ", 7))
+      if (strncmp(&bufr[257], "ustar", 5))
       {
          break;