unadf: fix extracting tree for read-only directories, #91

Recent versions of unadf (after 0.7.12) sets permissions on extracted
files and directories. In case of directories, setting the permissions
made impossible to extract contents of read-only directories (at least
using default call, extracting complete directory tree).

Setting initially permissions allowing to write into directories
and then, after extracting the contents, updating them as set in ADF
fixes the issue.

Author: t-w

CMakeLists.txt

@@ -119,6 +119,14 @@ include ( CheckFunctionExists )
 include ( CheckSymbolExists )
 
 
+# Check filesystem functions
+
+check_symbol_exists ( chmod "sys/stat.h" HAVE_CHMOD )
+if ( ${HAVE_CHMOD} )
+  add_compile_definitions ( HAVE_CHMOD=1 )
+endif()
+
+
 # Check backtrace
 
 check_function_exists ( backtrace HAVE_BACKTRACE )

configure.ac

@@ -129,6 +129,7 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT8_T
 
 # Check functions
+AC_CHECK_FUNCS(chmod, AC_DEFINE([HAVE_CHMOD], [1]))
 AC_CHECK_FUNCS(strnlen, AC_DEFINE([HAVE_STRNLEN], [1]))
 AC_CHECK_FUNCS(strndup, AC_DEFINE([HAVE_STRNDUP], [1]))
 AC_CHECK_FUNCS(mempcpy, AC_DEFINE([HAVE_MEMPCPY], [1]))

examples/unadf.c

@@ -92,6 +92,7 @@ void set_file_date(char *out, struct AdfEntry *e);
 void mkdir_if_needed(char *path, mode_t perms);
 mode_t permissions(struct AdfEntry *e);
 void fix_win32_filename(char *name);
+void set_permissions(const char * const path, const mode_t perms);
 void print_error(const char *s);
 
 int main(int argc, char *argv[]) {
@@ -390,7 +391,8 @@ void extract_tree(struct AdfVolume *vol, struct AdfList *node, char *path)
         if (e->type == ADF_ST_DIR) {
             if (!pipe_mode) {
                 printf("x - %s/\n", out);
-                mkdir_if_needed(out, permissions(e));
+                mkdir_if_needed(out, 0777 ); // temp. permissionss
+                                             // ("w" is needed for extraction)
             }
         }
         else if (e->type == ADF_ST_FILE) {
@@ -414,6 +416,7 @@ void extract_tree(struct AdfVolume *vol, struct AdfList *node, char *path)
         // set timestamp
         if (!pipe_mode) {
             set_file_date(out, e);
+            set_permissions( out, permissions(e) ); // real permissions
         }
 
         free(out);
@@ -813,6 +816,26 @@ FILETIME getFileTime( time_t time )
 #endif
 
 
+#ifdef HAVE_CHMOD
+#include <sys/stat.h>
+
+void set_permissions( const char * const path,
+                      const mode_t       perms )
+{
+    if ( chmod( path, perms ) != 0 )
+        perror( path );
+//    fprintf (stderr, "%s: real\n", __func__ );
+}
+#else
+void set_permissions( const char * const path,
+                      const mode_t       perms )
+{
+    (void) path, (void) perms;
+//    fprintf (stderr, "%s: fake\n", __func__ );
+}
+#endif
+
+
 #ifdef DEBUG_UNADF
 void adfPrintBacktrace(void);
 #endif