diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-05-24 13:04:05 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-05-24 13:04:05 (GMT) |
| commit | 61169e4e9e47dcc0b65f18c4c133fc31048a32a3 (patch) | |
| tree | 78e3d480d23fde2f020e978d95a594f200dc8ce0 /unix/tclUnixFCmd.c | |
| parent | 5eafb95b32b1132d639b964d75e65c95e288b265 (diff) | |
| parent | edb38932e8f071b1326515067d41bc060807dec2 (diff) | |
| download | tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.zip tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.tar.gz tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.tar.bz2 | |
merge 8.7
Diffstat (limited to 'unix/tclUnixFCmd.c')
| -rw-r--r-- | unix/tclUnixFCmd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 8d1de2c..548e96b 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -256,7 +256,7 @@ Realpath( #endif /* PURIFY */ #ifndef NO_REALPATH -#if defined(__APPLE__) && defined(TCL_THREADS) && \ +#if defined(__APPLE__) && TCL_THREADS && \ defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \ MAC_OS_X_VERSION_MIN_REQUIRED < 1030 /* @@ -965,7 +965,7 @@ TraverseUnixTree( #ifndef HAVE_FTS int numProcessed = 0; Tcl_DirEntry *dirEntPtr; - Tcl_Dir *dirPtr; + TclDIR *dirPtr; #else const char *paths[2] = {NULL, NULL}; FTS *fts = NULL; @@ -2302,7 +2302,8 @@ winPathFromObj( } static const int attributeArray[] = { - 0x20, 0, 2, 0, 0, 1, 4}; + 0x20, 0, 2, 0, 0, 1, 4 +}; /* *---------------------------------------------------------------------- @@ -2339,8 +2340,8 @@ GetUnixFileAttributes( return TCL_ERROR; } - *attributePtrPtr = Tcl_NewIntObj((fileAttributes&attributeArray[objIndex])!=0); - + *attributePtrPtr = Tcl_NewIntObj( + (fileAttributes & attributeArray[objIndex]) != 0); return TCL_OK; } @@ -2397,7 +2398,7 @@ SetUnixFileAttributes( return TCL_ERROR; } - ckfree(winPath); + ckfree(winPath); return TCL_OK; } #elif defined(HAVE_CHFLAGS) && defined(UF_IMMUTABLE) @@ -2439,8 +2440,7 @@ GetUnixFileAttributes( return TCL_ERROR; } - *attributePtrPtr = Tcl_NewBooleanObj(statBuf.st_flags&UF_IMMUTABLE); - + *attributePtrPtr = Tcl_NewBooleanObj(statBuf.st_flags & UF_IMMUTABLE); return TCL_OK; } |