Minor OS/2 fixes

[p5sagit/p5-mst-13.2.git] / miniperlmain.c

diff --git a/miniperlmain.c b/miniperlmain.c
index 2c1e0b6..680b042 100644 (file)
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -20,51 +20,39 @@ static void xs_init _((void));
 static PerlInterpreter *my_perl;
 
 int
-#ifndef CAN_PROTOTYPE
+#ifdef CAN_PROTOTYPE
+main(int argc, char **argv, char **env)
+#else
 main(argc, argv, env)
 int argc;
 char **argv;
 char **env;
-#else  /* def(CAN_PROTOTYPE) */
-main(int argc, char **argv, char **env)
-#endif  /* def(CAN_PROTOTYPE) */
+#endif
 {
     int exitstatus;
 
-#ifdef OS2
-    _response(&argc, &argv);
-    _wildcard(&argc, &argv);
-#endif
-
-#ifdef VMS
-    getredirection(&argc,&argv);
-#endif
+    PERL_SYS_INIT(&argc,&argv);
 
-#if defined(HAS_SETLOCALE) && defined(LC_CTYPE)
-    if (setlocale(LC_CTYPE, "") == NULL) {
-        fprintf(stderr,
-               "setlocale(LC_CTYPE, \"\") failed (LC_CTYPE = \"%s\").\n",
-               getenv("LC_CTYPE"));
-       exit(1);
-    }
-#endif
+    perl_init_i18nl10n(1);
 
     if (!do_undump) {
        my_perl = perl_alloc();
        if (!my_perl)
            exit(1);
        perl_construct( my_perl );
+       perl_destruct_level = 0;
     }
 
-    exitstatus = perl_parse( my_perl, xs_init, argc, argv, NULL );
-    if (exitstatus)
-       exit( exitstatus );
-
-    exitstatus = perl_run( my_perl );
+    exitstatus = perl_parse( my_perl, xs_init, argc, argv, (char **) NULL );
+    if (!exitstatus) {
+       exitstatus = perl_run( my_perl );
+    }
 
     perl_destruct( my_perl );
     perl_free( my_perl );
 
+    PERL_SYS_TERM();
+
     exit( exitstatus );
 }
 
@@ -75,4 +63,5 @@ main(int argc, char **argv, char **env)
 static void
 xs_init()
 {
+  dXSUB_SYS;
 }