From 660bb1d1c792f419a60f779c41d9d39d0dfe2b20 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Tue, 18 Jul 2000 09:40:39 +0000 Subject: [PATCH] MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. --- Mac/Python/macmain.c | 17 ++++++++++++++++- Mac/mwerks/mwerks_carbon_config.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c index d40a70ef6fd..20dd4cb0cea 100644 --- a/Mac/Python/macmain.c +++ b/Mac/Python/macmain.c @@ -256,7 +256,22 @@ init_common(int *argcp, char ***argvp, int embedded) } else { /* Create argc/argv. Do it before we go into the options event loop. */ *argcp = PyMac_GetArgv(argvp, options.noargs); - +#ifdef USE_ARGV0_CHDIR + printf("argc=%d, argv[0]=%x=%s\n", *argcp, (*argvp)[0], (*argvp)[0]); + if (*argcp >= 1 && (*argvp)[0] && (*argvp)[0][0]) { + /* Workaround for MacOS X, which currently (DP4) doesn't set + ** the working folder correctly + */ + char app_wd[256], *p; + + strncpy(app_wd, (*argvp)[0], 256); + printf("Modifying dir, argv[0]=%s\n", (*argvp)[0]); + p = strrchr(app_wd, ':'); + if ( p ) *p = 0; + printf("app_wd=%s\n", app_wd); + chdir(app_wd); + } +#endif /* Do interactive option setting, if allowed and