Minor quality-of-life fixes

diff --git a/src/archiver.c b/src/archiver.c
index 10907773aacadd7d9e870e45bb7e65e1bb507817..878937b1d00985b0b0b3cd1b8c5b138ef1afa5a3 100644 (file)
--- a/src/archiver.c
+++ b/src/archiver.c
@@ -2282,13 +2282,13 @@ int simple_archiver_write_v1(FILE *out_f, SDArchiverState *state,
       int_fast8_t to_temp_finished = 0;
       for (uint64_t file_idx = 0; file_idx < *((uint64_t *)chunk_c_node->data);
            ++file_idx) {
-        fprintf(stderr, "  FILE %3lu of %3lu\n", file_idx + 1,
-                *(uint64_t *)chunk_c_node->data);
         file_node = file_node->next;
         if (file_node == files_list->tail) {
           return SDAS_INTERNAL_ERROR;
         }
         const SDArchiverInternalFileInfo *file_info_struct = file_node->data;
+        fprintf(stderr, "  FILE %3lu of %3lu: %s\n", file_idx + 1,
+                *(uint64_t *)chunk_c_node->data, file_info_struct->filename);
         __attribute__((cleanup(simple_archiver_helper_cleanup_FILE))) FILE *fd =
             fopen(file_info_struct->filename, "rb");
 
@@ -2454,13 +2454,13 @@ int simple_archiver_write_v1(FILE *out_f, SDArchiverState *state,
       fwrite(non_c_chunk_size, 8, 1, out_f);
       for (uint64_t file_idx = 0; file_idx < *((uint64_t *)chunk_c_node->data);
            ++file_idx) {
-        fprintf(stderr, "  FILE %3lu of %3lu\n", file_idx + 1,
-                *(uint64_t *)chunk_c_node->data);
         file_node = file_node->next;
         if (file_node == files_list->tail) {
           return SDAS_INTERNAL_ERROR;
         }
         const SDArchiverInternalFileInfo *file_info_struct = file_node->data;
+        fprintf(stderr, "  FILE %3lu of %3lu: %s\n", file_idx + 1,
+                *(uint64_t *)chunk_c_node->data, file_info_struct->filename);
         __attribute__((cleanup(simple_archiver_helper_cleanup_FILE))) FILE *fd =
             fopen(file_info_struct->filename, "rb");
         while (!feof(fd)) {
@@ -3854,8 +3854,8 @@ int simple_archiver_parse_archive_version_1(FILE *in_f, int_fast8_t do_extract,
       while (node->next != file_info_list->tail) {
         node = node->next;
         const SDArchiverInternalFileInfo *file_info = node->data;
-        fprintf(stderr, "  FILE %3u of %3u\n", ++file_idx, file_count);
-        fprintf(stderr, "    Filename: %s\n", file_info->filename);
+        fprintf(stderr, "  FILE %3u of %3u: %s\n", ++file_idx, file_count,
+                file_info->filename);
 
         uint_fast8_t skip_due_to_map = 0;
         if (working_files_map && simple_archiver_hash_map_get(
@@ -3953,8 +3953,8 @@ int simple_archiver_parse_archive_version_1(FILE *in_f, int_fast8_t do_extract,
       while (node->next != file_info_list->tail) {
         node = node->next;
         const SDArchiverInternalFileInfo *file_info = node->data;
-        fprintf(stderr, "  FILE %3u of %3u\n", ++file_idx, file_count);
-        fprintf(stderr, "    Filename: %s\n", file_info->filename);
+        fprintf(stderr, "  FILE %3u of %3u: %s\n", ++file_idx, file_count,
+                file_info->filename);
         chunk_idx += file_info->file_size;
         if (chunk_idx > chunk_size) {
           fprintf(stderr, "ERROR Files in chunk is larger than chunk!\n");

diff --git a/src/parser.c b/src/parser.c
index f9b8ae65fdfc43143157911275efdde4cb16ce3f..dd6383afd202ac7bad258e97eb8cfeb70f3b3254 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -347,6 +347,10 @@ int simple_archiver_parse_args(int argc, const char **argv,
       } else if (argv[0][0] != '-') {
         is_remaining_args = 1;
         continue;
+      } else {
+        fprintf(stderr, "ERROR: Got invalid arg \"%s\"!\n", argv[0]);
+        simple_archiver_print_usage();
+        return 1;
       }
     } else {
       if (out->working_files == NULL) {