[inseparable changes from patch to perl 5.004_04]perl-5.004_04

[editor's note: this one imported like a charm!]

 TESTS  -

Subject: Improve pragma/locale test 102 - and don't fail, just warn
From: Jarkko Hietaniemi <jhi@anna.in-berlin.de>
Files: t/pragma/locale.t

Subject: Invalid test output in t/op/taint.t in trial 1
From: Dan Sugalski <sugalsd@lbcc.cc.or.us>
Files: t/op/taint.t

    t/op/taint.t prints out invalid ok messages for tests it skips.
    Rather than printing "ok 136" it prints "136 ok".
    
    p5p-msgid: 3.0.3.32.19970919160918.00857a50@stargate.lbcc.cc.or.us

 UTILITIES  -

Subject: Perldoc tiny patch to avoid $0
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: utils/perldoc.PL
Msg-ID: 199709122141.RAA16846@monk.mps.ohio-state.edu

    (applied based on p5p patch as commit 0b166b6635cf199f072db516b2a523ee659394d5)

Subject: h2ph broken in 5.004_02
From: David Mazieres <dm@reeducation-labor.lcs.mit.edu>
Files: utils/h2ph.PL
Msg-ID: 199708201700.KAA02621@www.chapin.edu

    (applied based on p5p patch as commit 4a8e146e38ec2045f1f817a7cb578e1b1f80f39f)

Subject: add key_t caddr_t to h2ph
From: Tony Sanders <sanders@bsdi.com>
Files: eg/sysvipc/ipcsem utils/h2ph.PL
Msg-ID: 199708272301.RAA12803@austin.bsdi.com

    (applied based on p5p patch as commit 0806a92ffc3a74ca70aa81051cdf2a306cd0a8af)

Subject: perldoc search ., lib and blib/* if -f 'Makefile.PL'
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

    Subject: perldoc finds wrong pod2man
    
    (from perldoc source)
    
        # We must look both in @INC for library modules and in PATH
        # for executables, like h2xs or perldoc itself.
    
    Unfortunately, searching PATH for installed perl executables like
    pod2man is INCORRECT.  perldoc should start by searching the
    directory it was executed from, which might not be in the PATH
    at all.
    
    Credited: Joseph "Moof-in'" Hall <joseph@cscaper.com>
    
    p5p-msgid: 199708251732.KAA19299@gadget.cscaper.com

Subject: 5.004m4t1: perlbug: NIS domainname gets into wrong places
From: Andreas J. Koenig <koenig@anna.mind.de>
Files: utils/perlbug.PL
Msg-ID: sfcg1qy38as.fsf@anna.in-berlin.de

    (applied based on p5p patch as commit 41f926b844140b7f7eaa9302113e45df3a9f9ff4)

Subject: add better local patch info to perlbug
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perlbug.PL

Subject: perldoc - suggest modules if requested module not found
From: Anthony David <adavid@netinfo.com.au>
Files: utils/perldoc.PL

    private-msgid: 3439CD83.6969@netinfo.com.au

Subject: perldoc mail::foo tries to read binary /usr/ucb/mail
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

    Subject: perldoc weirdness
    
    perldoc mail::imap yields:
    
    {joseph}:79% perldoc mail::foo
    can't open /usr/ucb/mail: Permission denied at ./pod2man line 362.
    
    Credited: Joseph "Moof-in'" Hall <joseph@cscaper.com>
    
    p5p-msgid: 199710082014.NAA00808@gadget.cscaper.com

Subject: perldoc -f setpwent (for example) returns no descriptive text
From: Tim Bunce <Tim.Bunce@ig.co.uk>
Files: utils/perldoc.PL

Subject: perldoc diffs: don't search auto - much faster
From: "Joseph N. Hall" <joseph@5sigma.com>
Files: utils/perldoc.PL
Msg-ID: MailDrop1.2d7dPPC.971012211957@screechy.cscaper.com

    (applied based on p5p patch as commit 62b753c6ae4ab9bf22fbb6ec7ceac820bcef8fe4)

1 files changed, 57 insertions, 6 deletions

diff --git a/mg.c b/mg.c
index 7c7ea2a97d..ee87d47859 100644
--- a/mg.c
+++ b/mg.c
@@ -357,8 +357,15 @@ MAGIC *mg;
 	}
 #else
 #ifdef OS2
-	sv_setnv(sv, (double)Perl_rc);
-	sv_setpv(sv, os2error(Perl_rc));
+	if (!(_emx_env & 0x200)) {	/* Under DOS */
+	    sv_setnv(sv, (double)errno);
+	    sv_setpv(sv, errno ? Strerror(errno) : "");
+	} else {
+	    if (errno != errno_isOS2)
+		Perl_rc = _syserrno();
+	    sv_setnv(sv, (double)Perl_rc);
+	    sv_setpv(sv, os2error(Perl_rc));
+	}
 #else
 	sv_setnv(sv, (double)errno);
 	sv_setpv(sv, errno ? Strerror(errno) : "");
@@ -384,6 +391,14 @@ MAGIC *mg;
     case '\020':		/* ^P */
 	sv_setiv(sv, (IV)perldb);
 	break;
+    case '\023':		/* ^S */
+	if (lex_state != LEX_NOTPARSING)
+	    SvOK_off(sv);
+	else if (in_eval)
+	    sv_setiv(sv, 1);
+	else
+	    sv_setiv(sv, 0);
+	break;
     case '\024':		/* ^T */
 #ifdef BIG_TIME
  	sv_setnv(sv, basetime);
@@ -654,6 +669,28 @@ MAGIC* mg;
 }
 
 int
+magic_set_all_env(sv,mg)
+SV* sv;
+MAGIC* mg;
+{
+#if defined(VMS)
+    die("Can't make list assignment to %%ENV on this system");
+#else
+    if (localizing) {
+	HE* entry;
+	magic_clear_all_env(sv,mg);
+	hv_iterinit((HV*)sv);
+	while (entry = hv_iternext((HV*)sv)) {
+	    I32 keylen;
+	    my_setenv(hv_iterkey(entry, &keylen),
+		      SvPV(hv_iterval((HV*)sv, entry), na));
+	}
+    }
+#endif
+    return 0;
+}
+
+int
 magic_clear_all_env(sv,mg)
 SV* sv;
 MAGIC* mg;
@@ -1601,16 +1638,28 @@ MAGIC* mg;
 	    s += strlen(s);
 	    /* See if all the arguments are contiguous in memory */
 	    for (i = 1; i < origargc; i++) {
-		if (origargv[i] == s + 1)
+		if (origargv[i] == s + 1
+#ifdef OS2
+		    || origargv[i] == s + 2
+#endif 
+		   )
 		    s += strlen(++s);	/* this one is ok too */
+		else
+		    break;
 	    }
 	    /* can grab env area too? */
-	    if (origenviron && origenviron[0] == s + 1) {
+	    if (origenviron && (origenviron[0] == s + 1
+#ifdef OS2
+				|| (origenviron[0] == s + 9 && (s += 8))
+#endif 
+	       )) {
 		my_setenv("NoNe  SuCh", Nullch);
 					    /* force copy of environment */
 		for (i = 0; origenviron[i]; i++)
 		    if (origenviron[i] == s + 1)
 			s += strlen(++s);
+		    else
+			break;
 	    }
 	    origalen = s - origargv[0];
 	}
@@ -1618,9 +1667,11 @@ MAGIC* mg;
 	i = len;
 	if (i >= origalen) {
 	    i = origalen;
-	    SvCUR_set(sv, i);
-	    *SvEND(sv) = '\0';
+	    /* don't allow system to limit $0 seen by script */
+	    /* SvCUR_set(sv, i); *SvEND(sv) = '\0'; */
 	    Copy(s, origargv[0], i, char);
+	    s = origargv[0]+i;
+	    *s = '\0';
 	}
 	else {
 	    Copy(s, origargv[0], i, char);