global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 12:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace dir separator in symlinks

Browse Source 
It seems quite a few windows utilities cannot handle '../' in symlinks, so
we replace every / with a \.

While at it, replace make_backslash_path with a thread-safe version.

Signed-off-by: Thorvald Natvig <slicer@users.sourceforge.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Thorvald Natvig
2009-10-26 23:39:31 +01:00
committed by Johannes Schindelin
parent cd4896c3b6
commit ccc5cdf764
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compat/mingw.c
View File

@@ -1213,9 +1213,8 @@ sig_handler_t mingw_signal(int sig, sig_handler_t handler)
return old;
}
static const char *make_backslash_path(const char *path)
static const char *make_backslash_path(const char *path, char *buf)
{
static char buf[PATH_MAX + 1];
char *c;
if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX)
@@ -1230,7 +1229,8 @@ static const char *make_backslash_path(const char *path)
void mingw_open_html(const char *unixpath)
{
const char *htmlpath = make_backslash_path(unixpath);
char buf[PATH_MAX + 1];
const char *htmlpath = make_backslash_path(unixpath, buf);
printf("Launching default browser to display HTML ...\n");
ShellExecute(NULL, "open", htmlpath, NULL, "\\", 0);
}
@@ -1260,6 +1260,8 @@ int symlink(const char *oldpath, const char *newpath)
{
typedef BOOL WINAPI (*symlink_fn)(const char*, const char*, DWORD);
static symlink_fn create_symbolic_link = NULL;
char buf[PATH_MAX + 1];
if (!create_symbolic_link) {
create_symbolic_link = (symlink_fn) GetProcAddress(
GetModuleHandle("kernel32.dll"), "CreateSymbolicLinkA");
@@ -1271,7 +1273,7 @@ int symlink(const char *oldpath, const char *newpath)
return -1;
}
if (!create_symbolic_link(newpath, oldpath, 0)) {
if (!create_symbolic_link(newpath, make_backslash_path(oldpath, buf), 0)) {
errno = err_win_to_posix(GetLastError());
return -1;
}
@@ -1295,7 +1297,11 @@ int readlink(const char *path, char *buf, size_t bufsiz)
if (b->ReparseTag == IO_REPARSE_TAG_SYMLINK) {
int len = b->SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(wchar_t);
int offset = b->SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(wchar_t);
int i;
snprintf(buf, bufsiz, "%*ls", len, & b->SymbolicLinkReparseBuffer.PathBuffer[offset]);
for (i = 0; i < len; i++)
if (buf[i] == '\\')
buf[i] = '/';
CloseHandle(handle);
return len;
}