From: Stephen Seo <seo.disparate@gmail.com>
Date: Mon, 27 Jan 2025 11:10:14 +0000 (+0900)
Subject: Fix file versions 2,3 creating dirs when only `-t`
X-Git-Tag: 1.12^2~9
X-Git-Url: https://git.seodisparate.com/stephenseo/css/v4-font-face.min.css?a=commitdiff_plain;h=72549ebeb669cca8ad5cd0ce21c1e7d5e924f7e5;p=SimpleArchiver

Fix file versions 2,3 creating dirs when only `-t`

The expected behavior is not to create anything when using the `-t`
flag.
---

diff --git a/src/archiver.c b/src/archiver.c
index ff5da86..2bddfd5 100644
--- a/src/archiver.c
+++ b/src/archiver.c
@@ -8130,24 +8130,28 @@ int simple_archiver_parse_archive_version_2(FILE *in_f, int_fast8_t do_extract,
     abs_path[size - 1] = 0;
     //fprintf(stderr, "DEBUG: abs_path is \"%s\"!\n", abs_path);
 
-    int ret = simple_archiver_helper_make_dirs_perms(
-      abs_path,
-      state && (state->parsed->flags & 0x2000)
-        ? simple_archiver_internal_permissions_to_mode_t(
-            state->parsed->dir_permissions)
-        : (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH),
-      state && (state->parsed->flags & 0x400) ? state->parsed->uid : uid,
-      state && (state->parsed->flags & 0x800) ? state->parsed->gid : gid);
-    if (ret != 0) {
-      fprintf(stderr, "ERROR: Failed to make dirs (%d)!\n", ret);
-      return SDAS_INTERNAL_ERROR;
+    if (do_extract) {
+      int ret = simple_archiver_helper_make_dirs_perms(
+        abs_path,
+        state && (state->parsed->flags & 0x2000)
+          ? simple_archiver_internal_permissions_to_mode_t(
+              state->parsed->dir_permissions)
+          : (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH),
+        state && (state->parsed->flags & 0x400) ? state->parsed->uid : uid,
+        state && (state->parsed->flags & 0x800) ? state->parsed->gid : gid);
+      if (ret != 0) {
+        fprintf(stderr, "ERROR: Failed to make dirs (%d)!\n", ret);
+        return SDAS_INTERNAL_ERROR;
+      }
     }
   }
 
   return SDAS_SUCCESS;
 }
 
-int simple_archiver_parse_archive_version_3(FILE *in_f, int_fast8_t do_extract, const SDArchiverState *state) {
+int simple_archiver_parse_archive_version_3(FILE *in_f,
+                                            int_fast8_t do_extract,
+                                            const SDArchiverState *state) {
   uint8_t buf[SIMPLE_ARCHIVER_BUFFER_SIZE];
   uint16_t u16;
   uint32_t u32;
@@ -9811,17 +9815,19 @@ int simple_archiver_parse_archive_version_3(FILE *in_f, int_fast8_t do_extract,
     abs_path[size - 1] = 0;
     //fprintf(stderr, "DEBUG: abs_path is \"%s\"!\n", abs_path);
 
-    int ret = simple_archiver_helper_make_dirs_perms(
-      abs_path,
-      state && (state->parsed->flags & 0x2000)
-        ? simple_archiver_internal_permissions_to_mode_t(
-            state->parsed->dir_permissions)
-        : (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH),
-      state && (state->parsed->flags & 0x400) ? state->parsed->uid : uid,
-      state && (state->parsed->flags & 0x800) ? state->parsed->gid : gid);
-    if (ret != 0) {
-      fprintf(stderr, "ERROR: Failed to make dirs (%d)!\n", ret);
-      return SDAS_INTERNAL_ERROR;
+    if (do_extract) {
+      int ret = simple_archiver_helper_make_dirs_perms(
+        abs_path,
+        state && (state->parsed->flags & 0x2000)
+          ? simple_archiver_internal_permissions_to_mode_t(
+              state->parsed->dir_permissions)
+          : (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH),
+        state && (state->parsed->flags & 0x400) ? state->parsed->uid : uid,
+        state && (state->parsed->flags & 0x800) ? state->parsed->gid : gid);
+      if (ret != 0) {
+        fprintf(stderr, "ERROR: Failed to make dirs (%d)!\n", ret);
+        return SDAS_INTERNAL_ERROR;
+      }
     }
   }