1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
#! /bin/sh -e
# DP: Do not add /usr/lib/pythonXY.zip on sys.path.
dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
dir="$3/"
elif [ $# -ne 1 ]; then
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
fi
case "$1" in
-patch)
patch $pdir -f --no-backup-if-mismatch -p0 < $0
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
;;
*)
echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
exit 1
esac
exit 0
--- Modules/getpath.c~ 2006-02-20 18:37:39.000000000 +0100
+++ Modules/getpath.c 2008-06-25 13:03:02.000000000 +0200
@@ -371,7 +371,9 @@
char *path = getenv("PATH");
char *prog = Py_GetProgramName();
char argv0_path[MAXPATHLEN+1];
+#ifdef WITH_ZIP_PATH
char zip_path[MAXPATHLEN+1];
+#endif
int pfound, efound; /* 1 if found; -1 if found build directory */
char *buf;
size_t bufsz;
@@ -511,6 +513,7 @@
else
reduce(prefix);
+#ifdef WITH_ZIP_PATH
strncpy(zip_path, prefix, MAXPATHLEN);
zip_path[MAXPATHLEN] = '\0';
if (pfound > 0) { /* Use the reduced prefix returned by Py_GetPrefix() */
@@ -523,6 +526,7 @@
bufsz = strlen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
+#endif
if (!(efound = search_for_exec_prefix(argv0_path, home))) {
if (!Py_FrozenFlag)
@@ -562,7 +566,9 @@
defpath = delim + 1;
}
+#ifdef WITH_ZIP_PATH
bufsz += strlen(zip_path) + 1;
+#endif
bufsz += strlen(exec_prefix) + 1;
/* This is the only malloc call in this file */
@@ -583,9 +589,11 @@
else
buf[0] = '\0';
+#ifdef WITH_ZIP_PATH
/* Next is the default zip path */
strcat(buf, zip_path);
strcat(buf, delimiter);
+#endif
/* Next goes merge of compile-time $PYTHONPATH with
* dynamically located prefix.
|
