Commit 3bcef5ac authored by Russ Cox's avatar Russ Cox

gc: fix islocalname on windows

Fixes #732.

R=ken2
CC=golang-dev
https://golang.org/cl/956050
parent 646301a7
...@@ -1242,3 +1242,9 @@ int duintxx(Sym *s, int off, uint64 v, int wid); ...@@ -1242,3 +1242,9 @@ int duintxx(Sym *s, int off, uint64 v, int wid);
void genembedtramp(Type*, Type*, Sym*); void genembedtramp(Type*, Type*, Sym*);
int gen_as_init(Node*); int gen_as_init(Node*);
enum {
SysUnix = 1<<1,
SysWindows = 1<<2,
};
int systemtype(int);
...@@ -24,6 +24,7 @@ main(int argc, char *argv[]) ...@@ -24,6 +24,7 @@ main(int argc, char *argv[])
{ {
int i, c; int i, c;
NodeList *l; NodeList *l;
char *p;
localpkg = mkpkg(strlit("")); localpkg = mkpkg(strlit(""));
localpkg->prefix = "\"\""; localpkg->prefix = "\"\"";
...@@ -80,6 +81,13 @@ main(int argc, char *argv[]) ...@@ -80,6 +81,13 @@ main(int argc, char *argv[])
if(getwd(pathname, 999) == 0) if(getwd(pathname, 999) == 0)
strcpy(pathname, "/???"); strcpy(pathname, "/???");
if(systemtype(SysWindows)) {
// Canonicalize path by converting \ to / (Windows accepts both).
for(p=pathname; *p; p++)
if(*p == '\\')
*p = '/';
}
fmtinstall('O', Oconv); // node opcodes fmtinstall('O', Oconv); // node opcodes
fmtinstall('E', Econv); // etype opcodes fmtinstall('E', Econv); // etype opcodes
fmtinstall('J', Jconv); // all the node flags fmtinstall('J', Jconv); // all the node flags
...@@ -239,8 +247,11 @@ addidir(char* dir) ...@@ -239,8 +247,11 @@ addidir(char* dir)
int int
islocalname(Strlit *name) islocalname(Strlit *name)
{ {
if(name->len >= 1 && name->s[0] == '/') if(systemtype(SysUnix) && name->len >= 1 && name->s[0] == '/')
return 1; return 1;
if(systemtype(SysWindows) && name->len >= 3 &&
isalpha(name->s[0]) && name->s[1] == ':' && name->s[2] == '/')
return 1;
if(name->len >= 2 && strncmp(name->s, "./", 2) == 0) if(name->len >= 2 && strncmp(name->s, "./", 2) == 0)
return 1; return 1;
if(name->len >= 3 && strncmp(name->s, "../", 3) == 0) if(name->len >= 3 && strncmp(name->s, "../", 3) == 0)
...@@ -1662,3 +1673,13 @@ mkpackage(char* pkgname) ...@@ -1662,3 +1673,13 @@ mkpackage(char* pkgname)
outfile = smprint("%s.%c", namebuf, thechar); outfile = smprint("%s.%c", namebuf, thechar);
} }
} }
int
systemtype(int sys)
{
#ifdef __MINGW32__
return sys&SysWindows;
#else
return sys&SysUnix;
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment