diff options
| author | das <das> | 2001-11-23 01:26:52 (GMT) |
|---|---|---|
| committer | das <das> | 2001-11-23 01:26:52 (GMT) |
| commit | 5bf5a16c3a6e83b4297123ae905297ac723f7f81 (patch) | |
| tree | 725fbc934e8cfe62511b965b22c0069a3e157e67 /mac/tclMacFile.c | |
| parent | 8ddfd6bbdf803f32768cf447560be0af0e97e08b (diff) | |
| download | tcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.zip tcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.tar.gz tcl-5bf5a16c3a6e83b4297123ae905297ac723f7f81.tar.bz2 | |
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435658)
see ChangeLog for details
Diffstat (limited to 'mac/tclMacFile.c')
| -rw-r--r-- | mac/tclMacFile.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mac/tclMacFile.c b/mac/tclMacFile.c index cb85d59..0084da5 100644 --- a/mac/tclMacFile.c +++ b/mac/tclMacFile.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacFile.c,v 1.12 2001/08/30 08:53:15 vincentdarley Exp $ + * RCS: @(#) $Id: tclMacFile.c,v 1.13 2001/11/23 01:27:32 das Exp $ */ /* @@ -177,7 +177,7 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types) */ Tcl_DStringFree(&dsOrig); Tcl_DStringAppend(&dsOrig, ":", 1); - Tcl_DStringAppend(&dsOrig, fileName2, -1); + Tcl_DStringAppend(&dsOrig, Tcl_GetString(fileNamePtr), -1); baseLength = Tcl_DStringLength(&dsOrig); Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&dsOrig), @@ -234,9 +234,9 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types) &fileString); if (Tcl_StringMatch(Tcl_DStringValue(&fileString), pattern)) { int typeOk = 1; + Tcl_Obj *tempName; Tcl_DStringSetLength(&dsOrig, baseLength); Tcl_DStringAppend(&dsOrig, Tcl_DStringValue(&fileString), -1); - Tcl_Obj *tempName; fname = Tcl_DStringValue(&dsOrig); fnameLen = Tcl_DStringLength(&dsOrig); @@ -282,13 +282,10 @@ TclpMatchInDirectory(interp, resultPtr, pathPtr, pattern, types) } } if (typeOk == 1 && types->type != 0) { - if (types->perm == 0) { - /* We haven't yet done a stat on the file */ if (TclpObjStat(tempName, &buf) != 0) { /* Posix error occurred */ typeOk = 0; } - } if (typeOk) { /* * In order bcdpfls as in 'find -t' |