| pulkit |
| hg-reviewers |
A few *s move around, some spaces around parens, a couple of
braces. Nothing remarkable.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| return !strncat(d, s, n); | return !strncat(d, s, n); | ||||
| } | } | ||||
| int strcpy_s(char *d, size_t n, const char *s) | int strcpy_s(char *d, size_t n, const char *s) | ||||
| { | { | ||||
| return !strncpy(d, s, n); | return !strncpy(d, s, n); | ||||
| } | } | ||||
| #endif | #endif | ||||
| static char pyscript[MAX_PATH + 10]; | static char pyscript[MAX_PATH + 10]; | ||||
| static char pyhome[MAX_PATH + 10]; | static char pyhome[MAX_PATH + 10]; | ||||
| static char envpyhome[MAX_PATH + 10]; | static char envpyhome[MAX_PATH + 10]; | ||||
| static char pydllfile[MAX_PATH + 10]; | static char pydllfile[MAX_PATH + 10]; | ||||
| int main(int argc, char *argv[]) | int main(int argc, char *argv[]) | ||||
| { | { | ||||
| char *p; | char *p; | ||||
| int ret; | int ret; | ||||
| int i; | int i; | ||||
| int n; | int n; | ||||
| char **pyargv; | char **pyargv; | ||||
| WIN32_FIND_DATA fdata; | WIN32_FIND_DATA fdata; | ||||
| HANDLE hfind; | HANDLE hfind; | ||||
| const char *err; | const char *err; | ||||
| HMODULE pydll; | HMODULE pydll; | ||||
| void (__cdecl *Py_SetPythonHome)(char *home); | void(__cdecl * Py_SetPythonHome)(char *home); | ||||
| int (__cdecl *Py_Main)(int argc, char *argv[]); | int(__cdecl * Py_Main)(int argc, char *argv[]); | ||||
| if (GetModuleFileName(NULL, pyscript, sizeof(pyscript)) == 0) | if (GetModuleFileName(NULL, pyscript, sizeof(pyscript)) == 0) { | ||||
| { | |||||
| err = "GetModuleFileName failed"; | err = "GetModuleFileName failed"; | ||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| p = strrchr(pyscript, '.'); | p = strrchr(pyscript, '.'); | ||||
| if (p == NULL) { | if (p == NULL) { | ||||
| err = "malformed module filename"; | err = "malformed module filename"; | ||||
| goto bail; | goto bail; | ||||
| if (hfind != INVALID_HANDLE_VALUE) { | if (hfind != INVALID_HANDLE_VALUE) { | ||||
| /* Path .\hg-python exists. We are probably in HackableMercurial | /* Path .\hg-python exists. We are probably in HackableMercurial | ||||
| scenario, so let's load python dll from this dir. */ | scenario, so let's load python dll from this dir. */ | ||||
| FindClose(hfind); | FindClose(hfind); | ||||
| strcpy_s(pydllfile, sizeof(pydllfile), pyhome); | strcpy_s(pydllfile, sizeof(pydllfile), pyhome); | ||||
| strcat_s(pydllfile, sizeof(pydllfile), "\\" HGPYTHONLIB ".dll"); | strcat_s(pydllfile, sizeof(pydllfile), "\\" HGPYTHONLIB ".dll"); | ||||
| pydll = LoadLibrary(pydllfile); | pydll = LoadLibrary(pydllfile); | ||||
| if (pydll == NULL) { | if (pydll == NULL) { | ||||
| err = "failed to load private Python DLL " HGPYTHONLIB ".dll"; | err = "failed to load private Python DLL " HGPYTHONLIB | ||||
| ".dll"; | |||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| Py_SetPythonHome = (void*)GetProcAddress(pydll, "Py_SetPythonHome"); | Py_SetPythonHome = | ||||
| (void *)GetProcAddress(pydll, "Py_SetPythonHome"); | |||||
| if (Py_SetPythonHome == NULL) { | if (Py_SetPythonHome == NULL) { | ||||
| err = "failed to get Py_SetPythonHome"; | err = "failed to get Py_SetPythonHome"; | ||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| Py_SetPythonHome(pyhome); | Py_SetPythonHome(pyhome); | ||||
| } | } | ||||
| if (pydll == NULL) { | if (pydll == NULL) { | ||||
| pydll = LoadLibrary(HGPYTHONLIB ".dll"); | pydll = LoadLibrary(HGPYTHONLIB ".dll"); | ||||
| if (pydll == NULL) { | if (pydll == NULL) { | ||||
| err = "failed to load Python DLL " HGPYTHONLIB ".dll"; | err = "failed to load Python DLL " HGPYTHONLIB ".dll"; | ||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| } | } | ||||
| Py_Main = (void*)GetProcAddress(pydll, "Py_Main"); | Py_Main = (void *)GetProcAddress(pydll, "Py_Main"); | ||||
| if (Py_Main == NULL) { | if (Py_Main == NULL) { | ||||
| err = "failed to get Py_Main"; | err = "failed to get Py_Main"; | ||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| /* | /* | ||||
| Only add the pyscript to the args, if it's not already there. It may | Only add the pyscript to the args, if it's not already there. It may | ||||
| already be there, if the script spawned a child process of itself, in | already be there, if the script spawned a child process of itself, in | ||||
| return Py_Main(argc, argv); | return Py_Main(argc, argv); | ||||
| } | } | ||||
| /* | /* | ||||
| Start assembling the args for the Python interpreter call. We put the | Start assembling the args for the Python interpreter call. We put the | ||||
| name of our exe (argv[0]) in the position where the python.exe | name of our exe (argv[0]) in the position where the python.exe | ||||
| canonically is, and insert the pyscript next. | canonically is, and insert the pyscript next. | ||||
| */ | */ | ||||
| pyargv = malloc((argc + 5) * sizeof(char*)); | pyargv = malloc((argc + 5) * sizeof(char *)); | ||||
| if (pyargv == NULL) { | if (pyargv == NULL) { | ||||
| err = "not enough memory"; | err = "not enough memory"; | ||||
| goto bail; | goto bail; | ||||
| } | } | ||||
| n = 0; | n = 0; | ||||
| pyargv[n++] = argv[0]; | pyargv[n++] = argv[0]; | ||||
| pyargv[n++] = pyscript; | pyargv[n++] = pyscript; | ||||