clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 06:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

gc: fix islocalname on windows

Browse Source 
Fixes #732.

R=ken2
CC=golang-dev
https://golang.org/cl/956050
This commit is contained in:
Russ Cox 2010-04-27 13:52:43 -07:00
parent 646301a766
commit 3bcef5ac30
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/gc/go.h
View File

@ -1242,3 +1242,9 @@ int duintxx(Sym *s, int off, uint64 v, int wid);
void genembedtramp(Type*, Type*, Sym*);
int gen_as_init(Node*);
enum {
SysUnix = 1<<1,
SysWindows = 1<<2,
};
int systemtype(int);

23
src/cmd/gc/lex.c
View File

@ -24,6 +24,7 @@ main(int argc, char *argv[])
{
int i, c;
NodeList *l;
char *p;
localpkg = mkpkg(strlit(""));
localpkg->prefix = "\"\"";
@ -80,6 +81,13 @@ main(int argc, char *argv[])
if(getwd(pathname, 999) == 0)
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('E', Econv); // etype opcodes
fmtinstall('J', Jconv); // all the node flags
@ -239,8 +247,11 @@ addidir(char* dir)
int
islocalname(Strlit *name)
{
if(name->len >= 1 && name->s[0] == '/')
if(systemtype(SysUnix) && name->len >= 1 && name->s[0] == '/')
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)
return 1;
if(name->len >= 3 && strncmp(name->s, "../", 3) == 0)
@ -1662,3 +1673,13 @@ mkpackage(char* pkgname)
outfile = smprint("%s.%c", namebuf, thechar);
}
}
int
systemtype(int sys)
{
#ifdef __MINGW32__
return sys&SysWindows;
#else
return sys&SysUnix;
#endif
}