luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For MinGW make driver/main.c always create a path with a back slash 

The MinGW executable should be able to support a path with mixed
separators, but to make things consistent all the path in the main
driver program (driver/main.c) now always use a '\' or convert a
path to use '\' (e.g. getenv() returns a path with a '/').
This commit is contained in:
Cary R 2009-12-06 20:03:06 -08:00 committed by Stephen Williams
parent c7b0aef414
commit e9c653dfa3
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
driver/main.c
View File

@ -239,6 +239,23 @@ static FILE*fopen_safe(const char*path)
} }
#endif #endif
#ifdef __MINGW32__
/*
* The MinGW version of getenv() returns the path with a forward
* slash. This should be converted to a back slash to keep every
* thing in the code using a back slash. This function wraps the
* code for this in one place. The conversion can not be done
* directly on the getenv() result since it is const char*.
*/
static void convert_to_MS_path(char *path)
{
char *t;
for (t = path; *t; t++) {
if (*t == '/') *t = '\\';
}
}
#endif
static const char*my_tempfile(const char*str, FILE**fout) static const char*my_tempfile(const char*str, FILE**fout)
{ {
FILE*file; FILE*file;
@ -269,6 +286,9 @@ static const char*my_tempfile(const char*str, FILE**fout)
unsigned code = rand(); unsigned code = rand();
snprintf(pathbuf, sizeof pathbuf, "%s%c%s%04x", snprintf(pathbuf, sizeof pathbuf, "%s%c%s%04x",
tmpdir, sep, str, code); tmpdir, sep, str, code);
#ifdef __MINGW32__
convert_to_MS_path(pathbuf);
#endif
file = fopen_safe(pathbuf); file = fopen_safe(pathbuf);
retry -= 1; retry -= 1;
} }
@ -391,7 +411,7 @@ static int t_compile()
#endif #endif
/* Build the ivl command and pipe it to the preprocessor. */ /* Build the ivl command and pipe it to the preprocessor. */
snprintf(tmp, sizeof tmp, " | %s/ivl", base); snprintf(tmp, sizeof tmp, " | %s%civl", base, sep);
rc = strlen(tmp); rc = strlen(tmp);
cmd = realloc(cmd, ncmd+rc+1); cmd = realloc(cmd, ncmd+rc+1);
strcpy(cmd+ncmd, tmp); strcpy(cmd+ncmd, tmp);
@ -425,16 +445,6 @@ static int t_compile()
strcpy(cmd+ncmd, tmp); strcpy(cmd+ncmd, tmp);
ncmd += rc; ncmd += rc;
#ifdef __MINGW32__
{
char *t;
for (t = cmd+ncmd_start; *t; t++)
{
if (*t == '/') *t = '\\';
}
}
#endif
if (verbose_flag) if (verbose_flag)
printf("translate: %s\n", cmd); printf("translate: %s\n", cmd);