Add check if file(s) are readable when archiving

Also some minor changes like more error logs and refactorings.

diff --git a/src/archiver.c b/src/archiver.c
index 55eaf67b955fb4272fb61bc7af18a8137e0f38aa..58fe5ba9c050d306f2712d90e5710690630f32e0 100644 (file)
--- a/src/archiver.c
+++ b/src/archiver.c
@@ -200,6 +200,9 @@ int write_files_fn(void *data, void *ud) {
           fopen(temp_filename, "wb");
       if (!tmp_fd) {
         fprintf(stderr, "ERROR: Unable to create temp file for compressing!\n");
+        fprintf(stderr,
+                "(Use \"--temp-files-dir <dir>\" to change where to write temp "
+                "files.)\n");
         return 1;
       }
       __attribute__((cleanup(cleanup_temp_filename_delete))) void **ptrs_array =
@@ -543,6 +546,8 @@ int write_files_fn(void *data, void *ud) {
       int stat_fd = open(file_info->filename, O_RDONLY);
       if (stat_fd == -1) {
         // Error.
+        fprintf(stderr, "ERROR: Failed to get stat of \"%s\"!\n",
+                file_info->filename);
         return 1;
       }
       int stat_status = fstat(stat_fd, &stat_buf);

diff --git a/src/parser.c b/src/parser.c
index 81f6d7d216369bc8b15371b265fd937d6e6b7a88..227d8c2edb7923c2448bac41d96d2ddd89e047f6 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -413,6 +413,7 @@ SDArchiverLinkedList *simple_archiver_parsed_to_filenames(
         SDArchiverFileInfo *file_info = malloc(sizeof(SDArchiverFileInfo));
         file_info->filename = filename;
         if ((st.st_mode & S_IFMT) == S_IFLNK) {
+          // Is a symlink.
           file_info->link_dest = malloc(MAX_SYMBOLIC_LINK_SIZE);
           ssize_t count = readlinkat(AT_FDCWD, filename, file_info->link_dest,
                                      MAX_SYMBOLIC_LINK_SIZE - 1);
@@ -422,13 +423,35 @@ SDArchiverLinkedList *simple_archiver_parsed_to_filenames(
             file_info->link_dest[count] = 0;
           } else {
             // Failure.
+            fprintf(stderr,
+                    "WARNING: Could not get link info for file \"%s\"!\n",
+                    file_info->filename);
             free(file_info->link_dest);
             free(file_info);
             free(filename);
             continue;
           }
         } else {
+          // Is a regular file.
           file_info->link_dest = NULL;
+          // Check that the file is readable by opening it. Easier than to
+          // check permissions because that would also require checking if the
+          // current USER can open the file.
+          FILE *readable_file = fopen(file_info->filename, "rb");
+          if (!readable_file) {
+            // Cannot open file, so it must be unreadable (at least by the
+            // current USER).
+            fprintf(stderr, "WARNING: \"%s\" is not readable, skipping!\n",
+                    file_info->filename);
+            free(file_info->link_dest);
+            free(file_info);
+            free(filename);
+            continue;
+          } else {
+            fclose(readable_file);
+            // fprintf(stderr, "DEBUG: \"%s\" is readable.\n",
+            // file_info->filename);
+          }
         }
         simple_archiver_list_add(files_list, file_info,
                                  simple_archiver_internal_free_file_info_fn);
@@ -486,6 +509,7 @@ SDArchiverLinkedList *simple_archiver_parsed_to_filenames(
                     malloc(sizeof(SDArchiverFileInfo));
                 file_info->filename = combined_path;
                 if ((st.st_mode & S_IFMT) == S_IFLNK) {
+                  // Is a symlink.
                   file_info->link_dest = malloc(MAX_SYMBOLIC_LINK_SIZE);
                   ssize_t count =
                       readlinkat(AT_FDCWD, combined_path, file_info->link_dest,
@@ -502,7 +526,27 @@ SDArchiverLinkedList *simple_archiver_parsed_to_filenames(
                     continue;
                   }
                 } else {
+                  // Is a regular file.
                   file_info->link_dest = NULL;
+                  // Check that the file is readable by opening it. Easier than
+                  // to check permissions because that would also require
+                  // checking if the current USER can open the file.
+                  FILE *readable_file = fopen(file_info->filename, "rb");
+                  if (!readable_file) {
+                    // Cannot open file, so it must be unreadable (at least by
+                    // the current USER).
+                    fprintf(stderr,
+                            "WARNING: \"%s\" is not readable, skipping!\n",
+                            file_info->filename);
+                    free(file_info->link_dest);
+                    free(file_info);
+                    free(combined_path);
+                    continue;
+                  } else {
+                    fclose(readable_file);
+                    // fprintf(stderr, "DEBUG: \"%s\" is readable.\n",
+                    // file_info->filename);
+                  }
                 }
                 simple_archiver_list_add(
                     files_list, file_info,