Merge trunk

6 files changed, 85 insertions, 85 deletions

diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index f36407d..12a10e6 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -1324,7 +1324,7 @@ DdeObjCmd(
 	"-async", "-binary", NULL
     };
     enum DdeExecOptions {
-        DDE_EXEC_ASYNC, DDE_EXEC_BINARY
+	DDE_EXEC_ASYNC, DDE_EXEC_BINARY
     };
     static const char *const ddeEvalOptions[] = {
 	"-async", NULL
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index 5a83425..b878cd4 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.c
@@ -1711,8 +1711,8 @@ ConvertFileNameFormat(
 	    Tcl_WCharToUtfDString(nativeName, TCL_INDEX_NONE, &dsTemp);
 	    Tcl_DStringFree(&ds);
 
-            tempPath = Tcl_DStringToObj(&dsTemp);
-            Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
+	    tempPath = Tcl_DStringToObj(&dsTemp);
+	    Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath);
 	    FindClose(handle);
 	}
     }
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 17f4898..1eb8b22 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -1438,23 +1438,23 @@ TclpGetUserHome(
     if (domain == NULL) {
 	const char *ptr;
 
-        /*
-         * Treat the current user as a special case because the general case
-         * below does not properly retrieve the path. The NetUserGetInfo
-         * call returns an empty path and the code defaults to the user's
-         * name in the profiles directory. On modern Windows systems, this
-         * is generally wrong as when the account is a Microsoft account,
-         * for example abcdefghi@outlook.com, the directory name is
-         * abcde and not abcdefghi.
-         *
-         * Note we could have just used env(USERPROFILE) here but
-         * the intent is to retrieve (as on Unix) the system's view
-         * of the home irrespective of environment settings of HOME
-         * and USERPROFILE.
-         *
-         * Fixing this for the general user needs more investigating but
-         * at least for the current user we can use a direct call.
-         */
+	/*
+	 * Treat the current user as a special case because the general case
+	 * below does not properly retrieve the path. The NetUserGetInfo
+	 * call returns an empty path and the code defaults to the user's
+	 * name in the profiles directory. On modern Windows systems, this
+	 * is generally wrong as when the account is a Microsoft account,
+	 * for example abcdefghi@outlook.com, the directory name is
+	 * abcde and not abcdefghi.
+	 *
+	 * Note we could have just used env(USERPROFILE) here but
+	 * the intent is to retrieve (as on Unix) the system's view
+	 * of the home irrespective of environment settings of HOME
+	 * and USERPROFILE.
+	 *
+	 * Fixing this for the general user needs more investigating but
+	 * at least for the current user we can use a direct call.
+	 */
 	ptr = TclpGetUserName(&ds);
 	if (ptr != NULL && strcasecmp(name, ptr) == 0) {
 	    HANDLE hProcess;
@@ -2054,27 +2054,27 @@ NativeStat(
 	BY_HANDLE_FILE_INFORMATION data;
 
 	if (GetFileInformationByHandle(fileHandle,&data) != TRUE) {
-            fileType = GetFileType(fileHandle);
-            CloseHandle(fileHandle);
-            if (fileType != FILE_TYPE_CHAR && fileType != FILE_TYPE_DISK) {
-                Tcl_SetErrno(ENOENT);
-                return -1;
-            }
-
-            /*
+	    fileType = GetFileType(fileHandle);
+	    CloseHandle(fileHandle);
+	    if (fileType != FILE_TYPE_CHAR && fileType != FILE_TYPE_DISK) {
+		Tcl_SetErrno(ENOENT);
+		return -1;
+	    }
+
+	    /*
 	     * Mock up the expected structure
 	     */
 
-            memset(&data, 0, sizeof(data));
-            statPtr->st_atime = 0;
-            statPtr->st_mtime = 0;
-            statPtr->st_ctime = 0;
-        } else {
-            CloseHandle(fileHandle);
-            statPtr->st_atime = ToCTime(data.ftLastAccessTime);
-            statPtr->st_mtime = ToCTime(data.ftLastWriteTime);
-            statPtr->st_ctime = ToCTime(data.ftCreationTime);
-        }
+	    memset(&data, 0, sizeof(data));
+	    statPtr->st_atime = 0;
+	    statPtr->st_mtime = 0;
+	    statPtr->st_ctime = 0;
+	} else {
+	    CloseHandle(fileHandle);
+	    statPtr->st_atime = ToCTime(data.ftLastAccessTime);
+	    statPtr->st_mtime = ToCTime(data.ftLastWriteTime);
+	    statPtr->st_ctime = ToCTime(data.ftCreationTime);
+	}
 	attr = data.dwFileAttributes;
 	statPtr->st_size = ((long long) data.nFileSizeLow) |
 		(((long long) data.nFileSizeHigh) << 32);
@@ -2134,11 +2134,11 @@ NativeStat(
     dev = NativeDev(nativePath);
     mode = NativeStatMode(attr, checkLinks, NativeIsExec(nativePath));
     if (fileType == FILE_TYPE_CHAR) {
-        mode &= ~S_IFMT;
-        mode |= S_IFCHR;
+	mode &= ~S_IFMT;
+	mode |= S_IFCHR;
     } else if (fileType == FILE_TYPE_DISK) {
-        mode &= ~S_IFMT;
-        mode |= S_IFBLK;
+	mode &= ~S_IFMT;
+	mode |= S_IFBLK;
     }
 
     statPtr->st_dev	= (dev_t) dev;
@@ -3280,12 +3280,12 @@ TclWinFileOwned(
     if (GetNamedSecurityInfoW((LPWSTR) native, SE_FILE_OBJECT,
 	    OWNER_SECURITY_INFORMATION, &ownerSid, NULL, NULL, NULL,
 	    &secd) != ERROR_SUCCESS) {
-        /*
+	/*
 	 * Either not a file, or we do not have access to it in which case we
 	 * are in all likelihood not the owner.
 	 */
 
-        return 0;
+	return 0;
     }
 
     /*
@@ -3296,19 +3296,19 @@ TclWinFileOwned(
      */
 
     if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) {
-        /*
+	/*
 	 * Find out how big the buffer needs to be.
 	 */
 
-        bufsz = 0;
-        GetTokenInformation(token, TokenUser, NULL, 0, &bufsz);
-        if (bufsz) {
-            buf = (LPBYTE)Tcl_Alloc(bufsz);
-            if (GetTokenInformation(token, TokenUser, buf, bufsz, &bufsz)) {
-                owned = EqualSid(ownerSid, ((PTOKEN_USER) buf)->User.Sid);
-            }
-        }
-        CloseHandle(token);
+	bufsz = 0;
+	GetTokenInformation(token, TokenUser, NULL, 0, &bufsz);
+	if (bufsz) {
+	    buf = (LPBYTE)Tcl_Alloc(bufsz);
+	    if (GetTokenInformation(token, TokenUser, buf, bufsz, &bufsz)) {
+		owned = EqualSid(ownerSid, ((PTOKEN_USER) buf)->User.Sid);
+	    }
+	}
+	CloseHandle(token);
     }
 
     /*
@@ -3316,10 +3316,10 @@ TclWinFileOwned(
      */
 
     if (secd) {
-        LocalFree(secd);            /* Also frees ownerSid */
+	LocalFree(secd);            /* Also frees ownerSid */
     }
     if (buf) {
-        Tcl_Free(buf);
+	Tcl_Free(buf);
     }
 
     return (owned != 0);        /* Convert non-0 to 1 */
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 4234ceb..5c8ca91 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -516,14 +516,14 @@ TclpSetVariables(
 	    Tcl_SetVar2(interp, "env", "HOME", Tcl_DStringValue(&ds),
 		    TCL_GLOBAL_ONLY);
 	} else {
-            /* None of HOME, HOMEDRIVE, HOMEPATH exists. Try USERPROFILE */
-            ptr = Tcl_GetVar2(interp, "env", "USERPROFILE", TCL_GLOBAL_ONLY);
-            if (ptr != NULL && ptr[0]) {
-                Tcl_SetVar2(interp, "env", "HOME", ptr, TCL_GLOBAL_ONLY);
-            } else {
-                /* Last resort */
-                Tcl_SetVar2(interp, "env", "HOME", "c:\\", TCL_GLOBAL_ONLY);
-            }
+	    /* None of HOME, HOMEDRIVE, HOMEPATH exists. Try USERPROFILE */
+	    ptr = Tcl_GetVar2(interp, "env", "USERPROFILE", TCL_GLOBAL_ONLY);
+	    if (ptr != NULL && ptr[0]) {
+		Tcl_SetVar2(interp, "env", "HOME", ptr, TCL_GLOBAL_ONLY);
+	    } else {
+		/* Last resort */
+		Tcl_SetVar2(interp, "env", "HOME", "c:\\", TCL_GLOBAL_ONLY);
+	    }
 	}
     }
 
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
index 1cc7ae1..b0c4c3b 100644
--- a/win/tclWinLoad.c
+++ b/win/tclWinLoad.c
@@ -90,11 +90,11 @@ TclpDlopen(
 
 	Tcl_DString ds;
 
-        /*
-         * Remember the first error on load attempt to be used if the
-         * second load attempt below also fails.
-        */
-        firstError = (nativeName == NULL) ?
+	/*
+	 * Remember the first error on load attempt to be used if the
+	 * second load attempt below also fails.
+	*/
+	firstError = (nativeName == NULL) ?
 		ERROR_MOD_NOT_FOUND : GetLastError();
 
 	Tcl_DStringInit(&ds);
@@ -106,19 +106,19 @@ TclpDlopen(
 
     if (hInstance == NULL) {
 	DWORD lastError;
-        Tcl_Obj *errMsg;
-
-        /*
-         * We choose to only use the error from the second call if the first
-         * call failed due to the file not being found. Else stick to the
-         * first error for reporting purposes.
-         */
-        if (firstError == ERROR_MOD_NOT_FOUND ||
+	Tcl_Obj *errMsg;
+
+	/*
+	 * We choose to only use the error from the second call if the first
+	 * call failed due to the file not being found. Else stick to the
+	 * first error for reporting purposes.
+	 */
+	if (firstError == ERROR_MOD_NOT_FOUND ||
 		firstError == ERROR_DLL_NOT_FOUND) {
-            lastError = GetLastError();
-        } else {
-            lastError = firstError;
-        }
+	    lastError = GetLastError();
+	} else {
+	    lastError = firstError;
+	}
 
 	errMsg = Tcl_ObjPrintf("couldn't load library \"%s\": ",
 		TclGetString(pathPtr));
@@ -157,11 +157,11 @@ TclpDlopen(
 		Tcl_AppendToObj(errMsg, "the library initialization"
 			" routine failed", TCL_INDEX_NONE);
 		break;
-            case ERROR_BAD_EXE_FORMAT:
+	    case ERROR_BAD_EXE_FORMAT:
 		Tcl_SetErrorCode(interp, "WIN_LOAD", "BAD_EXE_FORMAT", (char *)NULL);
 		Tcl_AppendToObj(errMsg, "Bad exe format. Possibly a 32/64-bit mismatch.", TCL_INDEX_NONE);
-                break;
-            default:
+		break;
+	    default:
 		Tcl_WinConvertError(lastError);
 		Tcl_AppendToObj(errMsg, Tcl_PosixError(interp), TCL_INDEX_NONE);
 	    }
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index eeb06f8..7b083a5 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -2762,7 +2762,7 @@ Tcl_PidObjCmd(
     Tcl_Obj *resultPtr;
 
     if (objc > 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?channelId?");
+	Tcl_WrongNumArgs(interp, 1, objv, "?channel?");
 	return TCL_ERROR;
     }
     if (objc == 1) {