proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-05 10:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32: propogate filename too long errors

Browse Source
This commit is contained in:
Edward Thomson 2015-09-22 23:10:56 -04:00
parent aebddbe736
commit 92a47824d8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/win32/path_w32.c
View File

@ -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) */ /* See if this is an absolute path (beginning with a drive letter) */
if (path__is_absolute(src)) { if (path__is_absolute(src)) {
if (git__utf8_to_16(dest, MAX_PATH, src) < 0) if (git__utf8_to_16(dest, MAX_PATH, src) < 0)
return -1; goto on_error;
} }
/* File-prefixed NT-style paths beginning with \\?\ */ /* File-prefixed NT-style paths beginning with \\?\ */
else if (path__is_nt_namespace(src)) { else if (path__is_nt_namespace(src)) {
/* Skip the NT prefix, the destination already contains it */ /* Skip the NT prefix, the destination already contains it */
if (git__utf8_to_16(dest, MAX_PATH, src + PATH__NT_NAMESPACE_LEN) < 0) if (git__utf8_to_16(dest, MAX_PATH, src + PATH__NT_NAMESPACE_LEN) < 0)
return -1; goto on_error;
} }
/* UNC paths */ /* UNC paths */
else if (path__is_unc(src)) { 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 "\\" */ /* Skip the leading "\\" */
if (git__utf8_to_16(dest, MAX_PATH - 2, src + 2) < 0) if (git__utf8_to_16(dest, MAX_PATH - 2, src + 2) < 0)
return -1; goto on_error;
} }
/* Absolute paths omitting the drive letter */ /* Absolute paths omitting the drive letter */
else if (src[0] == '\\' || src[0] == '/') { else if (src[0] == '\\' || src[0] == '/') {
if (path__cwd(dest, MAX_PATH) < 0) if (path__cwd(dest, MAX_PATH) < 0)
return -1; goto on_error;
if (!path__is_absolute(dest)) { if (!path__is_absolute(dest)) {
errno = ENOENT; errno = ENOENT;
return -1; 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) if (git__utf8_to_16(dest + 2, MAX_PATH - 2, src) < 0)
return -1; goto on_error;
} }
/* Relative paths */ /* Relative paths */
else { else {
int cwd_len; int cwd_len;
if ((cwd_len = git_win32_path__cwd(dest, MAX_PATH)) < 0) if ((cwd_len = git_win32_path__cwd(dest, MAX_PATH)) < 0)
return -1; goto on_error;
dest[cwd_len++] = L'\\'; dest[cwd_len++] = L'\\';
if (git__utf8_to_16(dest + cwd_len, MAX_PATH - cwd_len, src) < 0) 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); 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) int git_win32_path_to_utf8(git_win32_utf8_path dest, const wchar_t *src)