diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-12-15 22:12:47 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-12-15 22:12:47 (GMT) |
| commit | 1422e9dc60bd795b0bf8d8877087ce1eb6ad6942 (patch) | |
| tree | 161121ac48bd430596a23e4f170617c31b3a05fd | |
| parent | c57772870b3e3399a6d8d03a75113987fbfab4b0 (diff) | |
| download | cpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.zip cpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.tar.gz cpython-1422e9dc60bd795b0bf8d8877087ce1eb6ad6942.tar.bz2 | |
SF patch 493739 2 Bugfixes for 2.2c1 (RISC OS specific), from
Dietmar Schwertberger.
Bugfix candidate.
"""
RISCOS/Modules/getpath_riscos.c:
Include trailing '\0' when using strncpy [copy
strlen(...)+1 characters].
Lib/plat-riscos/riscospath.py:
Use riscosmodule.expand for os.path.abspath.
[fixes problems with site.py where
abspath("<Python$Dir>") returned
join(os.getcwd(), "<Python$Dir>") as e.g.
"SCSI::SCSI4.$.<Python$Dir>" because "<Python$Dir>"
wasn't recognised as an absolute path.]
"""
| -rw-r--r-- | Lib/plat-riscos/riscospath.py | 6 | ||||
| -rw-r--r-- | RISCOS/Modules/getpath_riscos.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Lib/plat-riscos/riscospath.py b/Lib/plat-riscos/riscospath.py index fb0e477..30c0c9f 100644 --- a/Lib/plat-riscos/riscospath.py +++ b/Lib/plat-riscos/riscospath.py @@ -311,10 +311,8 @@ def expandvars(p): return b.tostring(0, swi.swi('OS_GSTrans', 'sbi;..i', p, b, l)) -# Return an absolute path. - -def abspath(p): - return normpath(join(os.getcwd(), p)) +# Return an absolute path. RISC OS' osfscontrol_canonicalise_path does this among others +abspath = os.expand # realpath is a no-op on systems without islink support diff --git a/RISCOS/Modules/getpath_riscos.c b/RISCOS/Modules/getpath_riscos.c index 5ac8b72..ce978c6 100644 --- a/RISCOS/Modules/getpath_riscos.c +++ b/RISCOS/Modules/getpath_riscos.c @@ -11,7 +11,7 @@ calculate_path() int pathlen = strlen(pypath); module_search_path = malloc(pathlen + 1); if (module_search_path) - strncpy(module_search_path, pypath, pathlen); + strncpy(module_search_path, pypath, pathlen + 1); else { fprintf(stderr, "Not enough memory for dynamic PYTHONPATH.\n" |