[Python-checkins] python/dist/src/Modules main.c,1.76,1.77

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv9840/Modules

Modified Files:
	main.c 
Log Message:
Patch #672053: Return a result from Py_Main, instead of exiting.


Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** main.c	30 Mar 2003 17:00:39 -0000	1.76
--- main.c	30 Mar 2003 17:09:58 -0000	1.77
***************
*** 89,93 ****
  
  
! static void
  usage(int exitcode, char* program)
  {
--- 89,93 ----
  
  
! static int
  usage(int exitcode, char* program)
  {
***************
*** 106,117 ****
  	if (exitcode == 0) {
  		/* suppress 'error' message */
! 		exit(1);
  	}
  	else {
  		/* STS$M_INHIB_MSG + SS$_ABORT */
! 		exit(0x1000002c);
  	}
  #else
! 	exit(exitcode);
  #endif
  	/*NOTREACHED*/
--- 106,117 ----
  	if (exitcode == 0) {
  		/* suppress 'error' message */
! 		return 1;
  	}
  	else {
  		/* STS$M_INHIB_MSG + SS$_ABORT */
! 		return 0x1000002c;
  	}
  #else
! 	return exitcode;
  #endif
  	/*NOTREACHED*/
***************
*** 195,199 ****
  				"-Q option should be `-Qold', "
  				"`-Qwarn', `-Qwarnall', or `-Qnew' only\n");
! 			usage(2, argv[0]);
  			/* NOTREACHED */
  
--- 195,199 ----
  				"-Q option should be `-Qold', "
  				"`-Qwarn', `-Qwarnall', or `-Qnew' only\n");
! 			return usage(2, argv[0]);
  			/* NOTREACHED */
  
***************
*** 256,260 ****
  
  		default:
! 			usage(2, argv[0]);
  			/*NOTREACHED*/
  
--- 256,260 ----
  
  		default:
! 			return usage(2, argv[0]);
  			/*NOTREACHED*/
  
***************
*** 263,271 ****
  
  	if (help)
! 		usage(0, argv[0]);
  
  	if (version) {
  		fprintf(stderr, "Python %s\n", PY_VERSION);
! 		exit(0);
  	}
  
--- 263,271 ----
  
  	if (help)
! 		return usage(0, argv[0]);
  
  	if (version) {
  		fprintf(stderr, "Python %s\n", PY_VERSION);
! 		return 0;
  	}
  
***************
*** 292,296 ****
  				fprintf(stderr, "%s: can't open file '%s'\n",
  					argv[0], filename);
! 				exit(2);
  			}
  			else if (skipfirstline) {
--- 292,296 ----
  				fprintf(stderr, "%s: can't open file '%s'\n",
  					argv[0], filename);
! 				return 2;
  			}
  			else if (skipfirstline) {