CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8..3.22)
 
 project(minitar LANGUAGES C VERSION 1.5.0)
 
-option(MINITAR_IGNORE_UNSUPPORTED_TYPES "Skip past entries that have unsupported types instead of panicking (deprecated)" OFF)
+option(MINITAR_IGNORE_UNSUPPORTED_TYPES "Skip past entries that have unsupported types instead of panicking" OFF)
 
 set(SOURCES
     src/tar.c
@@ -12,7 +12,7 @@ set(SOURCES
 add_library(minitar STATIC ${SOURCES})
 
 if(MINITAR_IGNORE_UNSUPPORTED_TYPES)
-message(WARNING "MINITAR_IGNORE_UNSUPPORTED_TYPES is deprecated, since there are no unsupported types anymore")
+target_compile_definitions(minitar PRIVATE MINITAR_IGNORE_UNSUPPORTED_TYPES)
 endif()
 
 target_include_directories(minitar PUBLIC ${CMAKE_CURRENT_LIST_DIR}) # for minitar.h

examples/untar.c

@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/sysmacros.h>
 #include <unistd.h>
 
 static int untar_file(const struct minitar_entry* entry, const void* buf)
@@ -49,7 +48,6 @@ int main(int argc, char** argv)
         perror(argv[1]);
         return 1;
     }
-    int exit_status = 0;
     struct minitar_entry entry;
     do {
         if (minitar_read_entry(&mp, &entry) == 0)
@@ -60,7 +58,6 @@ int main(int argc, char** argv)
                 if (status != 0)
                 {
                     fprintf(stderr, "Failed to create directory %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
                     break;
                 }
 
@@ -72,7 +69,6 @@ int main(int argc, char** argv)
                 if (!ptr)
                 {
                     perror("malloc");
-                    exit_status = 1;
                     break;
                 }
 
@@ -85,7 +81,6 @@ int main(int argc, char** argv)
                 if (status != 0)
                 {
                     fprintf(stderr, "Failed to extract file %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
                     break;
                 }
 
@@ -98,7 +93,6 @@ int main(int argc, char** argv)
                 if (status != 0)
                 {
                     fprintf(stderr, "Failed to create symlink %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
                     break;
                 }
 
@@ -111,7 +105,6 @@ int main(int argc, char** argv)
                 if (status != 0)
                 {
                     fprintf(stderr, "Failed to create hard link %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
                     break;
                 }
 
@@ -124,50 +117,14 @@ int main(int argc, char** argv)
                 if (status != 0)
                 {
                     fprintf(stderr, "Failed to create FIFO %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
                     break;
                 }
 
                 printf("fifo %s\n", entry.metadata.path);
             }
-            else if (entry.metadata.type == MTAR_BLKDEV)
-            {
-                int status = mknod(entry.metadata.path, entry.metadata.mode | S_IFBLK,
-                                   makedev(entry.metadata.devmajor, entry.metadata.devminor));
-
-                if (status != 0)
-                {
-                    fprintf(stderr, "Failed to create block device %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
-                    break;
-                }
-
-                printf("blkdev %s (%u:%u)\n", entry.metadata.path, entry.metadata.devmajor, entry.metadata.devminor);
-            }
-            else if (entry.metadata.type == MTAR_CHRDEV)
-            {
-                int status = mknod(entry.metadata.path, entry.metadata.mode | S_IFCHR,
-                                   makedev(entry.metadata.devmajor, entry.metadata.devminor));
-
-                if (status != 0)
-                {
-                    fprintf(stderr, "Failed to create character device %s: %s\n", entry.metadata.path, strerror(errno));
-                    exit_status = 1;
-                    break;
-                }
-
-                printf("chrdev %s (%u:%u)\n", entry.metadata.path, entry.metadata.devmajor, entry.metadata.devminor);
-            }
-            else
-            {
-                fprintf(stderr, "error: unknown entry type: %d", entry.metadata.type);
-                exit_status = 1;
-                break;
-            }
         }
         else
             break;
     } while (1);
     minitar_close(&mp);
-    return exit_status;
 }

minitar.h

@@ -24,8 +24,6 @@ enum minitar_file_type
     MTAR_SYMLINK,
     MTAR_HARDLINK,
     MTAR_FIFO,
-    MTAR_CHRDEV,
-    MTAR_BLKDEV
 };
 
 struct minitar_entry_internal
@@ -46,8 +44,6 @@ struct minitar_entry_metadata
     enum minitar_file_type type;
     char uname[32];
     char gname[32];
-    unsigned devminor;
-    unsigned devmajor;
 };
 
 struct minitar_entry

src/util.c

@@ -190,8 +190,8 @@ void minitar_parse_metadata_from_tar_header(const struct tar_header* hdr, struct
     case '0': metadata->type = MTAR_REGULAR; break;
     case '1': metadata->type = MTAR_HARDLINK; break;
     case '2': metadata->type = MTAR_SYMLINK; break;
-    case '3': metadata->type = MTAR_CHRDEV; break;
-    case '4': metadata->type = MTAR_BLKDEV; break;
+    case '3': minitar_handle_panic("Character devices are unsupported");
+    case '4': minitar_handle_panic("Block devices are unsupported");
     case '5': metadata->type = MTAR_DIRECTORY; break;
     case '6': metadata->type = MTAR_FIFO; break;
     // This case should have been previously handled by minitar_validate_header().
@@ -200,12 +200,6 @@ void minitar_parse_metadata_from_tar_header(const struct tar_header* hdr, struct
 
     minitar_strlcpy(metadata->uname, hdr->uname, 32);
     minitar_strlcpy(metadata->gname, hdr->gname, 32);
-
-    if (metadata->type == MTAR_CHRDEV || metadata->type == MTAR_BLKDEV)
-    {
-        metadata->devminor = minitar_parse_octal(hdr->devminor);
-        metadata->devmajor = minitar_parse_octal(hdr->devmajor);
-    }
 }
 
 uint32_t minitar_checksum_header(const struct tar_header* hdr)
@@ -236,9 +230,15 @@ uint32_t minitar_checksum_header(const struct tar_header* hdr)
 
 int minitar_validate_header(const struct tar_header* hdr)
 {
+#ifdef MINITAR_IGNORE_UNSUPPORTED_TYPES
+    if (hdr->typeflag != '\0' && hdr->typeflag != '0' && hdr->typeflag != '1' && hdr->typeflag != '2' &&
+        hdr->typeflag != '5')
+        return 0;
+#else
     if (hdr->typeflag != '\0' && hdr->typeflag != '0' && hdr->typeflag != '1' && hdr->typeflag != '2' &&
         hdr->typeflag != '3' && hdr->typeflag != '4' && hdr->typeflag != '5' && hdr->typeflag != '6')
         return 0;
+#endif
     // FIXME: Warn on checksum mismatch unless header is all blanks?
     if (minitar_checksum_header(hdr) != minitar_parse_octal(hdr->chksum)) return 0;
     return !strncmp(hdr->magic, "ustar", 5);