Introduce pp_lock.

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

diff --git a/miniperlmain.c b/miniperlmain.c
index 9f3e1d6..680b042 100644 (file)
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -19,80 +19,40 @@ extern "C" {
 static void xs_init _((void));
 static PerlInterpreter *my_perl;
 
-void
-i18nl14n()
-{
-  char * lang = getenv("LANG");
-#if defined(HAS_SETLOCALE) && defined(LC_CTYPE)
-  {
-    char * lc_all   = getenv("LC_ALL");
-    char * lc_ctype = getenv("LC_CTYPE");
-    int i;
-
-    if (setlocale(LC_CTYPE, "") == NULL && (lc_all || lc_ctype || lang)) {
-      fprintf(stderr, "warning: setlocale(LC_CTYPE, \"\") failed.\n");
-      fprintf(stderr,
-             "warning: LC_ALL = \"%s\", LC_CTYPE = \"%s\", LANG = \"%s\",\n",
-             lc_all   ? lc_all   : "(null)",
-             lc_ctype ? lc_ctype : "(null)",
-             lang     ? lang     : "(null)"
-             );
-      fprintf(stderr, "warning: falling back to the \"C\" locale.\n");
-      setlocale(LC_CTYPE, "C");
-    }
-
-    for (i = 0; i < 256; i++) {
-      if (isUPPER(i)) fold[i] = toLOWER(i);
-      else if (isLOWER(i)) fold[i] = toUPPER(i);
-      else fold[i] = i;
-    }
-
-  }
-#endif
-}
-
 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);
 
-/* here a union of the cpp #if:s inside i18nl14n() */
-#if (defined(HAS_SETLOCALE) && defined(LC_CTYPE))
-    i18nl14n();
-#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, (char **) NULL );
-    if (exitstatus)
-       exit( exitstatus );
-
-    exitstatus = perl_run( my_perl );
+    if (!exitstatus) {
+       exitstatus = perl_run( my_perl );
+    }
 
     perl_destruct( my_perl );
     perl_free( my_perl );
 
+    PERL_SYS_TERM();
+
     exit( exitstatus );
 }
 
@@ -103,4 +63,5 @@ main(int argc, char **argv, char **env)
 static void
 xs_init()
 {
+  dXSUB_SYS;
 }