rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/vector.c

@@ -36,7 +36,7 @@ GIT_INLINE(int) resize_vector(git_vector *v, size_t new_size)
 		return 0;
 
 	new_contents = git__reallocarray(v->contents, new_size, sizeof(void *));
-	GIT_ERROR_CHECK_ALLOC(new_contents);
+	GITERR_CHECK_ALLOC(new_contents);
 
 	v->_alloc_size = new_size;
 	v->contents = new_contents;
@@ -65,9 +65,9 @@ int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp)
 
 	if (src->length) {
 		size_t bytes;
-		GIT_ERROR_CHECK_ALLOC_MULTIPLY(&bytes, src->length, sizeof(void *));
+		GITERR_CHECK_ALLOC_MULTIPLY(&bytes, src->length, sizeof(void *));
 		v->contents = git__malloc(bytes);
-		GIT_ERROR_CHECK_ALLOC(v->contents);
+		GITERR_CHECK_ALLOC(v->contents);
 		v->_alloc_size = src->length;
 		memcpy(v->contents, src->contents, bytes);
 	}
@@ -342,7 +342,7 @@ int git_vector_insert_null(git_vector *v, size_t idx, size_t insert_len)
 
 	assert(insert_len > 0 && idx <= v->length);
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&new_length, v->length, insert_len);
+	GITERR_CHECK_ALLOC_ADD(&new_length, v->length, insert_len);
 
 	if (new_length > v->_alloc_size && resize_vector(v, new_length) < 0)
 		return -1;

data/vendor/libgit2/src/win32/dir.c

@@ -31,7 +31,7 @@ git__DIR *git__opendir(const char *dir)
 	new->h = FindFirstFileW(filter_w, &new->f);
 
 	if (new->h == INVALID_HANDLE_VALUE) {
-		git_error_set(GIT_ERROR_OS, "could not open directory '%s'", dir);
+		giterr_set(GITERR_OS, "could not open directory '%s'", dir);
 		git__free(new);
 		return NULL;
 	}
@@ -56,7 +56,7 @@ int git__readdir_ext(
 	else if (!FindNextFileW(d->h, &d->f)) {
 		if (GetLastError() == ERROR_NO_MORE_FILES)
 			return 0;
-		git_error_set(GIT_ERROR_OS, "could not read from directory '%s'", d->dir);
+		giterr_set(GITERR_OS, "could not read from directory '%s'", d->dir);
 		return -1;
 	}
 
@@ -101,7 +101,7 @@ void git__rewinddir(git__DIR *d)
 	d->h = FindFirstFileW(filter_w, &d->f);
 
 	if (d->h == INVALID_HANDLE_VALUE)
-		git_error_set(GIT_ERROR_OS, "could not open directory '%s'", d->dir);
+		giterr_set(GITERR_OS, "could not open directory '%s'", d->dir);
 	else
 		d->first = 1;
 }

data/vendor/libgit2/src/win32/findfile.c

@@ -39,7 +39,7 @@ static int win32_path_to_8(git_buf *dest, const wchar_t *src)
 	git_win32_utf8_path utf8_path;
 
 	if (git_win32_path_to_utf8(utf8_path, src) < 0) {
-		git_error_set(GIT_ERROR_OS, "unable to convert path to UTF-8");
+		giterr_set(GITERR_OS, "unable to convert path to UTF-8");
 		return -1;
 	}
 
@@ -158,7 +158,7 @@ static int win32_find_existing_dirs(
 		}
 	}
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return (git_buf_oom(out) ? -1 : 0);
 }
@@ -185,7 +185,7 @@ int git_win32__find_system_dirs(git_buf *out, const wchar_t *subdir)
 			&buf, HKEY_LOCAL_MACHINE, REG_MSYSGIT_INSTALL, subdir) && buf.size)
 		git_buf_join(out, GIT_PATH_LIST_SEPARATOR, out->ptr, buf.ptr);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return (git_buf_oom(out) ? -1 : 0);
 }

data/vendor/libgit2/src/win32/map.c

@@ -50,7 +50,7 @@ int git__mmap_alignment(size_t *page_size)
 	return 0;
 }
 
-int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset)
+int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
 {
 	HANDLE fh = (HANDLE)_get_osfhandle(fd);
 	DWORD alignment = get_allocation_granularity();
@@ -58,8 +58,8 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset
 	DWORD view_prot = 0;
 	DWORD off_low = 0;
 	DWORD off_hi = 0;
-	off64_t page_start;
-	off64_t page_offset;
+	git_off_t page_start;
+	git_off_t page_offset;
 
 	GIT_MMAP_VALIDATE(out, len, prot, flags);
 
@@ -69,7 +69,7 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset
 
 	if (fh == INVALID_HANDLE_VALUE) {
 		errno = EBADF;
-		git_error_set(GIT_ERROR_OS, "failed to mmap. Invalid handle value");
+		giterr_set(GITERR_OS, "failed to mmap. Invalid handle value");
 		return -1;
 	}
 
@@ -88,22 +88,24 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset
 
 	if (page_offset != 0) { /* offset must be multiple of the allocation granularity */
 		errno = EINVAL;
-		git_error_set(GIT_ERROR_OS, "failed to mmap. Offset must be multiple of allocation granularity");
+		giterr_set(GITERR_OS, "failed to mmap. Offset must be multiple of allocation granularity");
 		return -1;
 	}
 
 	out->fmh = CreateFileMapping(fh, NULL, fmap_prot, 0, 0, NULL);
 	if (!out->fmh || out->fmh == INVALID_HANDLE_VALUE) {
-		git_error_set(GIT_ERROR_OS, "failed to mmap. Invalid handle value");
+		giterr_set(GITERR_OS, "failed to mmap. Invalid handle value");
 		out->fmh = NULL;
 		return -1;
 	}
 
+	assert(sizeof(git_off_t) == 8);
+
 	off_low = (DWORD)(page_start);
 	off_hi = (DWORD)(page_start >> 32);
 	out->data = MapViewOfFile(out->fmh, view_prot, off_hi, off_low, len);
 	if (!out->data) {
-		git_error_set(GIT_ERROR_OS, "failed to mmap. No data written");
+		giterr_set(GITERR_OS, "failed to mmap. No data written");
 		CloseHandle(out->fmh);
 		out->fmh = NULL;
 		return -1;
@@ -121,7 +123,7 @@ int p_munmap(git_map *map)
 
 	if (map->data) {
 		if (!UnmapViewOfFile(map->data)) {
-			git_error_set(GIT_ERROR_OS, "failed to munmap. Could not unmap view of file");
+			giterr_set(GITERR_OS, "failed to munmap. Could not unmap view of file");
 			error = -1;
 		}
 		map->data = NULL;
@@ -129,7 +131,7 @@ int p_munmap(git_map *map)
 
 	if (map->fmh) {
 		if (!CloseHandle(map->fmh)) {
-			git_error_set(GIT_ERROR_OS, "failed to munmap. Could not close handle");
+			giterr_set(GITERR_OS, "failed to munmap. Could not close handle");
 			error = -1;
 		}
 		map->fmh = NULL;

data/vendor/libgit2/src/win32/msvc-compat.h

@@ -12,12 +12,6 @@
 typedef unsigned short mode_t;
 typedef SSIZE_T ssize_t;
 
-#ifdef _WIN64
-# define SSIZE_MAX _I64_MAX
-#else
-# define SSIZE_MAX LONG_MAX
-#endif
-
 #define strcasecmp(s1, s2) _stricmp(s1, s2)
 #define strncasecmp(s1, s2, c) _strnicmp(s1, s2, c)
 

data/vendor/libgit2/src/win32/path_w32.c

@@ -140,24 +140,14 @@ int git_win32_path_canonicalize(git_win32_path path)
 
 	*to = L'\0';
 
-	if ((to - path) > INT_MAX) {
-		SetLastError(ERROR_FILENAME_EXCED_RANGE);
-		return -1;
-	}
-
-	return (int)(to - path);
+	return (to - path);
 }
 
 int git_win32_path__cwd(wchar_t *out, size_t len)
 {
 	int cwd_len;
 
-	if (len > INT_MAX) {
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-
-	if ((cwd_len = path__cwd(out, (int)len)) < 0)
+	if ((cwd_len = path__cwd(out, len)) < 0)
 		return -1;
 
 	/* UNC paths */
@@ -230,7 +220,7 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
 			goto on_error;
 		}
 
-		/* Skip the drive letter specification ("C:") */
+		/* Skip the drive letter specification ("C:") */	
 		if (git__utf8_to_16(dest + 2, MAX_PATH - 2, src) < 0)
 			goto on_error;
 	}
@@ -325,7 +315,7 @@ static bool path_is_volume(wchar_t *target, size_t target_len)
 }
 
 /* On success, returns the length, in characters, of the path stored in dest.
- * On failure, returns a negative value. */
+* On failure, returns a negative value. */
 int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path)
 {
 	BYTE buf[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
@@ -370,16 +360,16 @@ int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path)
 
 	if (path_is_volume(target, target_len)) {
 		/* This path is a reparse point that represents another volume mounted
-		 * at this location, it is not a symbolic link our input was canonical.
-		 */
+		* at this location, it is not a symbolic link our input was canonical.
+		*/
 		errno = EINVAL;
 		error = -1;
 	} else if (target_len) {
-		/* The path may need to have a namespace prefix removed. */
-		target_len = git_win32_path_remove_namespace(target, target_len);
+		/* The path may need to have a prefix removed. */
+		target_len = git_win32__canonicalize_path(target, target_len);
 
 		/* Need one additional character in the target buffer
-		 * for the terminating NULL. */
+		* for the terminating NULL. */
 		if (GIT_WIN_PATH_UTF16 > target_len) {
 			wcscpy(dest, target);
 			error = (int)target_len;
@@ -390,97 +380,3 @@ on_error:
 	CloseHandle(handle);
 	return error;
 }
-
-/**
- * Removes any trailing backslashes from a path, except in the case of a drive
- * letter path (C:\, D:\, etc.). This function cannot fail.
- *
- * @param path The path which should be trimmed.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32_path_trim_end(wchar_t *str, size_t len)
-{
-	while (1) {
-		if (!len || str[len - 1] != L'\\')
-			break;
-
-		/*
-		 * Don't trim backslashes from drive letter paths, which
-		 * are 3 characters long and of the form C:\, D:\, etc.
-		 */
-		if (len == 3 && git_win32__isalpha(str[0]) && str[1] == ':')
-			break;
-
-		len--;
-	}
-
-	str[len] = L'\0';
-
-	return len;
-}
-
-/**
- * Removes any of the following namespace prefixes from a path,
- * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
- *
- * @param path The path which should be converted.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32_path_remove_namespace(wchar_t *str, size_t len)
-{
-	static const wchar_t dosdevices_namespace[] = L"\\\?\?\\";
-	static const wchar_t nt_namespace[] = L"\\\\?\\";
-	static const wchar_t unc_namespace_remainder[] = L"UNC\\";
-	static const wchar_t unc_prefix[] = L"\\\\";
-
-	const wchar_t *prefix = NULL, *remainder = NULL;
-	size_t prefix_len = 0, remainder_len = 0;
-
-	/* "\??\" -- DOS Devices prefix */
-	if (len >= CONST_STRLEN(dosdevices_namespace) &&
-		!wcsncmp(str, dosdevices_namespace, CONST_STRLEN(dosdevices_namespace))) {
-		remainder = str + CONST_STRLEN(dosdevices_namespace);
-		remainder_len = len - CONST_STRLEN(dosdevices_namespace);
-	}
-	/* "\\?\" -- NT namespace prefix */
-	else if (len >= CONST_STRLEN(nt_namespace) &&
-		!wcsncmp(str, nt_namespace, CONST_STRLEN(nt_namespace))) {
-		remainder = str + CONST_STRLEN(nt_namespace);
-		remainder_len = len - CONST_STRLEN(nt_namespace);
-	}
-
-	/* "\??\UNC\", "\\?\UNC\" -- UNC prefix */
-	if (remainder_len >= CONST_STRLEN(unc_namespace_remainder) &&
-		!wcsncmp(remainder, unc_namespace_remainder, CONST_STRLEN(unc_namespace_remainder))) {
-
-		/*
-		 * The proper Win32 path for a UNC share has "\\" at beginning of it
-		 * and looks like "\\server\share\<folderStructure>".  So remove the
-		 * UNC namespace and add a prefix of "\\" in its place.
-		 */
-		remainder += CONST_STRLEN(unc_namespace_remainder);
-		remainder_len -= CONST_STRLEN(unc_namespace_remainder);
-
-		prefix = unc_prefix;
-		prefix_len = CONST_STRLEN(unc_prefix);
-	}
-
-	if (remainder) {
-		/*
-		 * Sanity check that the new string isn't longer than the old one.
-		 * (This could only happen due to programmer error introducing a
-		 * prefix longer than the namespace it replaces.)
-		 */
-		assert(len >= remainder_len + prefix_len);
-
-		if (prefix)
-			memmove(str, prefix, prefix_len * sizeof(wchar_t));
-
-		memmove(str + prefix_len, remainder, remainder_len * sizeof(wchar_t));
-
-		len = remainder_len + prefix_len;
-		str[len] = L'\0';
-	}
-
-	return git_win32_path_trim_end(str, len);
-}

data/vendor/libgit2/src/win32/path_w32.h

@@ -8,8 +8,37 @@
 #define INCLUDE_win32_path_w32_h__
 
 #include "common.h"
+
 #include "vector.h"
 
+/*
+ * Provides a large enough buffer to support Windows paths:  MAX_PATH is
+ * 260, corresponding to a maximum path length of 259 characters plus a
+ * NULL terminator.  Prefixing with "\\?\" adds 4 characters, but if the
+ * original was a UNC path, then we turn "\\server\share" into
+ * "\\?\UNC\server\share".  So we replace the first two characters with
+ * 8 characters, a net gain of 6, so the maximum length is MAX_PATH+6.
+ */
+#define GIT_WIN_PATH_UTF16		MAX_PATH+6
+
+/* Maximum size of a UTF-8 Win32 path.  We remove the "\\?\" or "\\?\UNC\"
+ * prefixes for presentation, bringing us back to 259 (non-NULL)
+ * characters.  UTF-8 does have 4-byte sequences, but they are encoded in
+ * UTF-16 using surrogate pairs, which takes up the space of two characters.
+ * Two characters in the range U+0800 -> U+FFFF take up more space in UTF-8
+ * (6 bytes) than one surrogate pair (4 bytes).
+ */
+#define GIT_WIN_PATH_UTF8		(259 * 3 + 1)
+
+/*
+ * The length of a Windows "shortname", for 8.3 compatibility.
+ */
+#define GIT_WIN_PATH_SHORTNAME  13
+
+/* Win32 path types */
+typedef wchar_t git_win32_path[GIT_WIN_PATH_UTF16];
+typedef char git_win32_utf8_path[GIT_WIN_PATH_UTF8];
+
 /**
  * Create a Win32 path (in UCS-2 format) from a UTF-8 string.
  *
@@ -54,22 +83,4 @@ extern char *git_win32_path_8dot3_name(const char *path);
 
 extern int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path);
 
-/**
- * Removes any trailing backslashes from a path, except in the case of a drive
- * letter path (C:\, D:\, etc.). This function cannot fail.
- *
- * @param path The path which should be trimmed.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32_path_trim_end(wchar_t *str, size_t len);
-
-/**
- * Removes any of the following namespace prefixes from a path,
- * if found: "\??\", "\\?\", "\\?\UNC\". This function cannot fail.
- *
- * @param path The path which should be converted.
- * @return The length of the modified string (<= the input length)
- */
-size_t git_win32_path_remove_namespace(wchar_t *str, size_t len);
-
 #endif

data/vendor/libgit2/src/win32/posix.h

@@ -47,7 +47,7 @@ extern int p_chdir(const char* path);
 extern int p_chmod(const char* path, mode_t mode);
 extern int p_rmdir(const char* path);
 extern int p_access(const char* path, mode_t mode);
-extern int p_ftruncate(int fd, off64_t size);
+extern int p_ftruncate(int fd, git_off_t size);
 
 /* p_lstat is almost but not quite POSIX correct.  Specifically, the use of
  * ENOTDIR is wrong, in that it does not mean precisely that a non-directory
@@ -60,4 +60,7 @@ extern int p_lstat_posixly(const char *filename, struct stat *buf);
 extern struct tm * p_localtime_r(const time_t *timer, struct tm *result);
 extern struct tm * p_gmtime_r(const time_t *timer, struct tm *result);
 
+/* Use the bundled regcomp */
+#define p_regcomp regcomp
+
 #endif

data/vendor/libgit2/src/win32/posix_w32.c

@@ -8,7 +8,7 @@
 #include "common.h"
 
 #include "../posix.h"
-#include "../futils.h"
+#include "../fileops.h"
 #include "path.h"
 #include "path_w32.h"
 #include "utf-conv.h"
@@ -29,20 +29,15 @@
 #define IO_REPARSE_TAG_SYMLINK (0xA000000CL)
 #endif
 
-#ifndef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
-# define SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE 0x02
-#endif
-
-#ifndef SYMBOLIC_LINK_FLAG_DIRECTORY
-# define SYMBOLIC_LINK_FLAG_DIRECTORY 0x01
-#endif
-
 /* Allowable mode bits on Win32.  Using mode bits that are not supported on
  * Win32 (eg S_IRWXU) is generally ignored, but Wine warns loudly about it
  * so we simply remove them.
  */
 #define WIN32_MODE_MASK (_S_IREAD | _S_IWRITE)
 
+/* GetFinalPathNameByHandleW signature */
+typedef DWORD(WINAPI *PFGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD);
+
 unsigned long git_win32__createfile_sharemode =
  FILE_SHARE_READ | FILE_SHARE_WRITE;
 int git_win32__retries = 10;
@@ -210,7 +205,7 @@ on_error:
  * We now take a "git_off_t" rather than "long" because
  * files may be longer than 2Gb.
  */
-int p_ftruncate(int fd, off64_t size)
+int p_ftruncate(int fd, git_off_t size)
 {
 	if (size < 0) {
 		errno = EINVAL;
@@ -251,25 +246,9 @@ int p_link(const char *old, const char *new)
 
 GIT_INLINE(int) unlink_once(const wchar_t *path)
 {
-	DWORD error;
-
 	if (DeleteFileW(path))
 		return 0;
 
-	if ((error = GetLastError()) == ERROR_ACCESS_DENIED) {
-		WIN32_FILE_ATTRIBUTE_DATA fdata;
-		if (!GetFileAttributesExW(path, GetFileExInfoStandard, &fdata) ||
-		    !(fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ||
-		    !(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-			goto out;
-
-		if (RemoveDirectoryW(path))
-			return 0;
-	}
-
-out:
-	SetLastError(error);
-
 	if (last_error_retryable())
 		return GIT_RETRY;
 
@@ -375,7 +354,7 @@ static int do_lstat(const char *path, struct stat *buf, bool posixly_correct)
 	if ((len = git_win32_path_from_utf8(path_w, path)) < 0)
 		return -1;
 
-	git_win32_path_trim_end(path_w, len);
+	git_win32__path_trim_end(path_w, len);
 
 	return lstat_w(path_w, buf, posixly_correct);
 }
@@ -414,43 +393,12 @@ int p_readlink(const char *path, char *buf, size_t bufsiz)
 	return (int)bufsiz;
 }
 
-static bool target_is_dir(const char *target, const char *path)
-{
-	git_buf resolved = GIT_BUF_INIT;
-	git_win32_path resolved_w;
-	bool isdir = true;
-
-	if (git_path_is_absolute(target))
-		git_win32_path_from_utf8(resolved_w, target);
-	else if (git_path_dirname_r(&resolved, path) < 0 ||
-		 git_path_apply_relative(&resolved, target) < 0 ||
-		 git_win32_path_from_utf8(resolved_w, resolved.ptr) < 0)
-		goto out;
-
-	isdir = GetFileAttributesW(resolved_w) & FILE_ATTRIBUTE_DIRECTORY;
-
-out:
-	git_buf_dispose(&resolved);
-	return isdir;
-}
-
-int p_symlink(const char *target, const char *path)
+int p_symlink(const char *old, const char *new)
 {
-	git_win32_path target_w, path_w;
-	DWORD dwFlags;
-
-	if (git_win32_path_from_utf8(path_w, path) < 0 ||
-	    git__utf8_to_16(target_w, MAX_PATH, target) < 0)
-		return -1;
-
-	dwFlags = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
-	if (target_is_dir(target, path))
-		dwFlags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
-
-	if (!CreateSymbolicLinkW(path_w, target_w, dwFlags))
-		return -1;
-
-	return 0;
+	/* Real symlinks on NTFS require admin privileges. Until this changes,
+	 * libgit2 just creates a text file with the link target in the contents.
+	 */
+	return git_futils_fake_symlink(old, new);
 }
 
 struct open_opts {
@@ -576,7 +524,7 @@ int p_utimes(const char *path, const struct p_timeval times[2])
 		attrs_new = attrs_orig & ~FILE_ATTRIBUTE_READONLY;
 
 		if (!SetFileAttributesW(wpath, attrs_new)) {
-			git_error_set(GIT_ERROR_OS, "failed to set attributes");
+			giterr_set(GITERR_OS, "failed to set attributes");
 			return -1;
 		}
 	}
@@ -650,13 +598,40 @@ int p_getcwd(char *buffer_out, size_t size)
 	return 0;
 }
 
+/*
+ * Returns the address of the GetFinalPathNameByHandleW function.
+ * This function is available on Windows Vista and higher.
+ */
+static PFGetFinalPathNameByHandleW get_fpnbyhandle(void)
+{
+	static PFGetFinalPathNameByHandleW pFunc = NULL;
+	PFGetFinalPathNameByHandleW toReturn = pFunc;
+
+	if (!toReturn) {
+		HMODULE hModule = GetModuleHandleW(L"kernel32");
+
+		if (hModule)
+			toReturn = (PFGetFinalPathNameByHandleW)GetProcAddress(hModule, "GetFinalPathNameByHandleW");
+
+		pFunc = toReturn;
+	}
+
+	assert(toReturn);
+
+	return toReturn;
+}
+
 static int getfinalpath_w(
 	git_win32_path dest,
 	const wchar_t *path)
 {
+	PFGetFinalPathNameByHandleW pgfp = get_fpnbyhandle();
 	HANDLE hFile;
 	DWORD dwChars;
 
+	if (!pgfp)
+		return -1;
+
 	/* Use FILE_FLAG_BACKUP_SEMANTICS so we can open a directory. Do not
 	* specify FILE_FLAG_OPEN_REPARSE_POINT; we want to open a handle to the
 	* target of the link. */
@@ -667,14 +642,14 @@ static int getfinalpath_w(
 		return -1;
 
 	/* Call GetFinalPathNameByHandle */
-	dwChars = GetFinalPathNameByHandleW(hFile, dest, GIT_WIN_PATH_UTF16, FILE_NAME_NORMALIZED);
+	dwChars = pgfp(hFile, dest, GIT_WIN_PATH_UTF16, FILE_NAME_NORMALIZED);
 	CloseHandle(hFile);
 
 	if (!dwChars || dwChars >= GIT_WIN_PATH_UTF16)
 		return -1;
 
-	/* The path may be delivered to us with a namespace prefix; remove */
-	return (int)git_win32_path_remove_namespace(dest, dwChars);
+	/* The path may be delivered to us with a prefix; canonicalize */
+	return (int)git_win32__canonicalize_path(dest, dwChars);
 }
 
 static int follow_and_lstat_link(git_win32_path path, struct stat* buf)
@@ -857,7 +832,7 @@ int p_mkstemp(char *tmp_path)
 		return -1;
 #endif
 
-	return p_open(tmp_path, O_RDWR | O_CREAT | O_EXCL, 0744); /* -V536 */
+	return p_open(tmp_path, O_RDWR | O_CREAT | O_EXCL, 0744); //-V536
 }
 
 int p_access(const char* path, mode_t mode)
@@ -896,7 +871,7 @@ int p_rename(const char *from, const char *to)
 int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags)
 {
 	if ((size_t)((int)length) != length)
-		return -1; /* git_error_set will be done by caller */
+		return -1; /* giterr_set will be done by caller */
 
 	return recv(socket, buffer, (int)length, flags);
 }
@@ -904,7 +879,7 @@ int p_recv(GIT_SOCKET socket, void *buffer, size_t length, int flags)
 int p_send(GIT_SOCKET socket, const void *buffer, size_t length, int flags)
 {
 	if ((size_t)((int)length) != length)
-		return -1; /* git_error_set will be done by caller */
+		return -1; /* giterr_set will be done by caller */
 
 	return send(socket, buffer, (int)length, flags);
 }