diff options
| author | stanton <stanton> | 1999-03-10 05:52:45 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-03-10 05:52:45 (GMT) |
| commit | 0b4be24161f5971f3181adec27a32becf7cb8870 (patch) | |
| tree | 92131df26a09a5f7b28f854fb7c0a62ba26cb8ac /generic/tclFileName.c | |
| parent | a5bface5b6607af37870fc5f5ee5019f6d5fb3f1 (diff) | |
| download | tcl-0b4be24161f5971f3181adec27a32becf7cb8870.zip tcl-0b4be24161f5971f3181adec27a32becf7cb8870.tar.gz tcl-0b4be24161f5971f3181adec27a32becf7cb8870.tar.bz2 | |
Merged stubs changes into mainline for 8.0
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index f76192f..7be9c0e 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclFileName.c,v 1.4 1999/02/03 19:12:26 stanton Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.5 1999/03/10 05:52:48 stanton Exp $ */ #include "tclInt.h" @@ -1084,17 +1084,13 @@ DoTildeSubst(interp, user, resultPtr) return NULL; } Tcl_JoinPath(1, &dir, resultPtr); - } else { - - /* lint, TclGetuserHome() always NULL under windows. */ - if (TclGetUserHome(user, resultPtr) == NULL) { - if (interp) { - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, "user \"", user, "\" doesn't exist", - (char *) NULL); - } - return NULL; + } else if (TclGetUserHome(user, resultPtr) == NULL) { + if (interp) { + Tcl_ResetResult(interp); + Tcl_AppendResult(interp, "user \"", user, "\" doesn't exist", + (char *) NULL); } + return NULL; } return resultPtr->string; } |