diff options
| author | hypnotoad <yoda@etoyoc.com> | 2017-10-16 20:35:30 (GMT) |
|---|---|---|
| committer | hypnotoad <yoda@etoyoc.com> | 2017-10-16 20:35:30 (GMT) |
| commit | fc947a1ad4fac39cd6d4ed5c8afaa55c871c6f96 (patch) | |
| tree | 067831143d62896be2b2c299c5e1d85bc303fc08 /win | |
| parent | 54bc992b814ebb022b6cdb9798e2effdc14a2550 (diff) | |
| parent | 8a910c1a53dec36b9d3dd4b7a378017251c3ef56 (diff) | |
| download | tcl-fc947a1ad4fac39cd6d4ed5c8afaa55c871c6f96.zip tcl-fc947a1ad4fac39cd6d4ed5c8afaa55c871c6f96.tar.gz tcl-fc947a1ad4fac39cd6d4ed5c8afaa55c871c6f96.tar.bz2 | |
Pulling changes from trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/nmakehlp.c | 10 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 4 | ||||
| -rw-r--r-- | win/tclWinLoad.c | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/win/nmakehlp.c b/win/nmakehlp.c index 22b7b06..0439d1c 100644 --- a/win/nmakehlp.c +++ b/win/nmakehlp.c @@ -74,6 +74,7 @@ main( char msg[300]; DWORD dwWritten; int chars; + char *s; /* * Make sure children (cl.exe and link.exe) are kept quiet. @@ -153,8 +154,13 @@ main( &dwWritten, NULL); return 0; } - printf("%s\n", GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0')); - return 0; + s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0'); + if (s && *s) { + printf("%s\n", s); + return 0; + } else + return 1; /* Version not found. Return non-0 exit code */ + case 'Q': if (argc != 3) { chars = snprintf(msg, sizeof(msg) - 1, diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 01af950..319ecf9 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -1611,13 +1611,11 @@ ConvertFileNameFormat( for (i = 0; i < pathc; i++) { Tcl_Obj *elt; char *pathv; - size_t pathLen; Tcl_ListObjIndex(NULL, splitPath, i, &elt); pathv = TclGetString(elt); - pathLen = elt->length; - if ((pathv[0] == '/') || ((pathLen == 3) && (pathv[1] == ':')) + if ((pathv[0] == '/') || ((elt->length == 3) && (pathv[1] == ':')) || (strcmp(pathv, ".") == 0) || (strcmp(pathv, "..") == 0)) { /* * Handle "/", "//machine/export", "c:/", "." or ".." by just diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c index 3ad6328..27eb8f3 100644 --- a/win/tclWinLoad.c +++ b/win/tclWinLoad.c @@ -85,7 +85,7 @@ TclpDlopen( Tcl_DString ds; - /* + /* * Remember the first error on load attempt to be used if the * second load attempt below also fails. */ |