From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sun, 11 Jul 1999 15:04:37 +0000 (+0000)
Subject: Manual synchronization with Sarathy (some files
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ad6a8a5216a3f231acabe7b88dfb2cd56b3b09c1;p=p5sagit%2Fp5-mst-13.2.git

Manual synchronization with Sarathy (some files
had drifted apart for no apparent reason), plus
I had a typo in dl_vms.xs Sarathy had fixed.

p4raw-id: //depot/cfgperl@3663
---

diff --git a/ext/DynaLoader/dl_vms.xs b/ext/DynaLoader/dl_vms.xs
index 4db0cc9..d83d532 100644
--- a/ext/DynaLoader/dl_vms.xs
+++ b/ext/DynaLoader/dl_vms.xs
@@ -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 --git a/pp.c b/pp.c
index a1b088a..3bd26f4 100644
--- a/pp.c
+++ b/pp.c
@@ -2308,7 +2308,8 @@ PP(pp_ucfirst)
 	    s = (U8*)SvPV_force(sv, slen);
 	    Copy(tmpbuf, s, ulen, U8);
 	}
-    } else {
+    }
+    else {
 	if (!SvPADTMP(sv)) {
 	    dTARGET;
 	    sv_setsv(TARG, sv);
@@ -2364,7 +2365,8 @@ PP(pp_lcfirst)
 	    s = (U8*)SvPV_force(sv, slen);
 	    Copy(tmpbuf, s, ulen, U8);
 	}
-    } else {
+    }
+    else {
 	if (!SvPADTMP(sv)) {
 	    dTARGET;
 	    sv_setsv(TARG, sv);
@@ -2405,7 +2407,8 @@ PP(pp_uc)
 	if (!len) {
 	    sv_setpvn(TARG, "", 0);
 	    SETs(TARG);
-	} else {
+	}
+	else {
 	    (void)SvUPGRADE(TARG, SVt_PV);
 	    SvGROW(TARG, (len * 2) + 1);
 	    (void)SvPOK_only(TARG);
@@ -2429,7 +2432,8 @@ PP(pp_uc)
 	    SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
 	    SETs(TARG);
 	}
-    } else {
+    }
+    else {
 	if (!SvPADTMP(sv)) {
 	    dTARGET;
 	    sv_setsv(TARG, sv);
@@ -2474,7 +2478,8 @@ PP(pp_lc)
 	if (!len) {
 	    sv_setpvn(TARG, "", 0);
 	    SETs(TARG);
-	} else {
+	}
+	else {
 	    (void)SvUPGRADE(TARG, SVt_PV);
 	    SvGROW(TARG, (len * 2) + 1);
 	    (void)SvPOK_only(TARG);
@@ -2498,7 +2503,8 @@ PP(pp_lc)
 	    SvCUR_set(TARG, d - (U8*)SvPVX(TARG));
 	    SETs(TARG);
 	}
-    } else {
+    }
+    else {
 	if (!SvPADTMP(sv)) {
 	    dTARGET;
 	    sv_setsv(TARG, sv);
diff --git a/pp_sys.c b/pp_sys.c
index 50315a3..c608ab5 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -1476,6 +1476,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,