cpython-lru_cache-weakref: PC/getpathp.c annotate

annotate PC/getpathp.c @ 70817:dd775b1561ba

Fix markup.

author	Georg Brandl <georg@python.org>
date	Tue, 14 Jun 2011 21:09:55 +0200
parents	62b61abd02b8
children	b534b56379cb

rev	line source
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	1
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Return the initial module search path. */
8895 9b4bc3b8b9d4 This file's previous log message is bogus. The real change is that Guido van Rossum <guido@python.org> parents: 8892 diff changeset	3 /* Used by DOS, OS/2, Windows 3.1, Windows 95/98, Windows NT. */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	4
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	5 /* ----------------------------------------------------------------
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	6 PATH RULES FOR WINDOWS:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	7 This describes how sys.path is formed on Windows. It describes the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	8 functionality, not the implementation (ie, the order in which these
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	9 are actually fetched is different)
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	10
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	11 * Python always adds an empty entry at the start, which corresponds
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	12 to the current directory.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	13
35276 4adbd331d335 Fix all wrong instances of "it's". Georg Brandl <georg@python.org> parents: 33017 diff changeset	14 * If the PYTHONPATH env. var. exists, its entries are added next.
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	15
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	16 * We look in the registry for "application paths" - that is, sub-keys
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	17 under the main PythonPath registry key. These are added next (the
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	18 order of sub-key processing is undefined).
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	19 HKEY_CURRENT_USER is searched and added first.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	20 HKEY_LOCAL_MACHINE is searched and added next.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	21 (Note that all known installers only use HKLM, so HKCU is typically
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	22 empty)
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	23
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	24 * We attempt to locate the "Python Home" - if the PYTHONHOME env var
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	25 is set, we believe it. Otherwise, we use the path of our host .EXE's
12775 8e2b35d386aa Patch from M.-A. Lemburg: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12116 diff changeset	26 to try and locate our "landmark" (lib\\os.py) and deduce our home.
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	27 - If we DO have a Python Home: The relevant sub-directories (Lib,
47135 cce1b243c11d Tkinter, step 5: remove lib-tk subdirectory and update all places where it was mentioned. Georg Brandl <georg@python.org> parents: 46318 diff changeset	28 plat-win, etc) are based on the Python Home
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	29 - If we DO NOT have a Python Home, the core Python Path is
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	30 loaded from the registry. This is the main PythonPath key,
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	31 and both HKLM and HKCU are combined to form the path)
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	32
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	33 * Iff - we can not locate the Python Home, have not had a PYTHONPATH
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	34 specified, and can't locate any Registry entries (ie, we have _nothing_
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	35 we can assume is a good path), a default path with relative entries is
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	36 used (eg. .\Lib;.\plat-win, etc)
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	37
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	38
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	39 The end result of all this is:
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	40 * When running python.exe, or any other .exe in the main Python directory
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	41 (either an installed version, or directly from the PCbuild directory),
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	42 the core path is deduced, and the core paths in the registry are
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	43 ignored. Other "application paths" in the registry are always read.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	44
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	45 * When Python is hosted in another exe (different directory, embedded via
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	46 COM, etc), the Python Home will not be deduced, so the core path from
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	47 the registry is used. Other "application paths" in the registry are
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	48 always read.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	49
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	50 * If Python can't find its home and there is no registry (eg, frozen
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	51 exe, some very strange installation setup) you get a path with
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	52 some default, but relative, paths.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	53
64955 fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	54 * An embedding application can use Py_SetPath() to override all of
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	55 these authomatic path computations.
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	56
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	57 ---------------------------------------------------------------- */
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	58
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	59
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	60 #include "Python.h"
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	61 #include "osdefs.h"
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	62 #include <wchar.h>
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	63
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	64 #ifdef MS_WINDOWS
5999 f2d134bf6973 Some changes to make it work on NT; add the directory where the binary Guido van Rossum <guido@python.org> parents: 5545 diff changeset	65 #include <windows.h>
f2d134bf6973 Some changes to make it work on NT; add the directory where the binary Guido van Rossum <guido@python.org> parents: 5545 diff changeset	66 #endif
f2d134bf6973 Some changes to make it work on NT; add the directory where the binary Guido van Rossum <guido@python.org> parents: 5545 diff changeset	67
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	68 #ifdef HAVE_SYS_TYPES_H
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	69 #include <sys/types.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	70 #endif /* HAVE_SYS_TYPES_H */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	71
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	72 #ifdef HAVE_SYS_STAT_H
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	73 #include <sys/stat.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	74 #endif /* HAVE_SYS_STAT_H */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	75
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	76 #include <string.h>
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	77
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	78 /* Search in some common locations for the associated Python libraries.
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	79 *
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	80 * Py_GetPath() tries to return a sensible Python module search path.
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	81 *
7407 2c54901471f5 Fix some outdated comments (mostly by removing a large comment block Guido van Rossum <guido@python.org> parents: 6826 diff changeset	82 * The approach is an adaptation for Windows of the strategy used in
2c54901471f5 Fix some outdated comments (mostly by removing a large comment block Guido van Rossum <guido@python.org> parents: 6826 diff changeset	83 * ../Modules/getpath.c; it uses the Windows Registry as one of its
2c54901471f5 Fix some outdated comments (mostly by removing a large comment block Guido van Rossum <guido@python.org> parents: 6826 diff changeset	84 * information sources.
64955 fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	85 *
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	86 * Py_SetPath() can be used to override this mechanism. Call Py_SetPath
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	87 * with a semicolon separated path prior to calling Py_Initialize.
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	88 */
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	89
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	90 #ifndef LANDMARK
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	91 #define LANDMARK L"lib\\os.py"
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	92 #endif
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	93
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	94 static wchar_t prefix[MAXPATHLEN+1];
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	95 static wchar_t progpath[MAXPATHLEN+1];
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	96 static wchar_t dllpath[MAXPATHLEN+1];
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	97 static wchar_t *module_search_path = NULL;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	98
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	99
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	100 static int
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	101 is_sep(wchar_t ch) /* determine if "ch" is a separator character */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	102 {
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	103 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	104 return ch == SEP \|\| ch == ALTSEP;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	105 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	106 return ch == SEP;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	107 #endif
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	108 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	109
15084 9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	110 /* assumes 'dir' null terminated in bounds. Never writes
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	111 beyond existing terminator.
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	112 */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	113 static void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	114 reduce(wchar_t *dir)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	115 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	116 size_t i = wcslen(dir);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	117 while (i > 0 && !is_sep(dir[i]))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	118 --i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	119 dir[i] = '\0';
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	120 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	121
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	122
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	123 static int
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	124 exists(wchar_t *filename)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	125 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	126 return GetFileAttributesW(filename) != 0xFFFFFFFF;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	127 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	128
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	129 /* Assumes 'filename' MAXPATHLEN+1 bytes long -
15084 9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	130 may extend 'filename' by one character.
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	131 */
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	132 static int
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	133 ismodule(wchar_t filename) / Is module -- check for .pyc/.pyo too */
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	134 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	135 if (exists(filename))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	136 return 1;
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	137
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	138 /* Check for the compiled version of prefix. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	139 if (wcslen(filename) < MAXPATHLEN) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	140 wcscat(filename, Py_OptimizeFlag ? L"o" : L"c");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	141 if (exists(filename))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	142 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	143 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	144 return 0;
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	145 }
6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	146
33017 ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	147 /* Add a path component, by appending stuff to buffer.
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	148 buffer must have at least MAXPATHLEN + 1 bytes allocated, and contain a
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	149 NUL-terminated string with no more than MAXPATHLEN characters (not counting
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	150 the trailing NUL). It's a fatal error if it contains a string longer than
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	151 that (callers must be careful!). If these requirements are met, it's
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	152 guaranteed that buffer will still be a NUL-terminated string with no more
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	153 than MAXPATHLEN characters at exit. If stuff is too long, only as much of
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	154 stuff as fits will be appended.
ab93aff4c90a SF bug 1003471: Python 1.5.2 security vulnerability Tim Peters <tim.peters@gmail.com> parents: 30180 diff changeset	155 */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	156 static void
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	157 join(wchar_t buffer, wchar_t stuff)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	158 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	159 size_t n, k;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	160 if (is_sep(stuff[0]))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	161 n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	162 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	163 n = wcslen(buffer);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	164 if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	165 buffer[n++] = SEP;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	166 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	167 if (n > MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	168 Py_FatalError("buffer overflow in getpathp.c's joinpath()");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	169 k = wcslen(stuff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	170 if (n + k > MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	171 k = MAXPATHLEN - n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	172 wcsncpy(buffer+n, stuff, k);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	173 buffer[n+k] = '\0';
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	174 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	175
15084 9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	176 /* gotlandmark only called by search_for_prefix, which ensures
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	177 'prefix' is null terminated in bounds. join() ensures
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	178 'landmark' can not overflow prefix if too long.
9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	179 */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	180 static int
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	181 gotlandmark(wchar_t *landmark)
12090 9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	182 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	183 int ok;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	184 Py_ssize_t n;
12090 9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	185
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	186 n = wcslen(prefix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	187 join(prefix, landmark);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	188 ok = ismodule(prefix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	189 prefix[n] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	190 return ok;
12090 9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	191 }
9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	192
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	193 /* assumes argv0_path is MAXPATHLEN+1 bytes long, already \0 term'd.
15084 9be67c5a823a Prevent possible buffer overflow exploits under Windows. As per (the very quick) patch Patch #101801. Mark Hammond <mhammond@skippinet.com.au> parents: 14500 diff changeset	194 assumption provided by only caller, calculate_path() */
12090 9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	195 static int
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	196 search_for_prefix(wchar_t argv0_path, wchar_t landmark)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	197 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	198 /* Search from argv0_path, until landmark is found */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	199 wcscpy(prefix, argv0_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	200 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	201 if (gotlandmark(landmark))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	202 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	203 reduce(prefix);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	204 } while (prefix[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	205 return 0;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	206 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	207
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	208 #ifdef MS_WINDOWS
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	209 #ifdef Py_ENABLE_SHARED
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	210
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	211 /* a string loaded from the DLL at startup.*/
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	212 extern const char *PyWin_DLLVersionString;
6356 a857d2f87336 Seem to be some changes related to DLL version from string resource, Guido van Rossum <guido@python.org> parents: 6001 diff changeset	213
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	214
8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	215 /* Load a PYTHONPATH value from the registry.
8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	216 Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER.
8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	217
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	218 Works in both Unicode and 8bit environments. Only uses the
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	219 Ex family of functions so it also works with Windows CE.
e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	220
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	221 Returns NULL, or a pointer that should be freed.
16748 e444a5271181 Checkin updated version of patch #103933 . As Thomas says, fixes the bugs #131064, #129584, #127722. See the discussion in bug #131064 Mark Hammond <mhammond@skippinet.com.au> parents: 15084 diff changeset	222
e444a5271181 Checkin updated version of patch #103933 . As Thomas says, fixes the bugs #131064, #129584, #127722. See the discussion in bug #131064 Mark Hammond <mhammond@skippinet.com.au> parents: 15084 diff changeset	223 XXX - this code is pretty strange, as it used to also
e444a5271181 Checkin updated version of patch #103933 . As Thomas says, fixes the bugs #131064, #129584, #127722. See the discussion in bug #131064 Mark Hammond <mhammond@skippinet.com.au> parents: 15084 diff changeset	224 work on Win16, where the buffer sizes werent available
e444a5271181 Checkin updated version of patch #103933 . As Thomas says, fixes the bugs #131064, #129584, #127722. See the discussion in bug #131064 Mark Hammond <mhammond@skippinet.com.au> parents: 15084 diff changeset	225 in advance. It could be simplied now Win16/Win32s is dead!
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	226 */
8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	227
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	228 static wchar_t *
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	229 getpythonregpath(HKEY keyBase, int skipcore)
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	230 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	231 HKEY newKey = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	232 DWORD dataSize = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	233 DWORD numKeys = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	234 LONG rc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	235 wchar_t *retval = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	236 WCHAR *dataBuf = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	237 static const WCHAR keyPrefix[] = L"Software\\Python\\PythonCore\\";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	238 static const WCHAR keySuffix[] = L"\\PythonPath";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	239 size_t versionLen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	240 DWORD index;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	241 WCHAR *keyBuf = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	242 WCHAR *keyBufPtr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	243 WCHAR **ppPaths = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	244
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	245 /* Tried to use sysget("winver") but here is too early :-( */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	246 versionLen = strlen(PyWin_DLLVersionString);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	247 /* Space for all the chars, plus one \0 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	248 keyBuf = keyBufPtr = malloc(sizeof(keyPrefix) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	249 sizeof(WCHAR)*(versionLen-1) +
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	250 sizeof(keySuffix));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	251 if (keyBuf==NULL) goto done;
6356 a857d2f87336 Seem to be some changes related to DLL version from string resource, Guido van Rossum <guido@python.org> parents: 6001 diff changeset	252
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	253 memcpy(keyBufPtr, keyPrefix, sizeof(keyPrefix)-sizeof(WCHAR));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	254 keyBufPtr += sizeof(keyPrefix)/sizeof(WCHAR) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	255 mbstowcs(keyBufPtr, PyWin_DLLVersionString, versionLen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	256 keyBufPtr += versionLen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	257 /* NULL comes with this one! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	258 memcpy(keyBufPtr, keySuffix, sizeof(keySuffix));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	259 /* Open the root Python key */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	260 rc=RegOpenKeyExW(keyBase,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	261 keyBuf, /* subkey */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	262 0, /* reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	263 KEY_READ,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	264 &newKey);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	265 if (rc!=ERROR_SUCCESS) goto done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	266 /* Find out how big our core buffer is, and how many subkeys we have */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	267 rc = RegQueryInfoKey(newKey, NULL, NULL, NULL, &numKeys, NULL, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	268 NULL, NULL, &dataSize, NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	269 if (rc!=ERROR_SUCCESS) goto done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	270 if (skipcore) dataSize = 0; /* Only count core ones if we want them! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	271 /* Allocate a temp array of char buffers, so we only need to loop
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	272 reading the registry once
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	273 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	274 ppPaths = malloc( sizeof(WCHAR ) numKeys );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	275 if (ppPaths==NULL) goto done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	276 memset(ppPaths, 0, sizeof(WCHAR ) numKeys);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	277 /* Loop over all subkeys, allocating a temp sub-buffer. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	278 for(index=0;index<numKeys;index++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	279 WCHAR keyBuf[MAX_PATH+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	280 HKEY subKey = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	281 DWORD reqdSize = MAX_PATH+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	282 /* Get the sub-key name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	283 DWORD rc = RegEnumKeyExW(newKey, index, keyBuf, &reqdSize,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	284 NULL, NULL, NULL, NULL );
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	285 if (rc!=ERROR_SUCCESS) goto done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	286 /* Open the sub-key */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	287 rc=RegOpenKeyExW(newKey,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	288 keyBuf, /* subkey */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	289 0, /* reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	290 KEY_READ,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	291 &subKey);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	292 if (rc!=ERROR_SUCCESS) goto done;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	293 /* Find the value of the buffer size, malloc, then read it */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	294 RegQueryValueExW(subKey, NULL, 0, NULL, NULL, &reqdSize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	295 if (reqdSize) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	296 ppPaths[index] = malloc(reqdSize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	297 if (ppPaths[index]) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	298 RegQueryValueExW(subKey, NULL, 0, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	299 (LPBYTE)ppPaths[index],
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	300 &reqdSize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	301 dataSize += reqdSize + 1; /* 1 for the ";" */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	302 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	303 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	304 RegCloseKey(subKey);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	305 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	306
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	307 /* return null if no path to return */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	308 if (dataSize == 0) goto done;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 36507 diff changeset	309
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	310 /* original datasize from RegQueryInfo doesn't include the \0 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	311 dataBuf = malloc((dataSize+1) * sizeof(WCHAR));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	312 if (dataBuf) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	313 WCHAR *szCur = dataBuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	314 DWORD reqdSize = dataSize;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	315 /* Copy our collected strings */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	316 for (index=0;index<numKeys;index++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	317 if (index > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	318 *(szCur++) = L';';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	319 dataSize--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	320 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	321 if (ppPaths[index]) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	322 Py_ssize_t len = wcslen(ppPaths[index]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	323 wcsncpy(szCur, ppPaths[index], len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	324 szCur += len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	325 assert(dataSize > (DWORD)len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	326 dataSize -= (DWORD)len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	327 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	328 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	329 if (skipcore)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	330 *szCur = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	331 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	332 /* If we have no values, we dont need a ';' */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	333 if (numKeys) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	334 *(szCur++) = L';';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	335 dataSize--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	336 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	337 /* Now append the core path entries -
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	338 this will include the NULL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	339 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	340 rc = RegQueryValueExW(newKey, NULL, 0, NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	341 (LPBYTE)szCur, &dataSize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	342 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	343 /* And set the result - caller must free */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	344 retval = dataBuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	345 }
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	346 done:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	347 /* Loop freeing my temp buffers */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	348 if (ppPaths) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	349 for(index=0;index<numKeys;index++)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	350 if (ppPaths[index]) free(ppPaths[index]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	351 free(ppPaths);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	352 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	353 if (newKey)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	354 RegCloseKey(newKey);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	355 if (keyBuf)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	356 free(keyBuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	357 return retval;
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	358 }
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	359 #endif /* Py_ENABLE_SHARED */
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	360 #endif /* MS_WINDOWS */
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	361
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	362 static void
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	363 get_progpath(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	364 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	365 extern wchar_t *Py_GetProgramName(void);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	366 wchar_t *path = _wgetenv(L"PATH");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	367 wchar_t *prog = Py_GetProgramName();
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	368
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	369 #ifdef MS_WINDOWS
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	370 #ifdef Py_ENABLE_SHARED
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	371 extern HANDLE PyWin_DLLhModule;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	372 /* static init of progpath ensures final char remains \0 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	373 if (PyWin_DLLhModule)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	374 if (!GetModuleFileNameW(PyWin_DLLhModule, dllpath, MAXPATHLEN))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	375 dllpath[0] = 0;
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	376 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	377 dllpath[0] = 0;
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	378 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	379 if (GetModuleFileNameW(NULL, progpath, MAXPATHLEN))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	380 return;
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	381 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	382 if (prog == NULL \|\| *prog == '\0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	383 prog = L"python";
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	384
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	385 /* If there is no slash in the argv0 path, then we have to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	386 * assume python is on the user's $PATH, since there's no
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	387 * other way to find a directory to start the search from. If
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	388 * $PATH isn't exported, you lose.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	389 */
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	390 #ifdef ALTSEP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	391 if (wcschr(prog, SEP) \|\| wcschr(prog, ALTSEP))
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	392 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	393 if (wcschr(prog, SEP))
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	394 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	395 wcsncpy(progpath, prog, MAXPATHLEN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	396 else if (path) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	397 while (1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	398 wchar_t *delim = wcschr(path, DELIM);
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	399
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	400 if (delim) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	401 size_t len = delim - path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	402 /* ensure we can't overwrite buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	403 len = min(MAXPATHLEN,len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	404 wcsncpy(progpath, path, len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	405 *(progpath + len) = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	406 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	407 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	408 wcsncpy(progpath, path, MAXPATHLEN);
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	409
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	410 /* join() is safe for MAXPATHLEN+1 size buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	411 join(progpath, prog);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	412 if (exists(progpath))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	413 break;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	414
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	415 if (!delim) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	416 progpath[0] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	417 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	418 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	419 path = delim + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	420 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	421 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	422 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	423 progpath[0] = '\0';
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	424 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	425
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	426 static void
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	427 calculate_path(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	428 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	429 wchar_t argv0_path[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	430 wchar_t *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	431 size_t bufsz;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	432 wchar_t *pythonhome = Py_GetPythonHome();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	433 wchar_t *envpath = NULL;
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	434
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	435 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	436 int skiphome, skipdefault;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	437 wchar_t *machinepath = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	438 wchar_t *userpath = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	439 wchar_t zip_path[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	440 size_t len;
54650 f5828742b46f Merged revisions 73322 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 51264 diff changeset	441
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	442 if (!Py_IgnoreEnvironmentFlag) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	443 envpath = _wgetenv(L"PYTHONPATH");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	444 }
54650 f5828742b46f Merged revisions 73322 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 51264 diff changeset	445 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	446 char *_envpath = Py_GETENV("PYTHONPATH");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	447 wchar_t wenvpath[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	448 if (_envpath) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	449 size_t r = mbstowcs(wenvpath, _envpath, MAXPATHLEN+1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	450 envpath = wenvpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	451 if (r == (size_t)-1 \|\| r >= MAXPATHLEN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	452 envpath = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	453 }
54650 f5828742b46f Merged revisions 73322 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 51264 diff changeset	454 #endif
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	455
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	456 get_progpath();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	457 /* progpath guaranteed \0 terminated in MAXPATH+1 bytes. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	458 wcscpy(argv0_path, progpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	459 reduce(argv0_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	460 if (pythonhome == NULL \|\| *pythonhome == '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	461 if (search_for_prefix(argv0_path, LANDMARK))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	462 pythonhome = prefix;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	463 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	464 pythonhome = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	465 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	466 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	467 wcsncpy(prefix, pythonhome, MAXPATHLEN);
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	468
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	469 if (envpath && *envpath == '\0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	470 envpath = NULL;
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	471
12090 9877e978170e Changes to completely ignore the registry when it detects that you are Guido van Rossum <guido@python.org> parents: 8967 diff changeset	472
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	473 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	474 /* Calculate zip archive path */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	475 if (dllpath[0]) /* use name of python DLL */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	476 wcsncpy(zip_path, dllpath, MAXPATHLEN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	477 else /* use name of executable program */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	478 wcsncpy(zip_path, progpath, MAXPATHLEN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	479 zip_path[MAXPATHLEN] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	480 len = wcslen(zip_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	481 if (len > 4) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	482 zip_path[len-3] = 'z'; /* change ending to "zip" */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	483 zip_path[len-2] = 'i';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	484 zip_path[len-1] = 'p';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	485 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	486 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	487 zip_path[0] = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	488 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	489
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	490 skiphome = pythonhome==NULL ? 0 : 1;
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	491 #ifdef Py_ENABLE_SHARED
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	492 machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	493 userpath = getpythonregpath(HKEY_CURRENT_USER, skiphome);
51264 87a985a1b5c9 Merged revisions 69207 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47667 diff changeset	494 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	495 /* We only use the default relative PYTHONPATH if we havent
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	496 anything better to use! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	497 skipdefault = envpath!=NULL \|\| pythonhome!=NULL \|\| \
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	498 machinepath!=NULL \|\| userpath!=NULL;
8902 6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	499 #endif
6f73ae1cf934 Sigh. More restructuring was needed. Guido van Rossum <guido@python.org> parents: 8895 diff changeset	500
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	501 /* We need to construct a path from the following parts.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	502 (1) the PYTHONPATH environment variable, if set;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	503 (2) for Win32, the zip archive file path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	504 (3) for Win32, the machinepath and userpath, if set;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	505 (4) the PYTHONPATH config macro, with the leading "."
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	506 of each component replaced with pythonhome, if set;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	507 (5) the directory containing the executable (argv0_path).
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	508 The length calculation calculates #4 first.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	509 Extra rules:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	510 - If PYTHONHOME is set (in any way) item (3) is ignored.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	511 - If registry values are used, (4) and (5) are ignored.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	512 */
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	513
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	514 /* Calculate size of return buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	515 if (pythonhome != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	516 wchar_t *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	517 bufsz = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	518 for (p = PYTHONPATH; *p; p++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	519 if (*p == DELIM)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	520 bufsz++; /* number of DELIM plus one */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	521 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	522 bufsz *= wcslen(pythonhome);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	523 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	524 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	525 bufsz = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	526 bufsz += wcslen(PYTHONPATH) + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	527 bufsz += wcslen(argv0_path) + 1;
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	528 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	529 if (userpath)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	530 bufsz += wcslen(userpath) + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	531 if (machinepath)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	532 bufsz += wcslen(machinepath) + 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	533 bufsz += wcslen(zip_path) + 1;
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	534 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	535 if (envpath != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	536 bufsz += wcslen(envpath) + 1;
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	537
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	538 module_search_path = buf = malloc(bufsz*sizeof(wchar_t));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	539 if (buf == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	540 /* We can't exit, so print a warning and limp along */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	541 fprintf(stderr, "Can't malloc dynamic PYTHONPATH.\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	542 if (envpath) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	543 fprintf(stderr, "Using environment $PYTHONPATH.\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	544 module_search_path = envpath;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	545 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	546 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	547 fprintf(stderr, "Using default static path.\n");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	548 module_search_path = PYTHONPATH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	549 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	550 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	551 if (machinepath)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	552 free(machinepath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	553 if (userpath)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	554 free(userpath);
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	555 #endif /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	556 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	557 }
6001 8056169ec448 Much rewritten. Added Win32 registry stuff (from getpath_nt.c, which Guido van Rossum <guido@python.org> parents: 5999 diff changeset	558
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	559 if (envpath) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	560 wcscpy(buf, envpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	561 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	562 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	563 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	564 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	565 if (zip_path[0]) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	566 wcscpy(buf, zip_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	567 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	568 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	569 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	570 if (userpath) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	571 wcscpy(buf, userpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	572 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	573 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	574 free(userpath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	575 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	576 if (machinepath) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	577 wcscpy(buf, machinepath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	578 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	579 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	580 free(machinepath);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	581 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	582 if (pythonhome == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	583 if (!skipdefault) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	584 wcscpy(buf, PYTHONPATH);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	585 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	586 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	587 }
12116 e6ab3c603ff9 Revamped path access again, by Mark Hammond, to be more robust in the Guido van Rossum <guido@python.org> parents: 12090 diff changeset	588 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	589 if (pythonhome == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	590 wcscpy(buf, PYTHONPATH);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	591 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	592 }
24071 8142f8d668a0 Patch #569753: Remove support for WIN16. Martin v. Löwis <martin@v.loewis.de> parents: 21712 diff changeset	593 #endif /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	594 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	595 wchar_t *p = PYTHONPATH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	596 wchar_t *q;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	597 size_t n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	598 for (;;) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	599 q = wcschr(p, DELIM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	600 if (q == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	601 n = wcslen(p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	602 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	603 n = q-p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	604 if (p[0] == '.' && is_sep(p[1])) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	605 wcscpy(buf, pythonhome);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	606 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	607 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	608 n--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	609 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	610 wcsncpy(buf, p, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	611 buf += n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	612 if (q == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	613 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	614 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	615 p = q+1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	616 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	617 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	618 if (argv0_path) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	619 *buf++ = DELIM;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	620 wcscpy(buf, argv0_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	621 buf = wcschr(buf, L'\0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	622 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	623 *buf = L'\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	624 /* Now to pull one last hack/trick. If sys.prefix is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	625 empty, then try and find it somewhere on the paths
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	626 we calculated. We scan backwards, as our general policy
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	627 is that Python core directories are at the end of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	628 sys.path. We assume that our "lib" directory is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	629 on the path, and that our 'prefix' directory is
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	630 the parent of that.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	631 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	632 if (*prefix==L'\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	633 wchar_t lookBuf[MAXPATHLEN+1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	634 wchar_t look = buf - 1; / 'buf' is at the end of the buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	635 while (1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	636 Py_ssize_t nchars;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	637 wchar_t *lookEnd = look;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	638 /* 'look' will end up one character before the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	639 start of the path in question - even if this
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	640 is one character before the start of the buffer
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	641 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	642 while (look >= module_search_path && *look != DELIM)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	643 look--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	644 nchars = lookEnd-look;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	645 wcsncpy(lookBuf, look+1, nchars);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	646 lookBuf[nchars] = L'\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	647 /* Up one level to the parent */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	648 reduce(lookBuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	649 if (search_for_prefix(lookBuf, LANDMARK)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	650 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	651 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	652 /* If we are out of paths to search - give up */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	653 if (look < module_search_path)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	654 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	655 look--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	656 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	657 }
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	658 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	659
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	660
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	661 /* External interface */
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	662
64955 fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	663 void
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	664 Py_SetPath(const wchar_t *path)
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	665 {
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	666 if (module_search_path != NULL) {
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	667 free(module_search_path);
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	668 module_search_path = NULL;
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	669 }
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	670 if (path != NULL) {
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	671 extern wchar_t *Py_GetProgramName(void);
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	672 wchar_t *prog = Py_GetProgramName();
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	673 wcsncpy(progpath, prog, MAXPATHLEN);
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	674 prefix[0] = L'\0';
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	675 module_search_path = malloc((wcslen(path) + 1) * sizeof(wchar_t));
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	676 if (module_search_path != NULL)
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	677 wcscpy(module_search_path, path);
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	678 }
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	679 }
fd5e51035335 issue 9910 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 61466 diff changeset	680
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	681 wchar_t *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	682 Py_GetPath(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	683 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	684 if (!module_search_path)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	685 calculate_path();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	686 return module_search_path;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	687 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	688
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	689 wchar_t *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	690 Py_GetPrefix(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	691 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	692 if (!module_search_path)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	693 calculate_path();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	694 return prefix;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	695 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	696
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	697 wchar_t *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	698 Py_GetExecPrefix(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	699 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	700 return Py_GetPrefix();
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	701 }
7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	702
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 41554 diff changeset	703 wchar_t *
13660 a1ce07218781 Miscelaneous ANSIfications. I'm assuming here 'main' should take (int, Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	704 Py_GetProgramFullPath(void)
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	705 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	706 if (!module_search_path)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	707 calculate_path();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54650 diff changeset	708 return progpath;
5545 7e4228780ff8 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. Guido van Rossum <guido@python.org> parents: diff changeset	709 }
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	710
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	711 /* Load python3.dll before loading any extension module that might refer
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	712 to it. That way, we can be sure that always the python3.dll corresponding
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	713 to this python DLL is loaded, not a python3.dll that might be on the path
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	714 by chance.
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	715 Return whether the DLL was found.
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	716 */
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	717 static int python3_checked = 0;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	718 static HANDLE hPython3;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	719 int
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	720 _Py_CheckPython3()
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	721 {
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	722 wchar_t py3path[MAXPATHLEN+1];
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	723 wchar_t *s;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	724 if (python3_checked)
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	725 return hPython3 != NULL;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	726 python3_checked = 1;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	727
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	728 /* If there is a python3.dll next to the python3y.dll,
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	729 assume this is a build tree; use that DLL */
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	730 wcscpy(py3path, dllpath);
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	731 s = wcsrchr(py3path, L'\\');
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	732 if (!s)
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	733 s = py3path;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	734 wcscpy(s, L"\\python3.dll");
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	735 hPython3 = LoadLibraryExW(py3path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	736 if (hPython3 != NULL)
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	737 return 1;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	738
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	739 /* Check sys.prefix\DLLs\python3.dll */
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	740 wcscpy(py3path, Py_GetPrefix());
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	741 wcscat(py3path, L"\\DLLs\\python3.dll");
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	742 hPython3 = LoadLibraryExW(py3path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	743 return hPython3 != NULL;
62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 64955 diff changeset	744 }

Mercurial > cpython-lru_cache-weakref

annotate PC/getpathp.c @ 70817:dd775b1561ba