global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Turn backslashes in path specifiers into forward-slashes.

Browse Source
This commit is contained in:
Johannes Sixt
2007-04-12 15:00:53 +02:00
parent 00a4ff4f3f
commit 5cebf63737
1 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
setup.c
View File

@@ -1,8 +1,15 @@
#include "cache.h"
#ifdef __MINGW32__
static inline int is_dir_sep(char c) { return c == '/' || c == '\\'; }
#else
static inline int is_dir_sep(char c) { return c == '/'; }
#endif
const char *prefix_path(const char *prefix, int len, const char *path)
{
const char *orig = path;
int do_pfx;
for (;;) {
char c;
if (*path != '.')
@@ -14,7 +21,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
break;
}
/* "./" */
if (c == '/') {
if (is_dir_sep(c)) {
path += 2;
continue;
}
@@ -23,7 +30,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
c = path[2];
if (!c)
path += 2;
else if (c == '/')
else if (is_dir_sep(c))
path += 3;
else
break;
@@ -33,15 +40,31 @@ const char *prefix_path(const char *prefix, int len, const char *path)
if (!len)
die("'%s' is outside repository", orig);
len--;
} while (len && prefix[len-1] != '/');
} while (len && !is_dir_sep(prefix[len-1]));
continue;
}
if (len) {
do_pfx = len;
#ifdef __MINGW32__
/* we want to convert '\' in path to '/' (prefix already has '/') */
{
const char *p = path;
while (!do_pfx && *p) {
do_pfx = *p++ == '\\';
}
}
#endif
if (do_pfx) {
int speclen = strlen(path);
char *n = xmalloc(speclen + len + 1);
char *p;
memcpy(n, prefix, len);
memcpy(n + len, path, speclen+1);
#ifdef __MINGW32__
for (p = n + len; *p; p++)
if (*p == '\\')
*p = '/';
#endif
path = n;
}
return path;
@@ -55,10 +78,24 @@ const char *prefix_path(const char *prefix, int len, const char *path)
const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
{
static char path[PATH_MAX];
#ifndef __MINGW32__
if (!pfx || !*pfx || arg[0] == '/')
return arg;
#else
char *p;
/* don't add prefix to absolute paths */
const int is_absolute =
is_dir_sep(arg[0]) ||
(arg[0] && arg[1] == ':' && is_dir_sep(arg[2]));
if (is_absolute)
pfx_len = 0;
else
#endif
memcpy(path, pfx, pfx_len);
strcpy(path + pfx_len, arg);
for (p = path + pfx_len; *p; p++)
if (*p == '\\')
*p = '/';
return path;
}