Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.78
diff -c -r1.78 main.c
*** main.c	29 Jun 2003 17:07:06 -0000	1.78
--- main.c	25 Aug 2003 00:06:03 -0000
***************
*** 117,122 ****
--- 117,135 ----
  	/*NOTREACHED*/
  }
  
+ static void RunStartupFile(PyCompilerFlags *cf)
+ {
+ 	char *startup = Py_GETENV("PYTHONSTARTUP");
+ 	if (startup != NULL && startup[0] != '\0') {
+ 		FILE *fp = fopen(startup, "r");
+ 		if (fp != NULL) {
+ 			(void) PyRun_SimpleFileExFlags(fp, startup, 0, cf);
+ 			PyErr_Clear();
+ 			fclose(fp);
+ 		}
+ 	}
+ }
+ 
  
  /* Main program */
  
***************
*** 401,415 ****
  	}
  	else {
  		if (filename == NULL && stdin_is_interactive) {
! 			char *startup = Py_GETENV("PYTHONSTARTUP");
! 			if (startup != NULL && startup[0] != '\0') {
! 				FILE *fp = fopen(startup, "r");
! 				if (fp != NULL) {
! 					(void) PyRun_SimpleFile(fp, startup);
! 					PyErr_Clear();
! 					fclose(fp);
! 				}
! 			}
  		}
  		/* XXX */
  		sts = PyRun_AnyFileExFlags(
--- 414,420 ----
  	}
  	else {
  		if (filename == NULL && stdin_is_interactive) {
! 			RunStartupFile(&cf);
  		}
  		/* XXX */
  		sts = PyRun_AnyFileExFlags(