Merge branch 'appimagetool/master' into appimagetool/master

Author: probonopd

appimagetool.c

@@ -433,6 +433,11 @@ main (int argc, char *argv[])
 
         /* Check if .DirIcon is present in source AppDir */
         gchar *diricon_path = g_build_filename(source, ".DirIcon", NULL);
+        
+        if (! g_file_test(diricon_path, G_FILE_TEST_EXISTS)){
+            fprintf (stderr, "Deleting pre-existing .DirIcon\n");
+            g_unlink(diricon_path);
+        }
         if (! g_file_test(diricon_path, G_FILE_TEST_IS_REGULAR)){
             fprintf (stderr, "Creating .DirIcon symlink based on information from desktop file\n");
             int res = symlink(basename(icon_file_path), diricon_path);

runtime.c

@@ -148,6 +148,47 @@ char* getArg(int argc, char *argv[],char chr)
         return NULL;
 }
 
+/* mkdir -p implemented in C, needed for https://github.com/probonopd/AppImageKit/issues/333
+ * https://gist.github.com/JonathonReinhart/8c0d90191c38af2dcadb102c4e202950 */
+int
+mkdir_p(const char *path)
+{
+    /* Adapted from http://stackoverflow.com/a/2336245/119527 */
+    const size_t len = strlen(path);
+    char _path[PATH_MAX];
+    char *p; 
+
+    errno = 0;
+
+    /* Copy string so its mutable */
+    if (len > sizeof(_path)-1) {
+        errno = ENAMETOOLONG;
+        return -1; 
+    }   
+    strcpy(_path, path);
+
+    /* Iterate the string */
+    for (p = _path + 1; *p; p++) {
+        if (*p == '/') {
+            /* Temporarily truncate */
+            *p = '\0';
+
+            if (mkdir(_path, S_IRWXU) != 0) {
+                if (errno != EEXIST)
+                    return -1; 
+            }
+
+            *p = '/';
+        }
+    }   
+
+    if (mkdir(_path, S_IRWXU) != 0) {
+        if (errno != EEXIST)
+            return -1; 
+    }   
+
+    return 0;
+}
 
 int
 main (int argc, char *argv[])
@@ -190,8 +231,8 @@ main (int argc, char *argv[])
         prefix = "squashfs-root/";
 
         if(access(prefix, F_OK ) == -1 ) {
-            if (mkdir(prefix, 0777) == -1) {
-                perror("mkdir error");
+            if (mkdir_p(prefix) == -1) {
+                perror("mkdir_p error");
                 exit(EXIT_FAILURE);
             }
         }
@@ -218,10 +259,10 @@ main (int argc, char *argv[])
                     strcat(strcat(prefixed_path_to_extract, prefix), trv.path);
                     if(inode.base.inode_type == SQUASHFS_DIR_TYPE){
                         fprintf(stderr, "inode.xtra.dir.parent_inode: %ui\n", inode.xtra.dir.parent_inode);
-                        fprintf(stderr, "mkdir: %s/\n", prefixed_path_to_extract);
+                        fprintf(stderr, "mkdir_p: %s/\n", prefixed_path_to_extract);
                         if(access(prefixed_path_to_extract, F_OK ) == -1 ) {
-                            if (mkdir(prefixed_path_to_extract, 0777) == -1) {
-                                perror("mkdir error");
+                            if (mkdir_p(prefixed_path_to_extract) == -1) {
+                                perror("mkdir_p error");
                                 exit(EXIT_FAILURE);
                             }
                         }