Gisle Aas wrote:
> My original patch did show "-f" in the perl -h output, and I think
> that is slightly better. I don't mind much either way.
>
> The compiler warning could probably be fixed by helping the complier
> out a bit.
Good point, I thus applied the following (should solve warnings as well)
The -f help message seems to imply that sitecustomize.pl is always
executed, maybe an alternative phrasing when USE_SITECUSTOMIZE is not
defined would be a good idea.
==== //depot/perl/perl.c#626 (text) ====
@@ -1378,13 +1378,13 @@
sv_catpv(PL_e_script, "\n");
break;
+ case 'f':
#ifdef USE_SITECUSTOMIZE
- case 'f':
minus_f = TRUE;
+#endif
s++;
goto reswitch;
-#endif
case 'I': /* -I handled both here and in moreswitches() */
forbid_setid("-I");
if (!*++s && (s=argv[1]) != Nullch) {
@@ -2439,9 +2439,7 @@
"-d[:debugger] run program under debugger",
"-D[number/list] set debugging flags (argument is a bit mask or alphabets)",
"-e program one line of program (several -e's allowed, omit
programfile)",
-#ifdef USE_SITECUSTOMIZE
"-f don't do $sitelib/sitecustomize.pl at startup",
-#endif
"-F/pattern/ split() pattern for -a switch (//'s are optional)",
"-i[extension] edit <> files in place (makes backup if extension
supplied)",
"-Idirectory specify @INC/#include directory (several -I's allowed)",
