Patch #696645: Remove VMS code with uncertain authorship.

Modules/getbuildinfo.c

@@ -28,70 +28,11 @@
 #define BUILD 0
 #endif
 
-#ifdef __VMS
-#  ifdef __DECC
-#    pragma extern_model save
-#    pragma extern_model strict_refdef
-extern long ctl$gl_imghdrbf;
-#    pragma extern_model restore
-#  endif
-
-#  ifdef __ALPHA
-#    define EIHD$L_IMGIDOFF 24
-#    define EIHI$Q_LINKTIME  8
-#    define _IMGIDOFF EIHD$L_IMGIDOFF
-#    define _LINKTIME EIHI$Q_LINKTIME
-#  else
-#    define IHD$W_IMGIDOFF  6
-#    define IHI$Q_LINKTIME 56
-#    define _IMGIDOFF IHD$W_IMGIDOFF
-#    define _LINKTIME IHI$Q_LINKTIME
-#  endif /* __VMS */
-
-long*
-vms__get_linktime (void)
-{
-	long* al_imghdrbf;
-	unsigned short* aw_imgidoff;
-	unsigned short	  w_imgidoff;
-	long* aq_linktime;
-	unsigned char* ab_ihi;
-
-	al_imghdrbf = &ctl$gl_imghdrbf;
-
-	al_imghdrbf = (long *)*al_imghdrbf;
-	al_imghdrbf = (long *)*al_imghdrbf;
-
-	aw_imgidoff = (unsigned short *)
-		((unsigned char *)al_imghdrbf + _IMGIDOFF);
-
-	w_imgidoff = *aw_imgidoff;
-
-	ab_ihi = (unsigned char *)al_imghdrbf + w_imgidoff;
-
-	aq_linktime = (long *) (ab_ihi + _LINKTIME);
-
-	return aq_linktime;
-} /* vms__get_linktime (void) */
-extern void vms__cvt_v2u_time (long * aq_vmstime, time_t * al_unixtime);
-			    /* input		, output */
-#endif /* __VMS */
-
-
 const char *
 Py_GetBuildInfo(void)
 {
 	static char buildinfo[50];
-#ifdef __VMS
-	time_t l_unixtime;
-
-	vms__cvt_v2u_time(vms__get_linktime (), &l_unixtime );
-
-	memset(buildinfo, 0, 40);
-	sprintf(buildinfo, "#%d, %.24s", BUILD, ctime (&l_unixtime));
-#else
 	PyOS_snprintf(buildinfo, sizeof(buildinfo),
 		      "#%d, %.20s, %.9s", BUILD, DATE, TIME);
-#endif
 	return buildinfo;
 }

Modules/main.c

@@ -5,8 +5,7 @@
 #include "compile.h" /* For CO_FUTURE_DIVISION */
 
 #ifdef __VMS
-extern int PyVMS_init(int* pvi_argc, char*** pvi_argv);
-extern PyObject* pyvms_gr_empty_string;
+#include <unixlib.h>
 #endif
 
 #if defined(MS_WINDOWS) || defined(__CYGWIN__)
@@ -305,7 +304,14 @@ Py_Main(int argc, char **argv)
 	if (command == NULL && filename == NULL && _PyOS_optind < argc &&
 	    strcmp(argv[_PyOS_optind], "-") != 0)
 	{
+#ifdef __VMS
+		filename = decc$translate_vms(argv[_PyOS_optind]);
+		if (filename == (char *)0 || filename == (char *)-1)
+			filename = argv[_PyOS_optind];
+
+#else
 		filename = argv[_PyOS_optind];
+#endif
 		if (filename != NULL) {
 			if ((fp = fopen(filename, "r")) == NULL) {
 				fprintf(stderr, "%s: can't open file '%s'\n",
@@ -370,43 +376,12 @@ Py_Main(int argc, char **argv)
 #endif /* __VMS */
 
 	Py_SetProgramName(argv[0]);
-#ifdef __VMS
-	PyVMS_init(&argc, &argv);
-#endif
 	Py_Initialize();
 
-#ifdef __VMS
-	/* create an empty string object */
-	pyvms_gr_empty_string = Py_BuildValue("s#", Py_None, (unsigned int)0);
-#endif
-
 	if (Py_VerboseFlag ||
 	    (command == NULL && filename == NULL && stdin_is_interactive))
-#ifndef __VMS
 		fprintf(stderr, "Python %s on %s\n%s\n",
 			Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
-#else
-		fprintf(stderr, "Python %s on %s %s (%s_float)\n%s\n",
-			Py_GetVersion(), Py_GetPlatform(),
-#  ifdef __ALPHA
-			"Alpha",
-#  else
-			"VAX",
-#  endif
-#  if __IEEE_FLOAT
-			"T",
-#  else
-#    if __D_FLOAT
-			"D",
-#    else
-#      if __G_FLOAT
-			"G",
-#      endif /* __G_FLOAT */
-#    endif /* __D_FLOAT */
-#  endif /* __IEEE_FLOAT */
-			COPYRIGHT); /* << @@ defined above in this file */
-/*			Py_GetCopyright()); */
-#endif /* __VMS */
 
 	if (command != NULL) {
 		/* Backup _PyOS_optind and force sys.argv[0] = '-c' */