CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8..3.22)
 
-project(minitar LANGUAGES C VERSION 1.1.0)
+project(minitar LANGUAGES C VERSION 1.0.0)
 
 set(SOURCES
     src/tar.c

README.md

@@ -25,7 +25,7 @@ int main(int argc, char** argv)
 	do {
 		entry = minitar_read_entry(mp);
 		if(entry) { 
-			printf("%s\n", entry->metadata.path);
+			printf("%s\n", entry->metadata.name);
 			minitar_free_entry(entry);
 		}
 	} while(entry);
@@ -75,16 +75,10 @@ The state of `mp` after `minitar_find_by_name()` returns is unspecified, but a s
 
 In order to perform other minitar operations on the archive, `minitar_rewind()` should probably be called first, to get a known state.
 
-### minitar_find_by_path
-`struct minitar_entry* minitar_find_by_path(struct minitar* mp, const char* path)`
-
-Same as `minitar_find_by_name()`, but matches the full path inside the archive instead of the file name.
-
-
 ### minitar_find_any_of
 `struct minitar_entry* minitar_find_any_of(struct minitar* mp, enum minitar_file_type type)`
 
-Same as `minitar_find_by_name()`, but matches the file type instead of the name. As with `minitar_find_by_name()`, this function starts searching from the current archive position and calling it in a loop until it returns NULL will return all matching entries.
+Does the same thing as `minitar_find_by_name()`, but matches the file type instead of the name. As with `minitar_find_by_name()`, this function starts searching from the current archive position and calling it in a loop until it returns NULL will return all matching entries.
 
 ### minitar_read_contents
 `size_t minitar_read_contents(struct minitar* mp, struct minitar_entry* entry, char* buf, size_t max)`
@@ -128,9 +122,7 @@ Other file types supported in tar archives, such as FIFOs or symlinks, are not s
 
 This structure represents an entry's metadata, with the following fields:
 
-`path`: A string representing the full path of the entry within the archive. (`char[]`)
+`name`: A string representing the full path of the entry within the archive. (`char[]`)
-
-`name`: A string representing the base name of the entry (the last component of its path). (`char[]`)
 
 `mode`: An integer representing the permissions of the entry. (`mode_t`)
 

minitar.h

@@ -22,8 +22,7 @@ enum minitar_file_type
 
 struct minitar_entry_metadata
 {
-    char path[257];
+    char name[257];
-    char name[128];
     mode_t mode;
     uid_t uid;
     gid_t gid;
@@ -50,7 +49,6 @@ extern "C"
     void minitar_free_entry(struct minitar_entry* entry);
     void minitar_rewind(struct minitar* mp);
     struct minitar_entry* minitar_find_by_name(struct minitar* mp, const char* name);
-    struct minitar_entry* minitar_find_by_path(struct minitar* mp, const char* path);
     struct minitar_entry* minitar_find_any_of(struct minitar* mp, enum minitar_file_type type);
     int minitar_close(struct minitar* mp);
     size_t minitar_read_contents(struct minitar* mp, struct minitar_entry* entry, char* buf, size_t max);

src/tar.c

@@ -14,9 +14,7 @@ size_t minitar_get_size_in_blocks(size_t);
 
 struct minitar* minitar_open(const char* pathname)
 {
-    FILE* fp =
+    FILE* fp = fopen(pathname, "rb"); // On some systems, this might be necessary to read the file properly.
-        fopen(pathname,
-              "rb"); // On some systems, opening the file in binary mode might be necessary to read the file properly.
     if (!fp) return NULL;
     struct minitar* mp = malloc(sizeof(struct minitar));
     if (!mp)
@@ -94,20 +92,6 @@ struct minitar_entry* minitar_find_by_name(struct minitar* mp, const char* name)
     return NULL;
 }
 
-struct minitar_entry* minitar_find_by_path(struct minitar* mp, const char* path)
-{
-    struct minitar_entry* entry;
-    do {
-        entry = minitar_read_entry(mp);
-        if (entry)
-        {
-            if (!strcmp(entry->metadata.path, path)) return entry;
-            minitar_free_entry(entry);
-        }
-    } while (entry);
-    return NULL;
-}
-
 struct minitar_entry* minitar_find_any_of(struct minitar* mp, enum minitar_file_type type)
 {
     struct minitar_entry* entry;

src/util.c

@@ -3,7 +3,6 @@
 #define _IN_MINITAR
 #include "minitar.h"
 #include "tar.h"
-#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdnoreturn.h>
@@ -59,38 +58,30 @@ void minitar_parse_metadata_from_tar_header(const struct tar_header* hdr, struct
 {
     if (!strlen(hdr->prefix))
     {
-        size_t size = minitar_strlcpy(metadata->path, hdr->name, 100);
+        minitar_strlcpy(metadata->name, hdr->name, 100);
-        if (size >= 100) metadata->path[100] = '\0';
+        metadata->name[100] = '\0';
-        else
-            metadata->path[size] = '\0';
     }
     else
     {
-        minitar_strlcpy(metadata->path, hdr->prefix, 155);
+        minitar_strlcpy(metadata->name, hdr->prefix, 155);
-        minitar_append_char(metadata->path, '/');
+        minitar_append_char(metadata->name, '/');
-        strncat(metadata->path, hdr->name, 100);
+        strncat(metadata->name, hdr->name, 100);
-        metadata->path[256] = '\0';
+        metadata->name[256] = '\0';
     }
 
-    char* mut_path = strdup(metadata->path);
-    if (!mut_path) minitar_panic("Failed to allocate memory");
-    char* bname = basename(mut_path);
-    minitar_strlcpy(metadata->name, bname, sizeof(metadata->name));
-    free(mut_path);
-
     metadata->mode = (mode_t)strtoul(hdr->mode, NULL, 8);
     metadata->uid = (uid_t)strtoul(hdr->uid, NULL, 8);
     metadata->gid = (gid_t)strtoul(hdr->gid, NULL, 8);
 
     char* sizeptr = strndup(
         hdr->size, 12); // The hdr->size field is not null-terminated, yet strndup returns a null-terminated string.
-    if (!sizeptr) minitar_panic("Failed to allocate memory");
+    if (!sizeptr) minitar_panic("Failed to allocate memory to duplicate a tar header's size field");
     metadata->size = (size_t)strtoull(sizeptr, NULL, 8);
     free(sizeptr);
 
     char* timeptr = strndup(
         hdr->mtime, 12); // The hdr->mtime field is not null-terminated, yet strndup returns a null-terminated string.
-    if (!timeptr) minitar_panic("Failed to allocate memory");
+    if (!timeptr) minitar_panic("Failed to allocate memory to duplicate a tar header's mtime field");
     metadata->mtime = (time_t)strtoull(timeptr, NULL, 8);
     free(timeptr);