NTFS test updates and NTFS capture fix

diff --git a/src/dentry.c b/src/dentry.c
index 691f14c38412e851a42717c4335397e1df91a906..116efa58c0711cf9ce61dcfccf0391b43b6182b9 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -617,7 +617,8 @@ static void __destroy_dentry(struct dentry *dentry)
        FREE(dentry->file_name_utf8);
        FREE(dentry->short_name);
        FREE(dentry->full_path_utf8);
-       FREE(dentry->extracted_file);
+       if (dentry->extracted_file != dentry->full_path_utf8)
+               FREE(dentry->extracted_file);
 }
 
 /* Frees a WIM dentry. */

diff --git a/src/dentry.h b/src/dentry.h
index 2d84ad35f8f0699d2b388dd2e473f7f069a2c170..b539fb58148e807c48792183a64fdb80d53a612c 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -299,7 +299,7 @@ struct dentry {
        };
 
        /* Path to extracted file on disk (used during extraction only)
-        * (malloc()ed buffer) */
+        * (malloc()ed buffer, or set the same as full_path_utf8) */
        char *extracted_file;
 };
 

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 108418b3444c8020b0f2d5f65d7fc2a3a1237e7f..ee1982af7f63d610676f59363fede5d46b94650e 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -330,13 +330,9 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
                                         ntfs_inode **dir_ni_p,
                                         WIMStruct *w)
 {
-       int ret;
        struct dentry *other;
        struct dentry *dentry_with_dos_name;
 
-       if (dentry->link_group_list.next == &dentry->link_group_list)
-               return 0;
-
        dentry_with_dos_name = NULL;
        list_for_each_entry(other, &dentry->link_group_list,
                            link_group_list)
@@ -358,6 +354,7 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry,
                char *p;
                const char *dir_name;
                char orig;
+               int ret;
                ntfs_volume *vol = (*dir_ni_p)->vol;
 
                DEBUG("pre-applying DOS name `%s'",
@@ -411,9 +408,12 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
 
                /* Apply hard-linked directory in same directory with DOS name
                 * (if there is one) before this dentry */
-               ret = preapply_dentry_with_dos_name(dentry, &dir_ni, w);
-               if (ret != 0)
-                       return ret;
+               if (dentry->short_name_len == 0) {
+                       ret = preapply_dentry_with_dos_name(dentry,
+                                                           &dir_ni, w);
+                       if (ret != 0)
+                               return ret;
+               }
 
                type = S_IFREG;
                /* See if we can make a hard link */
@@ -426,19 +426,16 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
                                ret = wim_apply_hardlink_ntfs(dentry, other,
                                                              dir_ni, &ni);
                                is_hardlink = true;
-                               if (ret != 0)
+                               if (ret) {
                                        goto out_close_dir_ni;
-                               else
+                               } else {
+                                       dentry->extracted_file = dentry->full_path_utf8;
                                        goto out_set_dos_name;
+                               }
                        }
                }
                /* Can't make a hard link; extract the file itself */
-               FREE(dentry->extracted_file);
-               dentry->extracted_file = STRDUP(dentry->full_path_utf8);
-               if (!dentry->extracted_file) {
-                       ERROR("Failed to allocate memory for filename");
-                       return WIMLIB_ERR_NOMEM;
-               }
+               dentry->extracted_file = dentry->full_path_utf8;
        }
 
        /* 
@@ -621,8 +618,6 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
        dir_name = dentry->full_path_utf8;
 
        dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
-       if (dir_ni)
-               DEBUG("Found NTFS inode for `%s'", dir_name);
        *p = orig;
        if (!dir_ni) {
                ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
@@ -671,10 +666,20 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg)
        return ret;
 }
 
+static int dentry_clear_extracted_file(struct dentry *dentry, void *ignore)
+{
+       if (dentry->extracted_file != dentry->full_path_utf8)
+               FREE(dentry->extracted_file);
+       dentry->extracted_file = NULL;
+       return 0;
+}
+
 static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract_flags)
 {
        ntfs_volume *vol;
        int ret;
+       struct dentry *root;
+       struct ntfs_apply_args args;
        
        DEBUG("Mounting NTFS volume `%s'", device);
        vol = ntfs_mount(device, 0);
@@ -682,22 +687,23 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract
                ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", device);
                return WIMLIB_ERR_NTFS_3G;
        }
-       struct ntfs_apply_args args = {
-               .vol           = vol,
-               .extract_flags = extract_flags,
-               .w             = w,
-       };
-       ret = for_dentry_in_tree(wim_root_dentry(w), wim_apply_dentry_ntfs,
-                                &args);
+       args.vol = vol;
+       args.extract_flags = extract_flags;
+       args.w = w;
+       root = wim_root_dentry(w);
+
+       for_dentry_in_tree(root, dentry_clear_extracted_file, NULL);
 
+       ret = for_dentry_in_tree(root, wim_apply_dentry_ntfs, &args);
        if (ret != 0)
                goto out;
+
        if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE)
                printf("Setting timestamps of extracted files on NTFS "
                       "volume `%s'\n", device);
-       ret = for_dentry_in_tree_depth(wim_root_dentry(w),
-                                      wim_apply_dentry_timestamps,
+       ret = for_dentry_in_tree_depth(root, wim_apply_dentry_timestamps,
                                       &args);
+
        if (ret == 0 && (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE))
                printf("Finished applying image %d of %s to NTFS "
                       "volume `%s'\n",

diff --git a/tests/security_descriptor_1.base64 b/tests/security_descriptor_1.base64
new file mode 100644 (file)
index 0000000..500d78e
--- /dev/null
+++ b/tests/security_descriptor_1.base64
@@ -0,0 +1 @@
+AQAEoLgAAADEAAAAAAAAABQAAAACAKQABwAAAAAAFAD/AR8AAQEAAAAAAAUSAAAAABMYAP8BHwABAgAAAAAABSAAAAAgAgAAABMUAP8BHwABAQAAAAAABRIAAAAAGxQAAAAAEAEBAAAAAAADAAAAAAATGACpABIAAQIAAAAAAAUgAAAAIQIAAAASGAAEAAAAAQIAAAAAAAUgAAAAIQIAAAASGAACAAAAAQIAAAAAAAUgAAAAIQIAAAEBAAAAAAAFEgAAAAEBAAAAAAAFEgAAAA==
\ No newline at end of file

diff --git a/tests/security_descriptor_1.bin b/tests/security_descriptor_1.bin
new file mode 100644 (file)
index 0000000..f15ad8e
Binary files /dev/null and b/tests/security_descriptor_1.bin differ

diff --git a/tests/security_descriptor_2.base64 b/tests/security_descriptor_2.base64
new file mode 100644 (file)
index 0000000..4dc5f24
--- /dev/null
+++ b/tests/security_descriptor_2.base64
@@ -0,0 +1 @@
+AQAEoHQAAACAAAAAAAAAABQAAAACAGAABAAAAAAAFAD/AR8AAQEAAAAAAAUSAAAAABAYAP8BHwABAgAAAAAABSAAAAAgAgAAABAUAP8BHwABAQAAAAAABRIAAAAAEBgAqQASAAECAAAAAAAFIAAAACECAAABAQAAAAAABRIAAAABAQAAAAAABRIAAAA=
\ No newline at end of file

diff --git a/tests/security_descriptor_2.bin b/tests/security_descriptor_2.bin
new file mode 100644 (file)
index 0000000..a4530e4
Binary files /dev/null and b/tests/security_descriptor_2.bin differ

diff --git a/tests/test-imagex b/tests/test-imagex
index 9fdaf03732f219bbe0d56fd83e6699c90e34f778..33c58dbf3048f7837fd0ae922dc1814478d8ba27 100755 (executable)
--- a/tests/test-imagex
+++ b/tests/test-imagex
@@ -612,5 +612,5 @@ if imagex export dir.wim all new.wim --boot; then
 fi
 
 echo "**********************************************************"
-echo "                     All tests passed                     "
+echo "                 Basic imagex tests passed                "
 echo "**********************************************************"

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index a0c79fccf8ef5ed5ae88ae27cd248666b64d87f9..989be190bea3100a7709340418333a8c9716b7a6 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -11,7 +11,7 @@ cd tests
 
 imagex() {
        #echo "imagex $@"
-       ../imagex $@ > /dev/null
+       ../imagex $@
 }
 
 __do_unmount() {
@@ -46,8 +46,8 @@ do_mkntfs() {
 
 init() {
        echo "Creating NTFS volumes and empty directories to use as mountpoints"
-       dd if=/dev/zero of=in.ntfs bs=4096 count=260 &> /dev/null
-       dd if=/dev/zero of=out.ntfs bs=4096 count=260 &> /dev/null
+       dd if=/dev/zero of=in.ntfs bs=4096 count=500 &> /dev/null
+       dd if=/dev/zero of=out.ntfs bs=4096 count=500 &> /dev/null
        mkdir in.mnt out.mnt
        do_mkntfs in.ntfs
        do_mkntfs out.ntfs
@@ -208,3 +208,62 @@ do_test 'echo 999 > file;
         setfattr -n user.ads -v "888" file;
         ln file link;
         setfattr -v DOSNAME -n system.ntfs_dos_name file;'
+
+msg "NTFS volume containing C source code of wimlib"
+do_test 'cp ../../src/*.c ../../src/*.h .'
+
+msg "NTFS volume containing file with security descriptor"
+do_test 'touch file;
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file'
+
+msg "NTFS volume containing files with different security descriptors"
+do_test 'touch file;
+        touch file2;
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_2.base64` file'
+       
+msg "NTFS volume containing files with different security descriptors and some with the same security descriptor"
+do_test 'touch file;
+        touch file2;
+        touch file3;
+        mkdir dir;
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_2.base64` file
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` file3'
+
+msg "NTFS volume containing tons of random stuff"
+do_test 'echo -n 8 > file;
+        ln file hardlink;
+        ln -s hardlink symlink;
+        echo -n 8 > identical file;
+        dd if=/dev/urandom of=randomfile bs=4096 count=10;
+        mkdir dir;
+        setfattr -n system.ntfs_dos_name -v DOSNAME dir;
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir
+        mkdir anotherdir;
+        cp file anotherdir;
+        ln file anotherdir/anotherhardlink;
+        ln -s .. anotherdir/anothersymlink;
+        ln -s anothersymlink anotherdir/symlinktosymlink;
+        echo -n 33 > anotherfile;
+        setfattr -n user.ads anotherfile -v 33;
+        setfattr -n user.ads2 anotherfile -v 8;
+        setfattr -n user.ads3 anotherfile -v 33;
+        echo -n > emptyfile;
+        setfattr -n user.ads emptyfile -v 8;
+        setfattr -n user.ads5 emptyfile -v"`cat ../../src/hardlink.c`"
+        mkdir dir/subdir;
+        ln file dir/subdir/file;
+        echo -n 8 > dir/subdir/file2;
+        ln dir/subdir/file dir/subdir/link;
+        setfattr -n system.ntfs_dos_name -v 123 dir/subdir/link;
+        setfattr -n system.ntfs_acl -v 0s`cat ../security_descriptor_1.base64` dir/subdir/link;
+        setfattr -n user.yet_another_ads -v "" dir/subdir/link;
+        setfattr -n user.yet_another_ads2 -v "" dir/subdir/link;
+        setfattr -n user.yet_another_ads3 -v "abc" dir/subdir/link;
+        setfattr -n user.yet_another_ads4 -v "" dir/subdir/link;'
+
+echo "**********************************************************"
+echo "           NTFS capture/apply tests passed                "
+echo "**********************************************************"