diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 19:42:48 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 19:42:48 (GMT) |
| commit | cc3fa88a9c9c371a310673cfea3752a0beb25dac (patch) | |
| tree | f0d922f2156b1b77d88f700becc0768508f8ef71 /Python | |
| parent | a1b2af8034e1da367778de18872f7a1cddcc524e (diff) | |
| download | cpython-cc3fa88a9c9c371a310673cfea3752a0beb25dac.zip cpython-cc3fa88a9c9c371a310673cfea3752a0beb25dac.tar.gz cpython-cc3fa88a9c9c371a310673cfea3752a0beb25dac.tar.bz2 | |
Fix crash at startup with -W options.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/getopt.c | 10 | ||||
| -rw-r--r-- | Python/pythonrun.c | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Python/getopt.c b/Python/getopt.c index 093c3da..e96eb6c 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -37,10 +37,18 @@ extern "C" { int _PyOS_opterr = 1; /* generate error messages */ int _PyOS_optind = 1; /* index into argv array */ char *_PyOS_optarg = NULL; /* optional argument */ +static char *opt_ptr = ""; + +void _PyOS_ResetGetOpt(void) +{ + _PyOS_opterr = 1; + _PyOS_optind = 1; + _PyOS_optarg = NULL; + opt_ptr = ""; +} int _PyOS_GetOpt(int argc, char **argv, char *optstring) { - static char *opt_ptr = ""; char *ptr; int option; diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8e1cd623..dcb2c0e 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -67,7 +67,6 @@ static void call_sys_exitfunc(void); static void call_ll_exitfuncs(void); extern void _PyUnicode_Init(void); extern void _PyUnicode_Fini(void); -extern void _PyRandom_Init(void); #ifdef WITH_THREAD extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *); |