Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.]
"""
This commit is contained in:
Tim Peters 2001-12-15 22:12:47 +00:00
parent c57772870b
commit 1422e9dc60
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/plat-riscos/riscospath.py
View File

@ -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

2
RISCOS/Modules/getpath_riscos.c
View File

@ -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"