From: Gurusamy Sarathy <gsar@cpan.org>
Date: Tue, 6 Jul 1999 06:52:57 +0000 (+0000)
Subject: integrate cfgperl contents into mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=626727d5e2c1f691a308ce30d70cf3d5998f4c53;p=p5sagit%2Fp5-mst-13.2.git

integrate cfgperl contents into mainline

p4raw-id: //depot/perl@3601
---

626727d5e2c1f691a308ce30d70cf3d5998f4c53
diff --cc ext/DynaLoader/dl_vms.xs
index 3640b0f,4db0cc9..d83d532
--- a/ext/DynaLoader/dl_vms.xs
+++ b/ext/DynaLoader/dl_vms.xs
@@@ -228,6 -228,7 +228,7 @@@ dl_load_file(filespec, flags
      char *	filespec
      int		flags
      PREINIT:
 -    DTHX;
++    dTHX;
      char vmsspec[NAM$C_MAXRSS];
      SV *reqSV, **reqSVhndl;
      STRLEN deflen;
diff --cc pp.c
index a42c611,786733e..adf3d73
--- a/pp.c
+++ b/pp.c
@@@ -2308,26 -2308,26 +2308,27 @@@ PP(pp_ucfirst
  	    s = (U8*)SvPV_force(sv, slen);
  	    Copy(tmpbuf, s, ulen, U8);
  	}
- 	RETURN;
 -    } else {
 +    }
- 
-     if (!SvPADTMP(sv)) {
- 	dTARGET;
- 	sv_setsv(TARG, sv);
- 	sv = TARG;
- 	SETs(sv);
-     }
-     s = (U8*)SvPV_force(sv, slen);
-     if (*s) {
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(sv);
- 	    *s = toUPPER_LC(*s);
++    else {
+ 	if (!SvPADTMP(sv)) {
+ 	    dTARGET;
+ 	    sv_setsv(TARG, sv);
+ 	    sv = TARG;
+ 	    SETs(sv);
+ 	}
+ 	s = (U8*)SvPV_force(sv, slen);
+ 	if (*s) {
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(sv);
+ 		*s = toUPPER_LC(*s);
+ 	    }
+ 	    else
+ 		*s = toUPPER(*s);
  	}
- 	else
- 	    *s = toUPPER(*s);
      }
- 
+     if (SvSMAGICAL(sv))
+ 	mg_set(sv);
      RETURN;
  }
  
@@@ -2364,27 -2364,27 +2365,28 @@@ PP(pp_lcfirst
  	    s = (U8*)SvPV_force(sv, slen);
  	    Copy(tmpbuf, s, ulen, U8);
  	}
- 	RETURN;
 -    } else {
 +    }
- 
-     if (!SvPADTMP(sv)) {
- 	dTARGET;
- 	sv_setsv(TARG, sv);
- 	sv = TARG;
- 	SETs(sv);
-     }
-     s = (U8*)SvPV_force(sv, slen);
-     if (*s) {
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(sv);
- 	    *s = toLOWER_LC(*s);
++    else {
+ 	if (!SvPADTMP(sv)) {
+ 	    dTARGET;
+ 	    sv_setsv(TARG, sv);
+ 	    sv = TARG;
+ 	    SETs(sv);
+ 	}
+ 	s = (U8*)SvPV_force(sv, slen);
+ 	if (*s) {
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(sv);
+ 		*s = toLOWER_LC(*s);
+ 	    }
+ 	    else
+ 		*s = toLOWER(*s);
  	}
- 	else
- 	    *s = toLOWER(*s);
+ 	SETs(sv);
      }
- 
-     SETs(sv);
+     if (SvSMAGICAL(sv))
+ 	mg_set(sv);
      RETURN;
  }
  
@@@ -2405,56 -2405,55 +2407,57 @@@ PP(pp_uc
  	if (!len) {
  	    sv_setpvn(TARG, "", 0);
  	    SETs(TARG);
- 	    RETURN;
- 	}
- 
- 	(void)SvUPGRADE(TARG, SVt_PV);
- 	SvGROW(TARG, (len * 2) + 1);
- 	(void)SvPOK_only(TARG);
- 	d = (U8*)SvPVX(TARG);
- 	send = s + len;
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(TARG);
- 	    while (s < send) {
- 		d = uv_to_utf8(d, toUPPER_LC_uni( utf8_to_uv(s, &ulen)));
- 		s += ulen;
- 	    }
 -	} else {
 +	}
 +	else {
- 	    while (s < send) {
- 		d = uv_to_utf8(d, toUPPER_utf8( s ));
- 		s += UTF8SKIP(s);
+ 	    (void)SvUPGRADE(TARG, SVt_PV);
+ 	    SvGROW(TARG, (len * 2) + 1);
+ 	    (void)SvPOK_only(TARG);
+ 	    d = (U8*)SvPVX(TARG);
+ 	    send = s + len;
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(TARG);
+ 		while (s < send) {
+ 		    d = uv_to_utf8(d, toUPPER_LC_uni( utf8_to_uv(s, &ulen)));
+ 		    s += ulen;
+ 		}
+ 	    }
+ 	    else {
+ 		while (s < send) {
+ 		    d = uv_to_utf8(d, toUPPER_utf8( s ));
+ 		    s += UTF8SKIP(s);
+ 		}
  	    }
+ 	    *d = '\0';
+ 	    SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
+ 	    SETs(TARG);
  	}
- 	*d = '\0';
- 	SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
- 	SETs(TARG);
- 	RETURN;
 -    } else {
 +    }
- 
-     if (!SvPADTMP(sv)) {
- 	dTARGET;
- 	sv_setsv(TARG, sv);
- 	sv = TARG;
- 	SETs(sv);
-     }
- 
-     s = (U8*)SvPV_force(sv, len);
-     if (len) {
- 	register U8 *send = s + len;
- 
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(sv);
- 	    for (; s < send; s++)
- 		*s = toUPPER_LC(*s);
- 	}
- 	else {
- 	    for (; s < send; s++)
- 		*s = toUPPER(*s);
++    else {
+ 	if (!SvPADTMP(sv)) {
+ 	    dTARGET;
+ 	    sv_setsv(TARG, sv);
+ 	    sv = TARG;
+ 	    SETs(sv);
+ 	}
+ 	s = (U8*)SvPV_force(sv, len);
+ 	if (len) {
+ 	    register U8 *send = s + len;
+ 
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(sv);
+ 		for (; s < send; s++)
+ 		    *s = toUPPER_LC(*s);
+ 	    }
+ 	    else {
+ 		for (; s < send; s++)
+ 		    *s = toUPPER(*s);
+ 	    }
  	}
      }
+     if (SvSMAGICAL(sv))
+ 	mg_set(sv);
      RETURN;
  }
  
@@@ -2475,56 -2474,56 +2478,58 @@@ PP(pp_lc
  	if (!len) {
  	    sv_setpvn(TARG, "", 0);
  	    SETs(TARG);
- 	    RETURN;
- 	}
- 
- 	(void)SvUPGRADE(TARG, SVt_PV);
- 	SvGROW(TARG, (len * 2) + 1);
- 	(void)SvPOK_only(TARG);
- 	d = (U8*)SvPVX(TARG);
- 	send = s + len;
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(TARG);
- 	    while (s < send) {
- 		d = uv_to_utf8(d, toLOWER_LC_uni( utf8_to_uv(s, &ulen)));
- 		s += ulen;
- 	    }
 -	} else {
 +	}
 +	else {
- 	    while (s < send) {
- 		d = uv_to_utf8(d, toLOWER_utf8(s));
- 		s += UTF8SKIP(s);
+ 	    (void)SvUPGRADE(TARG, SVt_PV);
+ 	    SvGROW(TARG, (len * 2) + 1);
+ 	    (void)SvPOK_only(TARG);
+ 	    d = (U8*)SvPVX(TARG);
+ 	    send = s + len;
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(TARG);
+ 		while (s < send) {
+ 		    d = uv_to_utf8(d, toLOWER_LC_uni( utf8_to_uv(s, &ulen)));
+ 		    s += ulen;
+ 		}
  	    }
+ 	    else {
+ 		while (s < send) {
+ 		    d = uv_to_utf8(d, toLOWER_utf8(s));
+ 		    s += UTF8SKIP(s);
+ 		}
+ 	    }
+ 	    *d = '\0';
+ 	    SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
+ 	    SETs(TARG);
  	}
- 	*d = '\0';
- 	SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
- 	SETs(TARG);
- 	RETURN;
-     }
- 
-     if (!SvPADTMP(sv)) {
- 	dTARGET;
- 	sv_setsv(TARG, sv);
- 	sv = TARG;
- 	SETs(sv);
 -    } else {
 +    }
++    else {
+ 	if (!SvPADTMP(sv)) {
+ 	    dTARGET;
+ 	    sv_setsv(TARG, sv);
+ 	    sv = TARG;
+ 	    SETs(sv);
+ 	}
  
-     s = (U8*)SvPV_force(sv, len);
-     if (len) {
- 	register U8 *send = s + len;
+ 	s = (U8*)SvPV_force(sv, len);
+ 	if (len) {
+ 	    register U8 *send = s + len;
  
- 	if (PL_op->op_private & OPpLOCALE) {
- 	    TAINT;
- 	    SvTAINTED_on(sv);
- 	    for (; s < send; s++)
- 		*s = toLOWER_LC(*s);
- 	}
- 	else {
- 	    for (; s < send; s++)
- 		*s = toLOWER(*s);
+ 	    if (PL_op->op_private & OPpLOCALE) {
+ 		TAINT;
+ 		SvTAINTED_on(sv);
+ 		for (; s < send; s++)
+ 		    *s = toLOWER_LC(*s);
+ 	    }
+ 	    else {
+ 		for (; s < send; s++)
+ 		    *s = toLOWER(*s);
+ 	    }
  	}
      }
+     if (SvSMAGICAL(sv))
+ 	mg_set(sv);
      RETURN;
  }
  
diff --cc pp_sys.c
index 4e34a9e,483ddce..5bb0ca3
--- a/pp_sys.c
+++ b/pp_sys.c
@@@ -1466,6 -1469,6 +1469,10 @@@ PP(pp_sysread
  	if (bufsize >= 256)
  	    bufsize = 255;
  #endif
++#ifdef OS2	/* At least Warp3+IAK: only the first byte of bufsize set */
++	if (bufsize >= 256)
++	    bufsize = 255;
++#endif
  	buffer = SvGROW(bufsv, length+1);
  	/* 'offset' means 'flags' here */
  	length = PerlSock_recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, offset,