diff options
| author | stanton <stanton> | 1998-09-30 23:01:11 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-09-30 23:01:11 (GMT) |
| commit | 11d2da71fa217e8d2c56b5fc93d2af09bd5a5078 (patch) | |
| tree | d157232c1dca5b82e6e35b68f1b7fa686edf7d88 /unix | |
| parent | 10495954778ec63311c9f718313832e3fc6c8033 (diff) | |
| download | tcl-11d2da71fa217e8d2c56b5fc93d2af09bd5a5078.zip tcl-11d2da71fa217e8d2c56b5fc93d2af09bd5a5078.tar.gz tcl-11d2da71fa217e8d2c56b5fc93d2af09bd5a5078.tar.bz2 | |
* tclUnixPort.h: removed circular macro definitions for access/stat
* tclUnixInit.c: lint
* tclUnixFile.c: cleaned up bad merges
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixFile.c | 8 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 11 |
3 files changed, 6 insertions, 17 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 0208f35..fb984c1 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.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: tclUnixFile.c,v 1.1.2.3 1998/09/28 20:24:20 stanton Exp $ + * RCS: @(#) $Id: tclUnixFile.c,v 1.1.2.4 1998/09/30 23:01:11 stanton Exp $ */ #include "tclInt.h" @@ -221,7 +221,7 @@ TclpMatchFiles(interp, separators, dirPtr, pattern, tail) dirName = Tcl_DStringValue(dirPtr); } - if ((TclStat(dirName, &statBuf) != 0) /* INTL: Native. */ + if ((TclpStat(dirName, &statBuf) != 0) /* INTL: UTF-8. */ || !S_ISDIR(statBuf.st_mode)) { return TCL_OK; } @@ -315,9 +315,7 @@ TclpMatchFiles(interp, separators, dirPtr, pattern, tail) Tcl_DStringAppend(dirPtr, utf, -1); if (tail == NULL) { Tcl_AppendElement(interp, Tcl_DStringValue(dirPtr)); - } else if ((TclStat(Tcl_DStringValue(dirPtr), &statBuf) == 0) - Tcl_AppendElement(interp, Tcl_DStringValue(dirPtr)); - } else if ((TclStat(Tcl_DStringValue(dirPtr), &statBuf) == 0) + } else if ((TclpStat(Tcl_DStringValue(dirPtr), &statBuf) == 0) && S_ISDIR(statBuf.st_mode)) { Tcl_DStringAppend(dirPtr, "/", 1); result = TclDoGlob(interp, separators, dirPtr, tail); diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 5dac2b6..9297227 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixInit.c,v 1.1.2.2 1998/09/24 23:59:45 stanton Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.1.2.3 1998/09/30 23:01:16 stanton Exp $ */ #include "tclInt.h" @@ -456,7 +456,7 @@ TclpSetVariables(interp) */ if ((strchr(name.release, '.') != NULL) - || !isdigit(name.version[0])) { /* INTL: digit */ + || !isdigit(UCHAR(name.version[0]))) { /* INTL: digit */ Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release, TCL_GLOBAL_ONLY); } else { diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index f1948dc..2dbdd35 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -19,7 +19,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixPort.h,v 1.1.2.3 1998/09/30 20:47:51 stanton Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.1.2.4 1998/09/30 23:01:20 stanton Exp $ */ #ifndef _TCLUNIXPORT @@ -280,15 +280,6 @@ EXTERN int gettimeofday _ANSI_ARGS_((struct timeval *tp, #endif /* - * On UNIX, there's no platform specific implementation of "TclpStat(...)" - * or "TclpAccess(...)". Simply call "stat(...)' and "access(...)" - * respectively. - */ - -#define TclpStat stat -#define TclpAccess access - -/* * On systems without symbolic links (i.e. S_IFLNK isn't defined) * define "lstat" to use "stat" instead. */ |