Commit 6e1dcfa7 authored by Guido van Rossum's avatar Guido van Rossum

New style names for getprogramname and getargcargv

parent 66bdfc5e
...@@ -38,10 +38,10 @@ extern char *Py_GetVersion(); ...@@ -38,10 +38,10 @@ extern char *Py_GetVersion();
extern char *Py_GetCopyright(); extern char *Py_GetCopyright();
/* For getprogramname(); set by main() */ /* For Py_GetProgramName(); set by main() */
static char *argv0; static char *argv0;
/* For getargcargv(); set by main() */ /* For Py_GetArgcArgv(); set by main() */
static char **orig_argv; static char **orig_argv;
static int orig_argc; static int orig_argc;
...@@ -88,9 +88,9 @@ main(argc, argv) ...@@ -88,9 +88,9 @@ main(argc, argv)
int inspect = 0; int inspect = 0;
int unbuffered = 0; int unbuffered = 0;
orig_argc = argc; /* For getargcargv() */ orig_argc = argc; /* For Py_GetArgcArgv() */
orig_argv = argv; orig_argv = argv;
argv0 = argv[0]; /* For getprogramname() */ argv0 = argv[0]; /* For Py_GetProgramName() */
if ((p = getenv("PYTHONDEBUG")) && *p != '\0') if ((p = getenv("PYTHONDEBUG")) && *p != '\0')
Py_DebugFlag = 1; Py_DebugFlag = 1;
...@@ -223,7 +223,7 @@ main(argc, argv) ...@@ -223,7 +223,7 @@ main(argc, argv)
(currently _tkinter.c and importdl.c). */ (currently _tkinter.c and importdl.c). */
char * char *
getprogramname() Py_GetProgramName()
{ {
return argv0; return argv0;
} }
...@@ -233,7 +233,7 @@ getprogramname() ...@@ -233,7 +233,7 @@ getprogramname()
This is rare, but it is needed by the secureware extension. */ This is rare, but it is needed by the secureware extension. */
void void
getargcargv(argc,argv) Py_GetArgcArgv(argc, argv)
int *argc; int *argc;
char ***argv; char ***argv;
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment