summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixFile.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-05-14 08:26:06 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-05-14 08:26:06 (GMT)
commit37d4aa08d3f40d35c2672d95935f59454f849b84 (patch)
tree678acacedb8ab68f7b04f677fbf2462d10599208 /unix/tclUnixFile.c
parentd3a24bbdf1e4e8f56b6c6c15e9886ed6320b890f (diff)
downloadtcl-37d4aa08d3f40d35c2672d95935f59454f849b84.zip
tcl-37d4aa08d3f40d35c2672d95935f59454f849b84.tar.gz
tcl-37d4aa08d3f40d35c2672d95935f59454f849b84.tar.bz2
Backout the "dullest commit ever" (not my words ....). It breaks the build.
JN: Many of those changes are actually good, but there are too many changes to be able to search for a bug somewhere. Feel free to re-apply, after assuring it's really only whitespace changes. (my advise: do that after 9.0b2)
Diffstat (limited to 'unix/tclUnixFile.c')
-rw-r--r--unix/tclUnixFile.c60
1 files changed, 23 insertions, 37 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 95a0d9e..444c73f 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -155,11 +155,9 @@ TclpFindExecutable(
#endif
{
encoding = Tcl_GetEncoding(NULL, NULL);
- Tcl_ExternalToUtfDStringEx(NULL, encoding, name, TCL_INDEX_NONE,
- TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
+ Tcl_ExternalToUtfDStringEx(NULL, encoding, name, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
TclSetObjNameOfExecutable(
- Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE),
- encoding);
+ Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), encoding);
Tcl_DStringFree(&utfName);
goto done;
}
@@ -194,11 +192,10 @@ TclpFindExecutable(
Tcl_DStringFree(&nameString);
encoding = Tcl_GetEncoding(NULL, NULL);
- Tcl_ExternalToUtfDStringEx(NULL, encoding, Tcl_DStringValue(&buffer),
- TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
+ Tcl_ExternalToUtfDStringEx(NULL, encoding, Tcl_DStringValue(&buffer), TCL_INDEX_NONE,
+ TCL_ENCODING_PROFILE_TCL8, &utfName, NULL);
TclSetObjNameOfExecutable(
- Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE),
- encoding);
+ Tcl_NewStringObj(Tcl_DStringValue(&utfName), TCL_INDEX_NONE), encoding);
Tcl_DStringFree(&utfName);
done:
@@ -311,8 +308,7 @@ TclpMatchInDirectory(
* Now open the directory for reading and iterate over the contents.
*/
- if (Tcl_UtfToExternalDStringEx(interp, NULL, dirName, TCL_INDEX_NONE,
- 0, &ds, NULL) != TCL_OK) {
+ if (Tcl_UtfToExternalDStringEx(interp, NULL, dirName, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&dsOrig);
Tcl_DStringFree(&ds);
Tcl_DecrRefCount(fileNamePtr);
@@ -328,7 +324,7 @@ TclpMatchInDirectory(
return TCL_OK;
}
- d = TclOSopendir(native); /* INTL: Native. */
+ d = TclOSopendir(native); /* INTL: Native. */
if (d == NULL) {
Tcl_DStringFree(&ds);
if (interp != NULL) {
@@ -382,8 +378,8 @@ TclpMatchInDirectory(
* and pattern. If so, add the file to the result.
*/
- if (Tcl_ExternalToUtfDStringEx(interp, NULL, entryPtr->d_name,
- TCL_INDEX_NONE, 0, &utfDs, NULL) != TCL_OK) {
+ if (Tcl_ExternalToUtfDStringEx(interp, NULL, entryPtr->d_name, TCL_INDEX_NONE,
+ 0, &utfDs, NULL) != TCL_OK) {
matchResult = -1;
break;
}
@@ -393,8 +389,7 @@ TclpMatchInDirectory(
if (types != NULL) {
Tcl_DStringSetLength(&ds, nativeDirLen);
- native = Tcl_DStringAppend(&ds, entryPtr->d_name,
- TCL_INDEX_NONE);
+ native = Tcl_DStringAppend(&ds, entryPtr->d_name, TCL_INDEX_NONE);
matchResult = NativeMatchType(interp, native,
entryPtr->d_name, types);
typeOk = (matchResult == 1);
@@ -443,10 +438,10 @@ TclpMatchInDirectory(
static int
NativeMatchType(
- Tcl_Interp *interp, /* Interpreter to receive errors. */
- const char *nativeEntry, /* Native path to check. */
- const char *nativeName, /* Native filename to check. */
- Tcl_GlobTypeData *types) /* Type description to match against. */
+ Tcl_Interp *interp, /* Interpreter to receive errors. */
+ const char *nativeEntry, /* Native path to check. */
+ const char *nativeName, /* Native filename to check. */
+ Tcl_GlobTypeData *types) /* Type description to match against. */
{
Tcl_StatBuf buf;
@@ -616,8 +611,7 @@ TclpGetUserHome(
Tcl_DString ds;
const char *native;
- if (Tcl_UtfToExternalDStringEx(NULL, NULL, name, TCL_INDEX_NONE, 0, &ds,
- NULL) != TCL_OK) {
+ if (Tcl_UtfToExternalDStringEx(NULL, NULL, name, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
return NULL;
}
@@ -629,8 +623,7 @@ TclpGetUserHome(
if (pwPtr == NULL) {
return NULL;
}
- if (Tcl_ExternalToUtfDStringEx(NULL, NULL, pwPtr->pw_dir, TCL_INDEX_NONE,
- 0, bufferPtr, NULL) != TCL_OK) {
+ if (Tcl_ExternalToUtfDStringEx(NULL, NULL, pwPtr->pw_dir, TCL_INDEX_NONE, 0, bufferPtr, NULL) != TCL_OK) {
return NULL;
} else {
return Tcl_DStringValue(bufferPtr);
@@ -812,8 +805,7 @@ TclpGetCwd(
}
return NULL;
}
- if (Tcl_ExternalToUtfDStringEx(interp, NULL, buffer, TCL_INDEX_NONE, 0,
- bufferPtr, NULL) != TCL_OK) {
+ if (Tcl_ExternalToUtfDStringEx(interp, NULL, buffer, TCL_INDEX_NONE, 0, bufferPtr, NULL) != TCL_OK) {
return NULL;
}
return Tcl_DStringValue(bufferPtr);
@@ -851,8 +843,7 @@ TclpReadlink(
const char *native;
Tcl_DString ds;
- if (Tcl_UtfToExternalDStringEx(NULL, NULL, path, TCL_INDEX_NONE, 0, &ds,
- NULL) != TCL_OK) {
+ if (Tcl_UtfToExternalDStringEx(NULL, NULL, path, TCL_INDEX_NONE, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
return NULL;
}
@@ -864,8 +855,7 @@ TclpReadlink(
return NULL;
}
- if (Tcl_ExternalToUtfDStringEx(NULL, NULL, link, length, 0, linkPtr,
- NULL) == TCL_OK) {
+ if (Tcl_ExternalToUtfDStringEx(NULL, NULL, link, length, 0, linkPtr, NULL) == TCL_OK) {
return Tcl_DStringValue(linkPtr);
}
#endif /* !DJGPP */
@@ -1000,8 +990,7 @@ TclpObjLink(
return NULL;
}
target = TclGetStringFromObj(transPtr, &length);
- if (Tcl_UtfToExternalDStringEx(NULL, NULL, target, length, 0, &ds,
- NULL) != TCL_OK) {
+ if (Tcl_UtfToExternalDStringEx(NULL, NULL, target, length, 0, &ds, NULL) != TCL_OK) {
Tcl_DStringFree(&ds);
return NULL;
}
@@ -1035,14 +1024,12 @@ TclpObjLink(
}
Tcl_DecrRefCount(transPtr);
- length = readlink((const char *)Tcl_FSGetNativePath(pathPtr), link,
- sizeof(link));
+ length = readlink((const char *)Tcl_FSGetNativePath(pathPtr), link, sizeof(link));
if (length < 0) {
return NULL;
}
- if (Tcl_ExternalToUtfDStringEx(NULL, NULL, link, (size_t)length, 0,
- &ds, NULL) != TCL_OK) {
+ if (Tcl_ExternalToUtfDStringEx(NULL, NULL, link, (size_t)length, 0, &ds, NULL) != TCL_OK) {
return NULL;
}
linkPtr = Tcl_DStringToObj(&ds);
@@ -1109,8 +1096,7 @@ TclpNativeToNormalized(
{
Tcl_DString ds;
- Tcl_ExternalToUtfDStringEx(NULL, NULL, (const char *) clientData,
- TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
+ Tcl_ExternalToUtfDStringEx(NULL, NULL, (const char *) clientData, TCL_INDEX_NONE, TCL_ENCODING_PROFILE_TCL8, &ds, NULL);
return Tcl_DStringToObj(&ds);
}