summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2015-09-22 23:10:56 -0400
committerEdward Thomson <ethomson@edwardthomson.com>2015-09-22 23:10:56 -0400
commit92a47824d8d4dc62728ebb4ec1962ec03ae92d85 (patch)
tree3599fe29aa6e51bd7a70955f3a8fc8ed12b2759f
parentaebddbe7367a16c8ac6cc5638ae46ba8063d2213 (diff)
downloadlibgit2-92a47824d8d4dc62728ebb4ec1962ec03ae92d85.tar.gz
win32: propogate filename too long errors
-rw-r--r--src/win32/path_w32.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/win32/path_w32.c b/src/win32/path_w32.c
index 118e8bcc5..40b95c33b 100644
--- a/src/win32/path_w32.c
+++ b/src/win32/path_w32.c
@@ -198,13 +198,13 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
/* See if this is an absolute path (beginning with a drive letter) */
if (path__is_absolute(src)) {
if (git__utf8_to_16(dest, MAX_PATH, src) < 0)
- return -1;
+ goto on_error;
}
/* File-prefixed NT-style paths beginning with \\?\ */
else if (path__is_nt_namespace(src)) {
/* Skip the NT prefix, the destination already contains it */
if (git__utf8_to_16(dest, MAX_PATH, src + PATH__NT_NAMESPACE_LEN) < 0)
- return -1;
+ goto on_error;
}
/* UNC paths */
else if (path__is_unc(src)) {
@@ -213,36 +213,43 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
/* Skip the leading "\\" */
if (git__utf8_to_16(dest, MAX_PATH - 2, src + 2) < 0)
- return -1;
+ goto on_error;
}
/* Absolute paths omitting the drive letter */
else if (src[0] == '\\' || src[0] == '/') {
if (path__cwd(dest, MAX_PATH) < 0)
- return -1;
+ goto on_error;
if (!path__is_absolute(dest)) {
errno = ENOENT;
- return -1;
+ goto on_error;
}
/* Skip the drive letter specification ("C:") */
if (git__utf8_to_16(dest + 2, MAX_PATH - 2, src) < 0)
- return -1;
+ goto on_error;
}
/* Relative paths */
else {
int cwd_len;
if ((cwd_len = git_win32_path__cwd(dest, MAX_PATH)) < 0)
- return -1;
+ goto on_error;
dest[cwd_len++] = L'\\';
if (git__utf8_to_16(dest + cwd_len, MAX_PATH - cwd_len, src) < 0)
- return -1;
+ goto on_error;
}
return git_win32_path_canonicalize(out);
+
+on_error:
+ /* set windows error code so we can use its error message */
+ if (errno == ENAMETOOLONG)
+ SetLastError(ERROR_FILENAME_EXCED_RANGE);
+
+ return -1;
}
int git_win32_path_to_utf8(git_win32_utf8_path dest, const wchar_t *src)