X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fadd_image.c;h=28ece7424720a3922887504590d4506d37b6b7dd;hb=48e894ec2380866098c7dc064f3d2eedb55e6fb8;hp=5b51f493ea78e597375259ee7345be6222ae98ea;hpb=811a38dfe05ef337e2d627f654f8a3e559900790;p=wimlib

diff --git a/src/add_image.c b/src/add_image.c
index 5b51f493..28ece742 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -536,6 +536,7 @@ out_find_close:
 	FindClose(hFind);
 	return ret;
 }
+
 #endif
 
 /*
@@ -674,11 +675,15 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 	inode->i_last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
 	inode->i_last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime);
 #endif
-	if (sizeof(ino_t) >= 8)
-		inode->i_ino = (u64)root_stbuf.st_ino;
-	else
-		inode->i_ino = (u64)root_stbuf.st_ino |
-				   ((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63));
+	/* Leave the inode number at 0 for directories. */
+	if (!S_ISDIR(root_stbuf.st_mode)) {
+		if (sizeof(ino_t) >= 8)
+			inode->i_ino = (u64)root_stbuf.st_ino;
+		else
+			inode->i_ino = (u64)root_stbuf.st_ino |
+					   ((u64)root_stbuf.st_dev <<
+					    	((sizeof(ino_t) * 8) & 63));
+	}
 	inode->i_resolved = 1;
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
 		ret = inode_set_unix_data(inode, root_stbuf.st_uid,
@@ -847,7 +852,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 	ret = utf8_to_utf16(root_disk_path, strlen(root_disk_path),
 			    (char**)&path_utf16, &path_utf16_nchars);
 	if (ret)
-		goto out;
+		goto out_destroy_sd_set;
 	path_utf16_nchars /= sizeof(wchar_t);
 
 	HANDLE hFile = win32_open_file_readonly(path_utf16);
@@ -856,7 +861,7 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 		ERROR("Win32 API: Failed to open \"%s\"", root_disk_path);
 		win32_error(err);
 		ret = WIMLIB_ERR_OPEN;
-		goto out_destroy_sd_set;
+		goto out_free_path_utf16;
 	}
 
 	BY_HANDLE_FILE_INFORMATION file_info;
@@ -939,11 +944,11 @@ static int build_dentry_tree(struct wim_dentry **root_ret,
 	}
 out_close_handle:
 	CloseHandle(hFile);
+out_free_path_utf16:
+	FREE(path_utf16);
 out_destroy_sd_set:
 	if (extra_arg == NULL)
 		destroy_sd_set(sd_set);
-out_free_path_utf16:
-	FREE(path_utf16);
 #endif
 	/* The below lines of code are common to both UNIX and Win32 builds.  It
 	 * simply returns the captured directory tree if the capture was
@@ -1360,6 +1365,7 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 			return WIMLIB_ERR_INVALID_OVERLAY;
 		}
 	}
+	free_dentry(branch);
 	return 0;
 
 }
@@ -1544,6 +1550,11 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w,
 	} else {
 		size_t i;
 
+#if defined(__CYGWIN__) || defined(__WIN32__)
+		win32_acquire_privilege(SE_BACKUP_NAME);
+		win32_acquire_privilege(SE_SECURITY_NAME);
+		win32_acquire_privilege(SE_TAKE_OWNERSHIP_NAME);
+#endif
 		root_dentry = NULL;
 		i = 0;
 		do {
@@ -1622,7 +1633,7 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w,
 	if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
 		wimlib_set_boot_idx(w, w->hdr.image_count);
 	ret = 0;
-	goto out;
+	goto out_destroy_capture_config;
 out_destroy_imd:
 	destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
 			       w->lookup_table);
@@ -1637,6 +1648,11 @@ out_free_security_data:
 out_destroy_capture_config:
 	destroy_capture_config(&config);
 out:
+#if defined(__CYGWIN__) || defined(__WIN32__)
+	win32_release_privilege(SE_BACKUP_NAME);
+	win32_release_privilege(SE_SECURITY_NAME);
+	win32_release_privilege(SE_TAKE_OWNERSHIP_NAME);
+#endif
 	return ret;
 }