Merged revisions 83098 via svnmerge from

ronaldoussoren · ronaldoussoren · commit 7260abc8ad44 · 2010-07-24T10:09:36.000Z
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83098 | ronald.oussoren | 2010-07-23 17:12:28 +0100 (Fri, 23 Jul 2010) | 19 lines

  Merged revisions 83096 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83096 | ronald.oussoren | 2010-07-23 17:05:35 +0100 (Fri, 23 Jul 2010) | 13 lines

    Ensure that sys.prefix can reliably be found
    on OSX. This fixes a small issue that was exposed
    by running test_subprocess through regrtest (and
    hence in a subdirectory).

    Without this patch running python.exe from the
    build tree will fail when these tree conditions
    are true:
    1) the CWD is not the root of build tree
    2) python.exe is found through $PATH
    3) the framework is not yet installed
  ........
................
diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -471,7 +471,7 @@ calculate_path(void)
         if (!ismodule(argv0_path)) {
                 /* We are in the build directory so use the name of the
                    executable - we know that the absolute path is passed */
-                strncpy(argv0_path, prog, MAXPATHLEN);
+                strncpy(argv0_path, progpath, MAXPATHLEN);
         }
         else {
                 /* Use the location of the library as the progpath */

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ calculate_path(void)`
`471`	`471`	`if (!ismodule(argv0_path)) {`
`472`	`472`	`/* We are in the build directory so use the name of the`
`473`	`473`	`executable - we know that the absolute path is passed */`
`474`		`- strncpy(argv0_path, prog, MAXPATHLEN);`
	`474`	`+ strncpy(argv0_path, progpath, MAXPATHLEN);`
`475`	`475`	`}`
`476`	`476`	`else {`
`477`	`477`	`/* Use the location of the library as the progpath */`