diff options
author | dgp <dgp@users.sourceforge.net> | 2018-05-08 15:22:49 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2018-05-08 15:22:49 (GMT) |
commit | 56af8c1770e00895a8862d52563e3942dfb3b2df (patch) | |
tree | 22622d4db3cbabf4dc2c39d34b27aa053f7bdbf3 /unix/tclUnixFCmd.c | |
parent | 97b08c9a24dd40233c45c0637be7370972ec7b0c (diff) | |
parent | 7f26fedbccc3c9f7908417c0abe1cceae115a237 (diff) | |
download | tcl-56af8c1770e00895a8862d52563e3942dfb3b2df.zip tcl-56af8c1770e00895a8862d52563e3942dfb3b2df.tar.gz tcl-56af8c1770e00895a8862d52563e3942dfb3b2df.tar.bz2 |
merge 8.7
Diffstat (limited to 'unix/tclUnixFCmd.c')
-rw-r--r-- | unix/tclUnixFCmd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index e156f77..7250e87 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -375,7 +375,7 @@ DoRenameFile( if ((Realpath((char *) src, srcPath) != NULL) /* INTL: Native. */ && (Realpath((char *) dst, dstPath) != NULL) /* INTL: Native */ && (strncmp(srcPath, dstPath, strlen(srcPath)) != 0)) { - dirPtr = opendir(dst); /* INTL: Native. */ + dirPtr = TclOSopendir(dst); /* INTL: Native. */ if (dirPtr != NULL) { while (1) { dirEntPtr = TclOSreaddir(dirPtr); /* INTL: Native. */ @@ -385,11 +385,11 @@ DoRenameFile( if ((strcmp(dirEntPtr->d_name, ".") != 0) && (strcmp(dirEntPtr->d_name, "..") != 0)) { errno = EEXIST; - closedir(dirPtr); + TclOSclosedir(dirPtr); return TCL_ERROR; } } - closedir(dirPtr); + TclOSclosedir(dirPtr); } } errno = EINVAL; @@ -990,7 +990,7 @@ TraverseUnixTree( errorPtr); } #ifndef HAVE_FTS - dirPtr = opendir(source); /* INTL: Native. */ + dirPtr = TclOSopendir(source); /* INTL: Native. */ if (dirPtr == NULL) { /* * Can't read directory @@ -1002,7 +1002,7 @@ TraverseUnixTree( result = traverseProc(sourcePtr, targetPtr, &statBuf, DOTREE_PRED, errorPtr); if (result != TCL_OK) { - closedir(dirPtr); + TclOSclosedir(dirPtr); return result; } @@ -1052,11 +1052,11 @@ TraverseUnixTree( * NULL-return that may a symptom of a buggy readdir. */ - rewinddir(dirPtr); + TclOSrewinddir(dirPtr); numProcessed = 0; } } - closedir(dirPtr); + TclOSclosedir(dirPtr); /* * Strip off the trailing slash we added |