Win32: Minor code/comment fixes

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index dfc153f9ecb01be1d35890b4cc2cbbf5fab56136..74ae7536bda91862a7bacc8c1259095861c30ddc 100644 (file)
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -546,7 +546,8 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
        }
 
        /* Create the new WIM dentry */
        }
 
        /* Create the new WIM dentry */

-       ret = new_dentry_with_timeless_inode(path_basename(path), &root);
+       ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len),
+                                            &root);

        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

diff --git a/src/security.c b/src/security.c
index 37b9a063cfe5bec6d4793fe2586a54427f5654fc..94660de85f28301eb47589916ea7e93d01fa99ef 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -556,6 +556,9 @@ sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], size_t size)
        new->security_id = sd->num_entries;
        copy_hash(new->hash, hash);
 
        new->security_id = sd->num_entries;
        copy_hash(new->hash, hash);
 

+       /* There typically are only a few dozen security descriptors in a
+        * directory tree, so expanding the array of security descriptors by
+        * only 1 extra space each time should not be a problem. */

        descriptors = REALLOC(sd->descriptors,
                              (sd->num_entries + 1) * sizeof(sd->descriptors[0]));
        if (!descriptors)
        descriptors = REALLOC(sd->descriptors,
                              (sd->num_entries + 1) * sizeof(sd->descriptors[0]));
        if (!descriptors)

diff --git a/src/wim.c b/src/wim.c
index dd184533151e04214ec2c9e2376fec14af1e3ec4..9a20cc5756969e2642cc0ba7e01fd6b91756541f 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -596,12 +596,16 @@ wimlib_free(WIMStruct *w)
 static bool
 test_locale_ctype_utf8()
 {
 static bool
 test_locale_ctype_utf8()
 {

+#ifdef __WIN32__
+       return false;
+#else

        char *ctype = nl_langinfo(CODESET);
 
        return (!strstr(ctype, "UTF-8") ||
                !strstr(ctype, "UTF8") ||
                !strstr(ctype, "utf8") ||
                !strstr(ctype, "utf-8"));
        char *ctype = nl_langinfo(CODESET);
 
        return (!strstr(ctype, "UTF-8") ||
                !strstr(ctype, "UTF8") ||
                !strstr(ctype, "utf8") ||
                !strstr(ctype, "utf-8"));

+#endif

 }
 
 /* Get global memory allocations out of the way, 
 }
 
 /* Get global memory allocations out of the way, 

diff --git a/src/win32.c b/src/win32.c
index 3a914943ef70d4be1e2e8e7a163e2642aca7b447..3925ca56a458d375d6ed11f55acae89f3e102954 100644 (file)
--- a/src/win32.c
+++ b/src/win32.c
@@ -23,9 +23,7 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 

-#ifndef __WIN32__
-#  error "This file contains Windows code"
-#endif
+#ifdef __WIN32__

 
 #include "config.h"
 #include <windows.h>
 
 #include "config.h"
 #include <windows.h>


@@ -220,6 +218,10 @@ win32_get_short_name(struct wim_dentry *dentry, const wchar_t *path)
                memcpy(dentry->short_name, dat.cAlternateFileName, n);
                dentry->short_name_nbytes = short_name_nbytes;
        }
                memcpy(dentry->short_name, dat.cAlternateFileName, n);
                dentry->short_name_nbytes = short_name_nbytes;
        }

+       /* If we can't read the short filename for some reason, we just ignore
+        * the error and assume the file has no short name.  I don't think this
+        * should be an issue, since the short names are essentially obsolete
+        * anyway. */

        return 0;
 }
 
        return 0;
 }
 


@@ -675,6 +677,7 @@ win32_capture_streams(const wchar_t *path,
                        return 0;
                } else {
                        if (err == ERROR_ACCESS_DENIED) {
                        return 0;
                } else {
                        if (err == ERROR_ACCESS_DENIED) {

+                               /* XXX This maybe should be an error. */

                                WARNING("Failed to look up data streams "
                                        "of \"%ls\": Access denied!\n%ls",
                                        path, capture_access_denied_msg);
                                WARNING("Failed to look up data streams "
                                        "of \"%ls\": Access denied!\n%ls",
                                        path, capture_access_denied_msg);


@@ -705,11 +708,16 @@ out_find_close:
        FindClose(hFind);
        return ret;
 unnamed_only:
        FindClose(hFind);
        return ret;
 unnamed_only:

+       /* FindFirstStreamW() API is not available.  Only capture the unnamed
+        * data stream. */

        if (inode->i_attributes &
             (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
        {
                ret = 0;
        } else {
        if (inode->i_attributes &
             (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
        {
                ret = 0;
        } else {

+               /* Just create our own WIN32_FIND_STREAM_DATA for an unnamed
+                * stream to reduce the code to a call to the
+                * already-implemented win32_capture_stream() */

                wcscpy(dat.cStreamName, L"::$DATA");
                dat.StreamSize.QuadPart = file_size;
                ret = win32_capture_stream(path,
                wcscpy(dat.cStreamName, L"::$DATA");
                dat.StreamSize.QuadPart = file_size;
                ret = win32_capture_stream(path,


@@ -839,7 +847,9 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                                              progress_func,
                                              state);
        } else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
                                              progress_func,
                                              state);
        } else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {

-               /* Reparse point: save the reparse tag and data */
+               /* Reparse point: save the reparse tag and data.  Alternate data
+                * streams are not captured, if it's even possible for a reparse
+                * point to have alternate data streams... */

                ret = win32_capture_reparse_point(hFile,
                                                  inode,
                                                  lookup_table,
                ret = win32_capture_reparse_point(hFile,
                                                  inode,
                                                  lookup_table,


@@ -1029,12 +1039,9 @@ win32_set_security_data(const struct wim_inode *inode,
 again:
        if (SetFileSecurityW(path, securityInformation, descriptor))
                return 0;
 again:
        if (SetFileSecurityW(path, securityInformation, descriptor))
                return 0;

-

        err = GetLastError();
        err = GetLastError();

-

        if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS)
                goto fail;
        if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS)
                goto fail;

-

        switch (err) {
        case ERROR_PRIVILEGE_NOT_HELD:
                if (securityInformation & SACL_SECURITY_INFORMATION) {
        switch (err) {
        case ERROR_PRIVILEGE_NOT_HELD:
                if (securityInformation & SACL_SECURITY_INFORMATION) {


@@ -1081,7 +1088,6 @@ fail:
                win32_error(err);
                return WIMLIB_ERR_WRITE;
        }
                win32_error(err);
                return WIMLIB_ERR_WRITE;
        }

-       return 0;

 }
 
 
 }
 
 


@@ -1404,16 +1410,21 @@ out:
 int
 fsync(int fd)
 {
 int
 fsync(int fd)
 {

-       HANDLE h = (HANDLE)_get_osfhandle(fd);
+       DWORD err;
+       HANDLE h;
+
+       h = (HANDLE)_get_osfhandle(fd);

        if (h == INVALID_HANDLE_VALUE) {
        if (h == INVALID_HANDLE_VALUE) {

+               err = GetLastError();

                ERROR("Could not get Windows handle for file descriptor");
                ERROR("Could not get Windows handle for file descriptor");

-               win32_error(GetLastError());
+               win32_error(err);

                errno = EBADF;
                return -1;
        }
        if (!FlushFileBuffers(h)) {
                errno = EBADF;
                return -1;
        }
        if (!FlushFileBuffers(h)) {

+               err = GetLastError();

                ERROR("Could not flush file buffers to disk");
                ERROR("Could not flush file buffers to disk");

-               win32_error(GetLastError());
+               win32_error(err);

                errno = EIO;
                return -1;
        }
                errno = EIO;
                return -1;
        }


@@ -1437,33 +1448,30 @@ realpath(const wchar_t *path, wchar_t *resolved_path)
 {
        DWORD ret;
        wimlib_assert(resolved_path == NULL);
 {
        DWORD ret;
        wimlib_assert(resolved_path == NULL);

+       DWORD err;

 
        ret = GetFullPathNameW(path, 0, NULL, NULL);
 
        ret = GetFullPathNameW(path, 0, NULL, NULL);

-       if (!ret)
+       if (!ret) {
+               err = GetLastError();

                goto fail_win32;
                goto fail_win32;

+       }

 
        resolved_path = TMALLOC(ret);
        if (!resolved_path)
 
        resolved_path = TMALLOC(ret);
        if (!resolved_path)

-               goto fail;
+               goto out;

        ret = GetFullPathNameW(path, ret, resolved_path, NULL);
        if (!ret) {
        ret = GetFullPathNameW(path, ret, resolved_path, NULL);
        if (!ret) {

+               err = GetLastError();

                free(resolved_path);
                free(resolved_path);

+               resolved_path = NULL;

                goto fail_win32;
        }
                goto fail_win32;
        }

-       return resolved_path;
+       goto out;

 fail_win32:
 fail_win32:

-       win32_error(GetLastError());
-fail:
-       return NULL;
-}
-
-char *
-nl_langinfo(nl_item item)
-{
-       wimlib_assert(item == CODESET);
-       static char buf[64];
-       strcpy(buf, "Unknown");
-       return buf;
+       win32_error(err);
+       errno = -1;
+out:
+       return resolved_path;

 }
 
 /* rename() on Windows fails if the destination file exists.  And we need to
 }
 
 /* rename() on Windows fails if the destination file exists.  And we need to


@@ -1479,7 +1487,7 @@ win32_rename_replacement(const wchar_t *oldpath, const wchar_t *newpath)
                ERROR("MoveFileEx(): Can't rename \"%ls\" to \"%ls\"",
                      oldpath, newpath);
                win32_error(err);
                ERROR("MoveFileEx(): Can't rename \"%ls\" to \"%ls\"",
                      oldpath, newpath);
                win32_error(err);

-               errno = 0;
+               errno = -1;

                return -1;
        }
 }
                return -1;
        }
 }


@@ -1520,8 +1528,10 @@ fail_close_handle:
 fail:
        if (err == NO_ERROR)
                err = GetLastError();
 fail:
        if (err == NO_ERROR)
                err = GetLastError();

-       ERROR("Can't truncate %ls to %"PRIu64" bytes", path, size);
+       ERROR("Can't truncate \"%ls\" to %"PRIu64" bytes", path, size);

        win32_error(err);
        errno = -1;
        return -1;
 }
        win32_error(err);
        errno = -1;
        return -1;
 }

+
+#endif /* __WIN32__ */

diff --git a/src/win32.h b/src/win32.h
index 672f08a171d231cbe8fc6446ffd0be7828b5ca39..59cab518bd8deea1739c80db16cc7387f4a60083 100644 (file)
--- a/src/win32.h
+++ b/src/win32.h
@@ -63,9 +63,6 @@ typedef enum {
        CODESET
 } nl_item;
 
        CODESET
 } nl_item;
 

-extern char *
-nl_langinfo(nl_item item);
-

 extern int
 win32_rename_replacement(const tchar *oldpath, const tchar *newpath);
 
 extern int
 win32_rename_replacement(const tchar *oldpath, const tchar *newpath);