1 files changed, 6 insertions, 15 deletions
diff --git a/main.c b/main.c
index ddda1d66..19b6c381 100644
--- a/main.c
+++ b/main.c
@@ -294,22 +294,10 @@ main(int argc, char **argv)
 	 * this value once makes a speed difference.
 	 */
 	gawk_mb_cur_max = MB_CUR_MAX;
-#ifdef LIBC_IS_BORKED
-{
-	const char *env_lc;
-
-	env_lc = getenv("LC_ALL");
-	if (env_lc == NULL)
-		env_lc = getenv("LANG");
-	if (env_lc != NULL && env_lc[1] == '\0' && tolower(env_lc[0]) == 'c')
-		gawk_mb_cur_max = 1;
-}
-#endif
 
 	/* init the cache for checking bytes if they're characters */
 	init_btowc_cache();
 
-
 	if (do_nostalgia)
 		nostalgia();
 
@@ -499,9 +487,8 @@ main(int argc, char **argv)
 
 	if (do_debug)
 		debug_prog(code_block);
-	else if (do_pretty_print && ! do_debug && getenv("GAWK_NO_PP_RUN") != NULL)
-		/* hack to run pretty printer only. need a better solution */
-		;
+	else if (do_pretty_print && ! do_profile)
+		;	/* run pretty printer only. */
 	else
 		interpret(code_block);
 
@@ -895,6 +882,10 @@ load_environ()
 	 */
 	path_environ("AWKPATH", defpath);
 	path_environ("AWKLIBPATH", deflibpath);
+
+	/* set up array functions */
+	init_env_array(ENVIRON_node);
+
 	return ENVIRON_node;
 }