Mercurial > cpython-lru_cache-weakref
annotate Modules/getpath.c @ 65573:a2bb50ffdff3
#3077: fix h2py substitution of character literals.
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Thu, 21 Oct 2010 13:29:10 +0000 |
| parents | 9306ff1c3d46 |
| children | 5b6e13b6b473 |
| rev | line source |
|---|---|
|
3621
f158edccc72c
grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents:
3416
diff
changeset
|
1 /* Return the initial module search path. */ |
|
f158edccc72c
grand renaming; added copyright to some files
Guido van Rossum <guido@python.org>
parents:
3416
diff
changeset
|
2 |
| 2896 | 3 #include "Python.h" |
| 4 #include "osdefs.h" | |
| 5 | |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
6 #include <sys/types.h> |
|
5698
ba860dc0a585
Use string.h, not strings.h
Guido van Rossum <guido@python.org>
parents:
5568
diff
changeset
|
7 #include <string.h> |
| 2896 | 8 |
|
32410
8444849c9448
Modules/getpath.c now compiles properly under OS X when using the
Brett Cannon <bcannon@gmail.com>
parents:
32399
diff
changeset
|
9 #ifdef __APPLE__ |
|
9970
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
10 #include <mach-o/dyld.h> |
|
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
11 #endif |
|
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
12 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
13 /* Search in some common locations for the associated Python libraries. |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
14 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
15 * Two directories must be found, the platform independent directory |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
16 * (prefix), containing the common .py and .pyc files, and the platform |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
17 * dependent directory (exec_prefix), containing the shared library |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
18 * modules. Note that prefix and exec_prefix can be the same directory, |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
19 * but for some installations, they are different. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
20 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
21 * Py_GetPath() carries out separate searches for prefix and exec_prefix. |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
22 * Each search tries a number of different locations until a ``landmark'' |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
23 * file or directory is found. If no prefix or exec_prefix is found, a |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
24 * warning message is issued and the preprocessor defined PREFIX and |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
25 * EXEC_PREFIX are used (even though they will not work); python carries on |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
26 * as best as is possible, but most imports will fail. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
27 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
28 * Before any searches are done, the location of the executable is |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
39442
diff
changeset
|
29 * determined. If argv[0] has one or more slashes in it, it is used |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
30 * unchanged. Otherwise, it must have been invoked from the shell's path, |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
31 * so we search $PATH for the named executable and use that. If the |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
32 * executable was not found on $PATH (or there was no $PATH environment |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
33 * variable), the original argv[0] string is used. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
34 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
35 * Next, the executable location is examined to see if it is a symbolic |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
36 * link. If so, the link is chased (correctly interpreting a relative |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
37 * pathname if one is found) and the directory of the link target is used. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
38 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
39 * Finally, argv0_path is set to the directory containing the executable |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
40 * (i.e. the last component is stripped). |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
41 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
42 * With argv0_path in hand, we perform a number of steps. The same steps |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
43 * are performed for prefix and for exec_prefix, but with a different |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
44 * landmark. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
45 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
46 * Step 1. Are we running python out of the build directory? This is |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
47 * checked by looking for a different kind of landmark relative to |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
48 * argv0_path. For prefix, the landmark's path is derived from the VPATH |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
49 * preprocessor variable (taking into account that its value is almost, but |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
50 * not quite, what we need). For exec_prefix, the landmark is |
|
63981
794eb40bef3a
Add comments about Windows in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63964
diff
changeset
|
51 * pybuilddir.txt. If the landmark is found, we're done. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
52 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
53 * For the remaining steps, the prefix landmark will always be |
|
12775
8e2b35d386aa
Patch from M.-A. Lemburg:
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
12576
diff
changeset
|
54 * lib/python$VERSION/os.py and the exec_prefix will always be |
|
6498
4981fd2b3211
Change sharedmodules to lib-dynload.
Guido van Rossum <guido@python.org>
parents:
6121
diff
changeset
|
55 * lib/python$VERSION/lib-dynload, where $VERSION is Python's version |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
56 * number as supplied by the Makefile. Note that this means that no more |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
57 * build directory checking is performed; if the first step did not find |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
58 * the landmarks, the assumption is that python is running from an |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
59 * installed setup. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
60 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
61 * Step 2. See if the $PYTHONHOME environment variable points to the |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
62 * installed location of the Python libraries. If $PYTHONHOME is set, then |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
63 * it points to prefix and exec_prefix. $PYTHONHOME can be a single |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
64 * directory, which is used for both, or the prefix and exec_prefix |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
65 * directories separated by a colon. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
66 * |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
67 * Step 3. Try to find prefix and exec_prefix relative to argv0_path, |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
68 * backtracking up the path until it is exhausted. This is the most common |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
69 * step to succeed. Note that if prefix and exec_prefix are different, |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
70 * exec_prefix is more likely to be found; however if exec_prefix is a |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
71 * subdirectory of prefix, both will be found. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
72 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
73 * Step 4. Search the directories pointed to by the preprocessor variables |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
74 * PREFIX and EXEC_PREFIX. These are supplied by the Makefile but can be |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
75 * passed in as options to the configure script. |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
76 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
77 * That's it! |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
78 * |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
79 * Well, almost. Once we have determined prefix and exec_prefix, the |
|
13620
5b727ab37092
Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either
Thomas Wouters <thomas@python.org>
parents:
13428
diff
changeset
|
80 * preprocessor variable PYTHONPATH is used to construct a path. Each |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
81 * relative path on PYTHONPATH is prefixed with prefix. Then the directory |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
82 * containing the shared library modules is appended. The environment |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
83 * variable $PYTHONPATH is inserted in front of it all. Finally, the |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
84 * prefix and exec_prefix globals are tweaked so they reflect the values |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
85 * expected by other code, by stripping the "lib/python$VERSION/..." stuff |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
86 * off. If either points to the build directory, the globals are reset to |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
87 * the corresponding preprocessor variables (so sys.prefix will reflect the |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
88 * installation location, even though sys.path points into the build |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
89 * directory). This seems to make more sense given that currently the only |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
90 * known use of sys.prefix and sys.exec_prefix is for the ILU installation |
|
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
91 * process to find the installed Python tree. |
|
63981
794eb40bef3a
Add comments about Windows in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63964
diff
changeset
|
92 * |
|
64955
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
93 * An embedding application can use Py_SetPath() to override all of |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
94 * these authomatic path computations. |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
95 * |
|
63981
794eb40bef3a
Add comments about Windows in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63964
diff
changeset
|
96 * NOTE: Windows MSVC builds use PC/getpathp.c instead! |
|
5316
c8e24c4b8bfb
Removed two unused static function: string_addsep() and
Barry Warsaw <barry@python.org>
parents:
5300
diff
changeset
|
97 */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
98 |
|
37879
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
99 #ifdef __cplusplus |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
100 extern "C" { |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
101 #endif |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
102 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
103 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
104 #ifndef VERSION |
|
16147
fbf8abec93d1
Clean up some comments and the default VERSION.
Guido van Rossum <guido@python.org>
parents:
14907
diff
changeset
|
105 #define VERSION "2.1" |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
106 #endif |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
107 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
108 #ifndef VPATH |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
109 #define VPATH "." |
| 2896 | 110 #endif |
| 111 | |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
112 #ifndef PREFIX |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
113 # ifdef __VMS |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
114 # define PREFIX "" |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
115 # else |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
116 # define PREFIX "/usr/local" |
|
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
37879
diff
changeset
|
117 # endif |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
118 #endif |
|
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
119 |
|
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
120 #ifndef EXEC_PREFIX |
|
3878
4286910080a9
Don't have "." in the default path.
Guido van Rossum <guido@python.org>
parents:
3674
diff
changeset
|
121 #define EXEC_PREFIX PREFIX |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
122 #endif |
|
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
123 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
124 #ifndef PYTHONPATH |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
125 #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
126 EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
127 #endif |
| 2896 | 128 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
129 #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
|
130 #define LANDMARK L"os.py" |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
131 #endif |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
132 |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
133 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
|
134 static wchar_t exec_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
|
135 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
|
136 static wchar_t *module_search_path = NULL; |
|
59041
9b5806a008e7
#4532: fixes to make 3.x compile on QNX 6.3.2 (reported by Matt Kraai)
Andrew M. Kuchling <amk@amk.ca>
parents:
51560
diff
changeset
|
137 static wchar_t *lib_python = L"lib/python" VERSION; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
138 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
139 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
|
140 reduce(wchar_t *dir) |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
141 { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
142 size_t i = wcslen(dir); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
143 while (i > 0 && dir[i] != SEP) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
144 --i; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
145 dir[i] = '\0'; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
146 } |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
147 |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
148 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
|
149 isfile(wchar_t *filename) /* Is file, not directory */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
150 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
151 struct stat buf; |
|
65162
39014f0abc32
Create fileutils.c/.h
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65161
diff
changeset
|
152 if (_Py_wstat(filename, &buf) != 0) |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
153 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
154 if (!S_ISREG(buf.st_mode)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
155 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
156 return 1; |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
157 } |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
158 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
159 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
160 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
|
161 ismodule(wchar_t *filename) /* Is module -- check for .pyc/.pyo too */ |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
162 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
163 if (isfile(filename)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
164 return 1; |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
165 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
166 /* Check for the compiled version of prefix. */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
167 if (wcslen(filename) < MAXPATHLEN) { |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
168 wcscat(filename, Py_OptimizeFlag ? L"o" : L"c"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
169 if (isfile(filename)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
170 return 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
171 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
172 return 0; |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
173 } |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
174 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
175 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
176 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
|
177 isxfile(wchar_t *filename) /* Is executable file */ |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
178 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
179 struct stat buf; |
|
65162
39014f0abc32
Create fileutils.c/.h
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65161
diff
changeset
|
180 if (_Py_wstat(filename, &buf) != 0) |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
181 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
182 if (!S_ISREG(buf.st_mode)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
183 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
184 if ((buf.st_mode & 0111) == 0) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
185 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
186 return 1; |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
187 } |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
188 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
189 |
|
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
190 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
|
191 isdir(wchar_t *filename) /* Is directory */ |
|
7117
419dca2b3a61
Instead of a single exists(), differentiate between files, modules,
Guido van Rossum <guido@python.org>
parents:
6823
diff
changeset
|
192 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
193 struct stat buf; |
|
65162
39014f0abc32
Create fileutils.c/.h
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65161
diff
changeset
|
194 if (_Py_wstat(filename, &buf) != 0) |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
195 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
196 if (!S_ISDIR(buf.st_mode)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
197 return 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
198 return 1; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
199 } |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
200 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
201 |
|
33038
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
202 /* Add a path component, by appending stuff to buffer. |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
203 buffer must have at least MAXPATHLEN + 1 bytes allocated, and contain a |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
204 NUL-terminated string with no more than MAXPATHLEN characters (not counting |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
205 the trailing NUL). It's a fatal error if it contains a string longer than |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
206 that (callers must be careful!). If these requirements are met, it's |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
207 guaranteed that buffer will still be a NUL-terminated string with no more |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
208 than MAXPATHLEN characters at exit. If stuff is too long, only as much of |
|
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
209 stuff as fits will be appended. |
|
14898
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
210 */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
211 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
|
212 joinpath(wchar_t *buffer, wchar_t *stuff) |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
213 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
214 size_t n, k; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
215 if (stuff[0] == SEP) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
216 n = 0; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
217 else { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
218 n = wcslen(buffer); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
219 if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
220 buffer[n++] = SEP; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
221 } |
|
33038
fee2038b8fa9
Bug 1003471: Python 1.5.2 security vulnerability still present in 2.3.4
Tim Peters <tim.peters@gmail.com>
parents:
32410
diff
changeset
|
222 if (n > MAXPATHLEN) |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
223 Py_FatalError("buffer overflow in getpath.c's joinpath()"); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
224 k = wcslen(stuff); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
225 if (n + k > MAXPATHLEN) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
226 k = MAXPATHLEN - n; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
227 wcsncpy(buffer+n, stuff, k); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
228 buffer[n+k] = '\0'; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
229 } |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
230 |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
231 /* copy_absolute requires that path be allocated at least |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
232 MAXPATHLEN + 1 bytes and that p be no more than MAXPATHLEN bytes. */ |
|
14845
88d3a8974409
fix bug #114290: when interpreter's argv[0] has a relative path make
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14375
diff
changeset
|
233 static void |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
234 copy_absolute(wchar_t *path, wchar_t *p, size_t pathlen) |
|
14845
88d3a8974409
fix bug #114290: when interpreter's argv[0] has a relative path make
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14375
diff
changeset
|
235 { |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
236 if (p[0] == SEP) |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
237 wcscpy(path, p); |
|
14845
88d3a8974409
fix bug #114290: when interpreter's argv[0] has a relative path make
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14375
diff
changeset
|
238 else { |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
239 if (!_Py_wgetcwd(path, pathlen)) { |
|
65169
77a6a249e24e
copy_absolute() keeps the relative path on _Py_wgetcwd() failure
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65167
diff
changeset
|
240 /* unable to get the current directory */ |
|
77a6a249e24e
copy_absolute() keeps the relative path on _Py_wgetcwd() failure
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65167
diff
changeset
|
241 wcscpy(path, p); |
|
77a6a249e24e
copy_absolute() keeps the relative path on _Py_wgetcwd() failure
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65167
diff
changeset
|
242 return; |
|
77a6a249e24e
copy_absolute() keeps the relative path on _Py_wgetcwd() failure
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65167
diff
changeset
|
243 } |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
244 if (p[0] == '.' && p[1] == SEP) |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
245 p += 2; |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
246 joinpath(path, p); |
|
14845
88d3a8974409
fix bug #114290: when interpreter's argv[0] has a relative path make
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14375
diff
changeset
|
247 } |
|
88d3a8974409
fix bug #114290: when interpreter's argv[0] has a relative path make
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14375
diff
changeset
|
248 } |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
249 |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
250 /* absolutize() requires that path be allocated at least MAXPATHLEN+1 bytes. */ |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
251 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
|
252 absolutize(wchar_t *path) |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
253 { |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
254 wchar_t buffer[MAXPATHLEN+1]; |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
255 |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
256 if (path[0] == SEP) |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
257 return; |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
258 copy_absolute(buffer, path, MAXPATHLEN+1); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
259 wcscpy(path, buffer); |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
260 } |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
261 |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
262 /* search_for_prefix requires that argv0_path be no more than MAXPATHLEN |
|
14898
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
263 bytes long. |
|
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
264 */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
265 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
|
266 search_for_prefix(wchar_t *argv0_path, wchar_t *home) |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
267 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
268 size_t n; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
269 wchar_t *vpath; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
270 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
271 /* If PYTHONHOME is set, we believe it unconditionally */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
272 if (home) { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
273 wchar_t *delim; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
274 wcsncpy(prefix, home, MAXPATHLEN); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
275 delim = wcschr(prefix, DELIM); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
276 if (delim) |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
277 *delim = L'\0'; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
278 joinpath(prefix, lib_python); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
279 joinpath(prefix, LANDMARK); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
280 return 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
281 } |
|
12775
8e2b35d386aa
Patch from M.-A. Lemburg:
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
12576
diff
changeset
|
282 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
283 /* Check to see if argv[0] is in the build directory */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
284 wcscpy(prefix, argv0_path); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
285 joinpath(prefix, L"Modules/Setup"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
286 if (isfile(prefix)) { |
|
16222
a0e46c3be63e
Build now happens in toplevel directory, not Modules. Don't monkey with
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents:
16147
diff
changeset
|
287 /* Check VPATH to see if argv0_path is in the build directory. */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
288 vpath = L"" VPATH; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
289 wcscpy(prefix, argv0_path); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
290 joinpath(prefix, vpath); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
291 joinpath(prefix, L"Lib"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
292 joinpath(prefix, LANDMARK); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
293 if (ismodule(prefix)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
294 return -1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
295 } |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
296 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
297 /* Search from argv0_path, until root is found */ |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
298 copy_absolute(prefix, argv0_path, MAXPATHLEN+1); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
299 do { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
300 n = wcslen(prefix); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
301 joinpath(prefix, lib_python); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
302 joinpath(prefix, LANDMARK); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
303 if (ismodule(prefix)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
304 return 1; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
305 prefix[n] = L'\0'; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
306 reduce(prefix); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
307 } while (prefix[0]); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
308 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
309 /* Look at configure's PREFIX */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
310 wcsncpy(prefix, L"" PREFIX, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
311 joinpath(prefix, lib_python); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
312 joinpath(prefix, LANDMARK); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
313 if (ismodule(prefix)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
314 return 1; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
315 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
316 /* Fail */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
317 return 0; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
318 } |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
319 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
320 |
|
14898
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
321 /* search_for_exec_prefix requires that argv0_path be no more than |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
322 MAXPATHLEN bytes long. |
|
14898
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
323 */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
324 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
|
325 search_for_exec_prefix(wchar_t *argv0_path, wchar_t *home) |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
326 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
327 size_t n; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
328 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
329 /* If PYTHONHOME is set, we believe it unconditionally */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
330 if (home) { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
331 wchar_t *delim; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
332 delim = wcschr(home, DELIM); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
333 if (delim) |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
334 wcsncpy(exec_prefix, delim+1, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
335 else |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
336 wcsncpy(exec_prefix, home, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
337 joinpath(exec_prefix, lib_python); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
338 joinpath(exec_prefix, L"lib-dynload"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
339 return 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
340 } |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
341 |
|
63961
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
342 /* Check to see if argv[0] is in the build directory. "pybuilddir.txt" |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
343 is written by setup.py and contains the relative path to the location |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
344 of shared library modules. */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
345 wcscpy(exec_prefix, argv0_path); |
|
63961
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
346 joinpath(exec_prefix, L"pybuilddir.txt"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
347 if (isfile(exec_prefix)) { |
|
63961
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
348 FILE *f = _Py_wfopen(exec_prefix, L"rb"); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
349 if (f == NULL) |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
350 errno = 0; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
351 else { |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
352 char buf[MAXPATHLEN+1]; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
353 PyObject *decoded; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
354 wchar_t rel_builddir_path[MAXPATHLEN+1]; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
355 size_t n; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
356 n = fread(buf, 1, MAXPATHLEN, f); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
357 buf[n] = '\0'; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
358 fclose(f); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
359 decoded = PyUnicode_DecodeUTF8(buf, n, "surrogateescape"); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
360 if (decoded != NULL) { |
|
63964
ab6946972b7f
Kill a gcc warning introduced by r83988
Victor Stinner <victor.stinner@haypocalc.com>
parents:
63962
diff
changeset
|
361 n = PyUnicode_AsWideChar((PyUnicodeObject*)decoded, |
|
ab6946972b7f
Kill a gcc warning introduced by r83988
Victor Stinner <victor.stinner@haypocalc.com>
parents:
63962
diff
changeset
|
362 rel_builddir_path, MAXPATHLEN); |
|
63961
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
363 Py_DECREF(decoded); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
364 if (n >= 0) { |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
365 rel_builddir_path[n] = L'\0'; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
366 wcscpy(exec_prefix, argv0_path); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
367 joinpath(exec_prefix, rel_builddir_path); |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
368 return -1; |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
369 } |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
370 } |
|
4742e7aea2f5
Reimplement addbuilddir() in C inside getpath.c, so as to execute it
Antoine Pitrou <solipsis@pitrou.net>
parents:
63168
diff
changeset
|
371 } |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
372 } |
|
12775
8e2b35d386aa
Patch from M.-A. Lemburg:
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
12576
diff
changeset
|
373 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
374 /* Search from argv0_path, until root is found */ |
|
65312
a27fc0ff3678
_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65169
diff
changeset
|
375 copy_absolute(exec_prefix, argv0_path, MAXPATHLEN+1); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
376 do { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
377 n = wcslen(exec_prefix); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
378 joinpath(exec_prefix, lib_python); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
379 joinpath(exec_prefix, L"lib-dynload"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
380 if (isdir(exec_prefix)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
381 return 1; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
382 exec_prefix[n] = L'\0'; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
383 reduce(exec_prefix); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
384 } while (exec_prefix[0]); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
385 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
386 /* Look at configure's EXEC_PREFIX */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
387 wcsncpy(exec_prefix, L"" EXEC_PREFIX, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
388 joinpath(exec_prefix, lib_python); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
389 joinpath(exec_prefix, L"lib-dynload"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
390 if (isdir(exec_prefix)) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
391 return 1; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
392 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
393 /* Fail */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
394 return 0; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
395 } |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
396 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
397 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
398 static void |
|
13651
8a063423e0b7
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)',
Thomas Wouters <thomas@python.org>
parents:
13620
diff
changeset
|
399 calculate_path(void) |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
400 { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
401 extern wchar_t *Py_GetProgramName(void); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
402 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
403 static wchar_t delimiter[2] = {DELIM, '\0'}; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
404 static wchar_t separator[2] = {SEP, '\0'}; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
405 wchar_t *pythonpath = L"" PYTHONPATH; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
406 char *_rtpypath = Py_GETENV("PYTHONPATH"); /* XXX use wide version on Windows */ |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
407 wchar_t rtpypath[MAXPATHLEN+1]; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
408 wchar_t *home = Py_GetPythonHome(); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
409 char *_path = getenv("PATH"); |
|
65414
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
410 wchar_t *path_buffer = NULL; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
411 wchar_t *path = NULL; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
412 wchar_t *prog = Py_GetProgramName(); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
413 wchar_t argv0_path[MAXPATHLEN+1]; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
414 wchar_t zip_path[MAXPATHLEN+1]; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
415 int pfound, efound; /* 1 if found; -1 if found build directory */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
416 wchar_t *buf; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
417 size_t bufsz; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
418 size_t prefixsz; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
419 wchar_t *defpath = pythonpath; |
|
9970
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
420 #ifdef WITH_NEXT_FRAMEWORK |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
421 NSModule pythonModule; |
|
9970
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
422 #endif |
|
32229
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
423 #ifdef __APPLE__ |
|
36205
01cbed5e8731
squash compiler warning on Mac OSX 10.3
Skip Montanaro <skip@pobox.com>
parents:
35578
diff
changeset
|
424 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 |
|
35578
c28d0ed86ff0
Change type on variable to silence gcc 4 warning. Call signature was found at
Brett Cannon <bcannon@gmail.com>
parents:
33038
diff
changeset
|
425 uint32_t nsexeclength = MAXPATHLEN; |
|
36205
01cbed5e8731
squash compiler warning on Mac OSX 10.3
Skip Montanaro <skip@pobox.com>
parents:
35578
diff
changeset
|
426 #else |
|
01cbed5e8731
squash compiler warning on Mac OSX 10.3
Skip Montanaro <skip@pobox.com>
parents:
35578
diff
changeset
|
427 unsigned long nsexeclength = MAXPATHLEN; |
|
01cbed5e8731
squash compiler warning on Mac OSX 10.3
Skip Montanaro <skip@pobox.com>
parents:
35578
diff
changeset
|
428 #endif |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
429 char execpath[MAXPATHLEN+1]; |
|
32229
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
430 #endif |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
431 |
|
65414
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
432 if (_path) { |
|
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
433 path_buffer = _Py_char2wchar(_path, NULL); |
|
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
434 path = path_buffer; |
|
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
435 } |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
436 |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
437 /* If there is no slash in the argv0 path, then we have to |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
438 * assume python is on the user's $PATH, since there's no |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
439 * other way to find a directory to start the search from. If |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
440 * $PATH isn't exported, you lose. |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
441 */ |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
442 if (wcschr(prog, SEP)) |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
443 wcsncpy(progpath, prog, MAXPATHLEN); |
|
32229
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
444 #ifdef __APPLE__ |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
445 /* On Mac OS X, if a script uses an interpreter of the form |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
446 * "#!/opt/python2.3/bin/python", the kernel only passes "python" |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
447 * as argv[0], which falls through to the $PATH search below. |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
448 * If /opt/python2.3/bin isn't in your path, or is near the end, |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
449 * this algorithm may incorrectly find /usr/bin/python. To work |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
450 * around this, we can use _NSGetExecutablePath to get a better |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
451 * hint of what the intended interpreter was, although this |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
452 * will fail if a relative path was used. but in that case, |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
453 * absolutize() should help us out below |
|
27967fbba48f
Fix for #932977: MacOSX does not pass the whole pathname in argv[0] for
Jack Jansen <jack.jansen@cwi.nl>
parents:
26944
diff
changeset
|
454 */ |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
455 else if(0 == _NSGetExecutablePath(execpath, &nsexeclength) && execpath[0] == SEP) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
456 size_t r = mbstowcs(progpath, execpath, MAXPATHLEN+1); |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
457 if (r == (size_t)-1 || r > MAXPATHLEN) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
458 /* Could not convert execpath, or it's too long. */ |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
459 progpath[0] = '\0'; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
460 } |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
461 } |
|
32399
472023d0a10d
Change comment from C++ style to C.
Brett Cannon <bcannon@gmail.com>
parents:
32229
diff
changeset
|
462 #endif /* __APPLE__ */ |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
463 else if (path) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
464 while (1) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
465 wchar_t *delim = wcschr(path, DELIM); |
|
21141
51b4572cf013
Changed logic for finding python home in Mac OS X framework Pythons.
Jack Jansen <jack.jansen@cwi.nl>
parents:
20156
diff
changeset
|
466 |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
467 if (delim) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
468 size_t len = delim - path; |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
469 if (len > MAXPATHLEN) |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
470 len = MAXPATHLEN; |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
471 wcsncpy(progpath, path, len); |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
472 *(progpath + len) = '\0'; |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
473 } |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
474 else |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
475 wcsncpy(progpath, path, MAXPATHLEN); |
|
21141
51b4572cf013
Changed logic for finding python home in Mac OS X framework Pythons.
Jack Jansen <jack.jansen@cwi.nl>
parents:
20156
diff
changeset
|
476 |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
477 joinpath(progpath, prog); |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
478 if (isxfile(progpath)) |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
479 break; |
|
21141
51b4572cf013
Changed logic for finding python home in Mac OS X framework Pythons.
Jack Jansen <jack.jansen@cwi.nl>
parents:
20156
diff
changeset
|
480 |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
481 if (!delim) { |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
482 progpath[0] = L'\0'; |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
483 break; |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
484 } |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
485 path = delim + 1; |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
486 } |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
487 } |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
488 else |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
489 progpath[0] = '\0'; |
|
65414
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
490 if (path_buffer != NULL) |
|
9306ff1c3d46
Oops, fix my previous commit (r85583) on calculate_path()
Victor Stinner <victor.stinner@haypocalc.com>
parents:
65413
diff
changeset
|
491 PyMem_Free(path_buffer); |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
492 if (progpath[0] != SEP && progpath[0] != '\0') |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
493 absolutize(progpath); |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
494 wcsncpy(argv0_path, progpath, MAXPATHLEN); |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
495 argv0_path[MAXPATHLEN] = '\0'; |
|
21141
51b4572cf013
Changed logic for finding python home in Mac OS X framework Pythons.
Jack Jansen <jack.jansen@cwi.nl>
parents:
20156
diff
changeset
|
496 |
|
9970
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
497 #ifdef WITH_NEXT_FRAMEWORK |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
498 /* On Mac OS X we have a special case if we're running from a framework. |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
499 ** This is because the python home should be set relative to the library, |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
500 ** which is in the framework, not relative to the executable, which may |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
501 ** be outside of the framework. Except when we're in the build directory... |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
502 */ |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
503 pythonModule = NSModuleForSymbol(NSLookupAndBindSymbol("_Py_Initialize")); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
504 /* Use dylib functions to find out where the framework was loaded from */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
505 buf = (wchar_t *)NSLibraryNameForModule(pythonModule); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
506 if (buf != NULL) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
507 /* We're in a framework. */ |
|
19261
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
508 /* See if we might be in the build directory. The framework in the |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
509 ** build directory is incomplete, it only has the .dylib and a few |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
510 ** needed symlinks, it doesn't have the Lib directories and such. |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
511 ** If we're running with the framework from the build directory we must |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
512 ** be running the interpreter in the build directory, so we use the |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
513 ** build-directory-specific logic to find Lib and such. |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
514 */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
515 wcsncpy(argv0_path, buf, MAXPATHLEN); |
|
19261
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
516 reduce(argv0_path); |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
517 joinpath(argv0_path, lib_python); |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
518 joinpath(argv0_path, LANDMARK); |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
519 if (!ismodule(argv0_path)) { |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
520 /* We are in the build directory so use the name of the |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
521 executable - we know that the absolute path is passed */ |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
522 wcsncpy(argv0_path, progpath, MAXPATHLEN); |
|
19261
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
523 } |
|
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
524 else { |
|
63982
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
525 /* Use the location of the library as the progpath */ |
|
2d7bba1cf3bc
Fix indentation in Modules/getpath.c
Antoine Pitrou <solipsis@pitrou.net>
parents:
63981
diff
changeset
|
526 wcsncpy(argv0_path, buf, MAXPATHLEN); |
|
19261
ca7dbacbbe18
With WITH_NEXT_FRAMEWORK defined we now also expect a normal Python
Jack Jansen <jack.jansen@cwi.nl>
parents:
19061
diff
changeset
|
527 } |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
528 } |
|
9970
8efa37a770c6
Patches by William Lewis for Nextstep descendants.
Guido van Rossum <guido@python.org>
parents:
8203
diff
changeset
|
529 #endif |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
530 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
531 #if HAVE_READLINK |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
532 { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
533 wchar_t tmpbuffer[MAXPATHLEN+1]; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
534 int linklen = _Py_wreadlink(progpath, tmpbuffer, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
535 while (linklen != -1) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
536 if (tmpbuffer[0] == SEP) |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
537 /* tmpbuffer should never be longer than MAXPATHLEN, |
|
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
538 but extra check does not hurt */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
539 wcsncpy(argv0_path, tmpbuffer, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
540 else { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
541 /* Interpret relative to progpath */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
542 reduce(argv0_path); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
543 joinpath(argv0_path, tmpbuffer); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
544 } |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
545 linklen = _Py_wreadlink(argv0_path, tmpbuffer, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
546 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
547 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
548 #endif /* HAVE_READLINK */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
549 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
550 reduce(argv0_path); |
|
14898
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
551 /* At this point, argv0_path is guaranteed to be less than |
|
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
552 MAXPATHLEN bytes long. |
|
4bea4f59c4e4
Fix buffer overflow vulnerabilities in calculate_path(). Code used
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
14845
diff
changeset
|
553 */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
554 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
555 if (!(pfound = search_for_prefix(argv0_path, home))) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
556 if (!Py_FrozenFlag) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
557 fprintf(stderr, |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
558 "Could not find platform independent libraries <prefix>\n"); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
559 wcsncpy(prefix, L"" PREFIX, MAXPATHLEN); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
560 joinpath(prefix, lib_python); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
561 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
562 else |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
563 reduce(prefix); |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
564 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
565 wcsncpy(zip_path, prefix, MAXPATHLEN); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
566 zip_path[MAXPATHLEN] = L'\0'; |
|
26885
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
567 if (pfound > 0) { /* Use the reduced prefix returned by Py_GetPrefix() */ |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
568 reduce(zip_path); |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
569 reduce(zip_path); |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
570 } |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
571 else |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
572 wcsncpy(zip_path, L"" PREFIX, MAXPATHLEN); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
573 joinpath(zip_path, L"lib/python00.zip"); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
574 bufsz = wcslen(zip_path); /* Replace "00" with version */ |
|
26885
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
575 zip_path[bufsz - 6] = VERSION[0]; |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
576 zip_path[bufsz - 5] = VERSION[2]; |
|
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
577 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
578 if (!(efound = search_for_exec_prefix(argv0_path, home))) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
579 if (!Py_FrozenFlag) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
580 fprintf(stderr, |
|
20156
416f0bc228e8
Be more rigorous about making pathnames absolute, to address SF bug
Guido van Rossum <guido@python.org>
parents:
19261
diff
changeset
|
581 "Could not find platform dependent libraries <exec_prefix>\n"); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
582 wcsncpy(exec_prefix, L"" EXEC_PREFIX, MAXPATHLEN); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
583 joinpath(exec_prefix, L"lib/lib-dynload"); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
584 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
585 /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
586 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
587 if ((!pfound || !efound) && !Py_FrozenFlag) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
588 fprintf(stderr, |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
589 "Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]\n"); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
590 |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
591 /* Calculate size of return buffer. |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
592 */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
593 bufsz = 0; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
594 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
595 if (_rtpypath) { |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
596 size_t s = mbstowcs(rtpypath, _rtpypath, sizeof(rtpypath)/sizeof(wchar_t)); |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
597 if (s == (size_t)-1 || s >=sizeof(rtpypath)) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
598 /* XXX deal with errors more gracefully */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
599 _rtpypath = NULL; |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
600 if (_rtpypath) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
601 bufsz += wcslen(rtpypath) + 1; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
602 } |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
603 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
604 prefixsz = wcslen(prefix) + 1; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
605 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
606 while (1) { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
607 wchar_t *delim = wcschr(defpath, DELIM); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
608 |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
609 if (defpath[0] != SEP) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
610 /* Paths are relative to prefix */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
611 bufsz += prefixsz; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
612 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
613 if (delim) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
614 bufsz += delim - defpath + 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
615 else { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
616 bufsz += wcslen(defpath) + 1; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
617 break; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
618 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
619 defpath = delim + 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
620 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
621 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
622 bufsz += wcslen(zip_path) + 1; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
623 bufsz += wcslen(exec_prefix) + 1; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
624 |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
625 /* This is the only malloc call in this file */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
626 buf = (wchar_t *)PyMem_Malloc(bufsz*sizeof(wchar_t)); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
627 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
628 if (buf == NULL) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
629 /* We can't exit, so print a warning and limp along */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
630 fprintf(stderr, "Not enough memory for dynamic PYTHONPATH.\n"); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
631 fprintf(stderr, "Using default static PYTHONPATH.\n"); |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
632 module_search_path = L"" PYTHONPATH; |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
633 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
634 else { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
635 /* Run-time value of $PYTHONPATH goes first */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
636 if (_rtpypath) { |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
637 wcscpy(buf, rtpypath); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
638 wcscat(buf, delimiter); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
639 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
640 else |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
641 buf[0] = '\0'; |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
642 |
|
26885
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
643 /* Next is the default zip path */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
644 wcscat(buf, zip_path); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
645 wcscat(buf, delimiter); |
|
26885
54aacb87beda
PEP 302 + zipimport:
Just van Rossum <just@letterror.com>
parents:
26764
diff
changeset
|
646 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
647 /* Next goes merge of compile-time $PYTHONPATH with |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
648 * dynamically located prefix. |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
649 */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
650 defpath = pythonpath; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
651 while (1) { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
652 wchar_t *delim = wcschr(defpath, DELIM); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
653 |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
654 if (defpath[0] != SEP) { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
655 wcscat(buf, prefix); |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
656 wcscat(buf, separator); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
657 } |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
658 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
659 if (delim) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
660 size_t len = delim - defpath + 1; |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
661 size_t end = wcslen(buf) + len; |
|
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
662 wcsncat(buf, defpath, len); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
663 *(buf + end) = '\0'; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
664 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
665 else { |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
666 wcscat(buf, defpath); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
667 break; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
668 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
669 defpath = delim + 1; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
670 } |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
671 wcscat(buf, delimiter); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
672 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
673 /* Finally, on goes the directory for dynamic-load modules */ |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
674 wcscat(buf, exec_prefix); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
675 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
676 /* And publish the results */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
677 module_search_path = buf; |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
678 } |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
679 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
680 /* Reduce prefix and exec_prefix to their essence, |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
681 * e.g. /usr/local/lib/python1.5 is reduced to /usr/local. |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
682 * If we're loading relative to the build directory, |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
683 * return the compiled-in defaults instead. |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
684 */ |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
685 if (pfound > 0) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
686 reduce(prefix); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
687 reduce(prefix); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
688 /* The prefix is the root directory, but reduce() chopped |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
689 * off the "/". */ |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
690 if (!prefix[0]) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
691 wcscpy(prefix, separator); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
692 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
693 else |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
694 wcsncpy(prefix, L"" PREFIX, MAXPATHLEN); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
695 |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
696 if (efound > 0) { |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
697 reduce(exec_prefix); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
698 reduce(exec_prefix); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
699 reduce(exec_prefix); |
|
61466
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
700 if (!exec_prefix[0]) |
|
cab14be0ada1
Recorded merge of revisions 81029 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents:
59532
diff
changeset
|
701 wcscpy(exec_prefix, separator); |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
702 } |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
703 else |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
704 wcsncpy(exec_prefix, L"" EXEC_PREFIX, MAXPATHLEN); |
|
5300
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
705 } |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
706 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
707 |
|
e77942562dd3
Completely revamped the way the default path is constructed.
Guido van Rossum <guido@python.org>
parents:
4503
diff
changeset
|
708 /* External interface */ |
|
64955
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
709 void |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
710 Py_SetPath(const wchar_t *path) |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
711 { |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
712 if (module_search_path != NULL) { |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
713 free(module_search_path); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
714 module_search_path = NULL; |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
715 } |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
716 if (path != NULL) { |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
717 extern wchar_t *Py_GetProgramName(void); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
718 wchar_t *prog = Py_GetProgramName(); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
719 wcsncpy(progpath, prog, MAXPATHLEN); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
720 exec_prefix[0] = prefix[0] = L'\0'; |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
721 module_search_path = malloc((wcslen(path) + 1) * sizeof(wchar_t)); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
722 if (module_search_path != NULL) |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
723 wcscpy(module_search_path, path); |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
724 } |
|
fd5e51035335
issue 9910
Kristján Valur Jónsson <kristjan@ccpgames.com>
parents:
63982
diff
changeset
|
725 } |
| 2896 | 726 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
727 wchar_t * |
|
13651
8a063423e0b7
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)',
Thomas Wouters <thomas@python.org>
parents:
13620
diff
changeset
|
728 Py_GetPath(void) |
| 2896 | 729 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
730 if (!module_search_path) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
731 calculate_path(); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
732 return module_search_path; |
| 2896 | 733 } |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
734 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
735 wchar_t * |
|
13651
8a063423e0b7
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)',
Thomas Wouters <thomas@python.org>
parents:
13620
diff
changeset
|
736 Py_GetPrefix(void) |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
737 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
738 if (!module_search_path) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
739 calculate_path(); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
740 return prefix; |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
741 } |
|
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
742 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
743 wchar_t * |
|
13651
8a063423e0b7
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)',
Thomas Wouters <thomas@python.org>
parents:
13620
diff
changeset
|
744 Py_GetExecPrefix(void) |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
745 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
746 if (!module_search_path) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
747 calculate_path(); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
748 return exec_prefix; |
|
3674
3eaf2c673a11
provide access to $(exec_)prefix
Guido van Rossum <guido@python.org>
parents:
3621
diff
changeset
|
749 } |
|
5568
139ab21d2629
Make delimiter and separator static for K&R C.
Guido van Rossum <guido@python.org>
parents:
5500
diff
changeset
|
750 |
|
46318
22a74eaf6b22
Change command line processing API to use wchar_t.
Martin v. Löwis <martin@v.loewis.de>
parents:
41554
diff
changeset
|
751 wchar_t * |
|
13651
8a063423e0b7
Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)',
Thomas Wouters <thomas@python.org>
parents:
13620
diff
changeset
|
752 Py_GetProgramFullPath(void) |
|
5568
139ab21d2629
Make delimiter and separator static for K&R C.
Guido van Rossum <guido@python.org>
parents:
5500
diff
changeset
|
753 { |
|
13428
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
754 if (!module_search_path) |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
755 calculate_path(); |
|
0d6af303a86c
ANSI-fied sources, converted to four-space indentation.
Fred Drake <fdrake@acm.org>
parents:
13256
diff
changeset
|
756 return progpath; |
|
5568
139ab21d2629
Make delimiter and separator static for K&R C.
Guido van Rossum <guido@python.org>
parents:
5500
diff
changeset
|
757 } |
|
37879
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
758 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
759 |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
760 #ifdef __cplusplus |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
761 } |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
762 #endif |
|
f731859e9b3b
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
Thomas Wouters <thomas@python.org>
parents:
36623
diff
changeset
|
763 |
