perl5.005_03 (stock)

1 files changed, 391 insertions, 308 deletions

diff --git a/gnu/usr.bin/perl/doio.c b/gnu/usr.bin/perl/doio.c
index a27e5b9fdd4..74544c95002 100644
--- a/gnu/usr.bin/perl/doio.c
+++ b/gnu/usr.bin/perl/doio.c
@@ -1,6 +1,6 @@
 /*    doio.c
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-1999, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -18,13 +18,12 @@
 #include "perl.h"
 
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+#ifndef HAS_SEM
 #include <sys/ipc.h>
+#endif
 #ifdef HAS_MSG
 #include <sys/msg.h>
 #endif
-#ifdef HAS_SEM
-#include <sys/sem.h>
-#endif
 #ifdef HAS_SHM
 #include <sys/shm.h>
 # ifndef HAS_SHMAT_PROTOTYPE
@@ -34,18 +33,24 @@
 #endif
 
 #ifdef I_UTIME
-#  ifdef _MSC_VER
+#  if defined(_MSC_VER) || defined(__MINGW32__)
 #    include <sys/utime.h>
 #  else
 #    include <utime.h>
 #  endif
 #endif
+
 #ifdef I_FCNTL
 #include <fcntl.h>
 #endif
 #ifdef I_SYS_FILE
 #include <sys/file.h>
 #endif
+#ifdef O_EXCL
+#  define OPEN_EXCL O_EXCL
+#else
+#  define OPEN_EXCL 0
+#endif
 
 #if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
 #include <signal.h>
@@ -76,13 +81,7 @@
 #endif
 
 bool
-do_open(gv,name,len,as_raw,rawmode,rawperm,supplied_fp)
-GV *gv;
-register char *name;
-I32 len;
-int as_raw;
-int rawmode, rawperm;
-PerlIO *supplied_fp;
+do_open(GV *gv, register char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp)
 {
     register IO *io = GvIOn(gv);
     PerlIO *saveifp = Nullfp;
@@ -92,21 +91,22 @@ PerlIO *supplied_fp;
     PerlIO *fp;
     int fd;
     int result;
+    bool was_fdopen = FALSE;
 
-    forkprocess = 1;		/* assume true if no fork */
+    PL_forkprocess = 1;		/* assume true if no fork */
 
     if (IoIFP(io)) {
 	fd = PerlIO_fileno(IoIFP(io));
 	if (IoTYPE(io) == '-')
 	    result = 0;
-	else if (fd <= maxsysfd) {
+	else if (fd <= PL_maxsysfd) {
 	    saveifp = IoIFP(io);
 	    saveofp = IoOFP(io);
 	    savetype = IoTYPE(io);
 	    result = 0;
 	}
 	else if (IoTYPE(io) == '|')
-	    result = my_pclose(IoIFP(io));
+	    result = PerlProc_pclose(IoIFP(io));
 	else if (IoIFP(io) != IoOFP(io)) {
 	    if (IoOFP(io)) {
 		result = PerlIO_close(IoOFP(io));
@@ -117,32 +117,47 @@ PerlIO *supplied_fp;
 	}
 	else
 	    result = PerlIO_close(IoIFP(io));
-	if (result == EOF && fd > maxsysfd)
+	if (result == EOF && fd > PL_maxsysfd)
 	    PerlIO_printf(PerlIO_stderr(), "Warning: unable to close filehandle %s properly.\n",
 	      GvENAME(gv));
 	IoOFP(io) = IoIFP(io) = Nullfp;
     }
 
     if (as_raw) {
-	result = rawmode & 3;
-	IoTYPE(io) = "<>++"[result];
+#ifndef O_ACCMODE
+#define O_ACCMODE 3		/* Assume traditional implementation */
+#endif
+	switch (result = rawmode & O_ACCMODE) {
+	case O_RDONLY:
+	     IoTYPE(io) = '<';
+	     break;
+	case O_WRONLY:
+	     IoTYPE(io) = '>';
+	     break;
+	case O_RDWR:
+	default:
+	     IoTYPE(io) = '+';
+	     break;
+	}
+
 	writing = (result > 0);
-	fd = open(name, rawmode, rawperm);
+	fd = PerlLIO_open3(name, rawmode, rawperm);
+
 	if (fd == -1)
 	    fp = NULL;
 	else {
 	    char *fpmode;
-	    if (result == 0)
+	    if (result == O_RDONLY)
 		fpmode = "r";
 #ifdef O_APPEND
 	    else if (rawmode & O_APPEND)
-		fpmode = (result == 1) ? "a" : "a+";
+		fpmode = (result == O_WRONLY) ? "a" : "a+";
 #endif
 	    else
-		fpmode = (result == 1) ? "w" : "r+";
+		fpmode = (result == O_WRONLY) ? "w" : "r+";
 	    fp = PerlIO_fdopen(fd, fpmode);
 	    if (!fp)
-		close(fd);
+		PerlLIO_close(fd);
 	}
     }
     else {
@@ -170,9 +185,12 @@ PerlIO *supplied_fp;
 	    if (strNE(name,"-"))
 		TAINT_ENV();
 	    TAINT_PROPER("piped open");
-	    if (dowarn && name[strlen(name)-1] == '|')
-		warn("Can't do bidirectional pipe");
-	    fp = my_popen(name,"w");
+	    if (name[strlen(name)-1] == '|') {
+		name[strlen(name)-1] = '\0' ;
+		if (PL_dowarn)
+		    warn("Can't do bidirectional pipe");
+	    }
+	    fp = PerlProc_popen(name,"w");
 	    writing = 1;
 	}
 	else if (*name == '>') {
@@ -220,10 +238,12 @@ PerlIO *supplied_fp;
 			    fd = -1;
 		    }
 		    if (dodup)
-			fd = dup(fd);
+			fd = PerlLIO_dup(fd);
+		    else
+			was_fdopen = TRUE;
 		    if (!(fp = PerlIO_fdopen(fd,mode))) {
 			if (dodup)
-			    close(fd);
+			    PerlLIO_close(fd);
 			}
 		}
 	    }
@@ -252,7 +272,7 @@ PerlIO *supplied_fp;
 	    else
 		fp = PerlIO_open(name,mode);
 	}
-	else if (name[len-1] == '|') {
+	else if (len > 1 && name[len-1] == '|') {
 	    name[--len] = '\0';
 	    while (len && isSPACE(name[len-1]))
 		name[--len] = '\0';
@@ -261,7 +281,7 @@ PerlIO *supplied_fp;
 	    if (strNE(name,"-"))
 		TAINT_ENV();
 	    TAINT_PROPER("piped open");
-	    fp = my_popen(name,"r");
+	    fp = PerlProc_popen(name,"r");
 	    IoTYPE(io) = '|';
 	}
 	else {
@@ -277,28 +297,30 @@ PerlIO *supplied_fp;
 	}
     }
     if (!fp) {
-	if (dowarn && IoTYPE(io) == '<' && strchr(name, '\n'))
+	if (PL_dowarn && IoTYPE(io) == '<' && strchr(name, '\n'))
 	    warn(warn_nl, "open");
 	goto say_false;
     }
     if (IoTYPE(io) &&
       IoTYPE(io) != '|' && IoTYPE(io) != '-') {
-	if (Fstat(PerlIO_fileno(fp),&statbuf) < 0) {
+	dTHR;
+	if (PerlLIO_fstat(PerlIO_fileno(fp),&PL_statbuf) < 0) {
 	    (void)PerlIO_close(fp);
 	    goto say_false;
 	}
-	if (S_ISSOCK(statbuf.st_mode))
+	if (S_ISSOCK(PL_statbuf.st_mode))
 	    IoTYPE(io) = 's';	/* in case a socket was passed in to us */
 #ifdef HAS_SOCKET
 	else if (
 #ifdef S_IFMT
-	    !(statbuf.st_mode & S_IFMT)
+	    !(PL_statbuf.st_mode & S_IFMT)
 #else
-	    !statbuf.st_mode
+	    !PL_statbuf.st_mode
 #endif
 	) {
-	    Sock_size_t buflen = sizeof tokenbuf;
-	    if (getsockname(PerlIO_fileno(fp), (struct sockaddr *)tokenbuf,
+	    char tmpbuf[256];
+	    Sock_size_t buflen = sizeof tmpbuf;
+	    if (PerlSock_getsockname(PerlIO_fileno(fp), (struct sockaddr *)tmpbuf,
 			    &buflen) >= 0
 		  || errno != ENOTSOCK)
 		IoTYPE(io) = 's'; /* some OS's return 0 on fstat()ed socket */
@@ -320,28 +342,34 @@ PerlIO *supplied_fp;
 	    int pid;
 	    SV *sv;
 
-	    dup2(PerlIO_fileno(fp), fd);
-	    sv = *av_fetch(fdpid,PerlIO_fileno(fp),TRUE);
+	    PerlLIO_dup2(PerlIO_fileno(fp), fd);
+	    sv = *av_fetch(PL_fdpid,PerlIO_fileno(fp),TRUE);
 	    (void)SvUPGRADE(sv, SVt_IV);
 	    pid = SvIVX(sv);
 	    SvIVX(sv) = 0;
-	    sv = *av_fetch(fdpid,fd,TRUE);
+	    sv = *av_fetch(PL_fdpid,fd,TRUE);
 	    (void)SvUPGRADE(sv, SVt_IV);
 	    SvIVX(sv) = pid;
-	    PerlIO_close(fp);
+	    if (!was_fdopen)
+		PerlIO_close(fp);
 
 	}
 	fp = saveifp;
 	PerlIO_clearerr(fp);
     }
 #if defined(HAS_FCNTL) && defined(F_SETFD)
-    fd = PerlIO_fileno(fp);
-    fcntl(fd,F_SETFD,fd > maxsysfd);
+    {
+	int save_errno = errno;
+	fd = PerlIO_fileno(fp);
+	fcntl(fd,F_SETFD,fd > PL_maxsysfd); /* can change errno */
+	errno = save_errno;
+    }
 #endif
     IoIFP(io) = fp;
     if (writing) {
+	dTHR;
 	if (IoTYPE(io) == 's'
-	  || (IoTYPE(io) == '>' && S_ISCHR(statbuf.st_mode)) ) {
+	  || (IoTYPE(io) == '>' && S_ISCHR(PL_statbuf.st_mode)) ) {
 	    if (!(IoOFP(io) = PerlIO_fdopen(PerlIO_fileno(fp),"w"))) {
 		PerlIO_close(fp);
 		IoIFP(io) = Nullfp;
@@ -361,8 +389,7 @@ say_false:
 }
 
 PerlIO *
-nextargv(gv)
-register GV *gv;
+nextargv(register GV *gv)
 {
     register SV *sv;
 #ifndef FLEXFILENAMES
@@ -372,55 +399,70 @@ register GV *gv;
     int fileuid;
     int filegid;
 
-    if (!argvoutgv)
-	argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO);
-    if (filemode & (S_ISUID|S_ISGID)) {
-	PerlIO_flush(IoIFP(GvIOn(argvoutgv)));  /* chmod must follow last write */
+    if (!PL_argvoutgv)
+	PL_argvoutgv = gv_fetchpv("ARGVOUT",TRUE,SVt_PVIO);
+    if (PL_filemode & (S_ISUID|S_ISGID)) {
+	PerlIO_flush(IoIFP(GvIOn(PL_argvoutgv)));  /* chmod must follow last write */
 #ifdef HAS_FCHMOD
-	(void)fchmod(lastfd,filemode);
+	(void)fchmod(PL_lastfd,PL_filemode);
 #else
-	(void)chmod(oldname,filemode);
+	(void)PerlLIO_chmod(PL_oldname,PL_filemode);
 #endif
     }
-    filemode = 0;
+    PL_filemode = 0;
     while (av_len(GvAV(gv)) >= 0) {
-	STRLEN len;
+	dTHR;
+	STRLEN oldlen;
 	sv = av_shift(GvAV(gv));
 	SAVEFREESV(sv);
 	sv_setsv(GvSV(gv),sv);
 	SvSETMAGIC(GvSV(gv));
-	oldname = SvPVx(GvSV(gv), len);
-	if (do_open(gv,oldname,len,FALSE,0,0,Nullfp)) {
-	    if (inplace) {
+	PL_oldname = SvPVx(GvSV(gv), oldlen);
+	if (do_open(gv,PL_oldname,oldlen,PL_inplace!=0,O_RDONLY,0,Nullfp)) {
+	    if (PL_inplace) {
 		TAINT_PROPER("inplace open");
-		if (strEQ(oldname,"-")) {
+		if (oldlen == 1 && *PL_oldname == '-') {
 		    setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO));
 		    return IoIFP(GvIOp(gv));
 		}
 #ifndef FLEXFILENAMES
-		filedev = statbuf.st_dev;
-		fileino = statbuf.st_ino;
+		filedev = PL_statbuf.st_dev;
+		fileino = PL_statbuf.st_ino;
 #endif
-		filemode = statbuf.st_mode;
-		fileuid = statbuf.st_uid;
-		filegid = statbuf.st_gid;
-		if (!S_ISREG(filemode)) {
+		PL_filemode = PL_statbuf.st_mode;
+		fileuid = PL_statbuf.st_uid;
+		filegid = PL_statbuf.st_gid;
+		if (!S_ISREG(PL_filemode)) {
 		    warn("Can't do inplace edit: %s is not a regular file",
-		      oldname );
+		      PL_oldname );
 		    do_close(gv,FALSE);
 		    continue;
 		}
-		if (*inplace) {
-#ifdef SUFFIX
-		    add_suffix(sv,inplace);
-#else
-		    sv_catpv(sv,inplace);
-#endif
+		if (*PL_inplace) {
+		    char *star = strchr(PL_inplace, '*');
+		    if (star) {
+			char *begin = PL_inplace;
+			sv_setpvn(sv, "", 0);
+			do {
+			    sv_catpvn(sv, begin, star - begin);
+			    sv_catpvn(sv, PL_oldname, oldlen);
+			    begin = ++star;
+			} while ((star = strchr(begin, '*')));
+			if (*begin)
+			    sv_catpv(sv,begin);
+		    }
+		    else {
+			sv_catpv(sv,PL_inplace);
+		    }
 #ifndef FLEXFILENAMES
-		    if (Stat(SvPVX(sv),&statbuf) >= 0
-		      && statbuf.st_dev == filedev
-		      && statbuf.st_ino == fileino ) {
-			warn("Can't do inplace edit: %s > 14 characters",
+		    if (PerlLIO_stat(SvPVX(sv),&PL_statbuf) >= 0
+		      && PL_statbuf.st_dev == filedev
+		      && PL_statbuf.st_ino == fileino
+#ifdef DJGPP
+                      || (_djstat_fail_bits & _STFAIL_TRUENAME)!=0
+#endif
+                      ) {
+			warn("Can't do inplace edit: %s would not be uniq",
 			  SvPVX(sv) );
 			do_close(gv,FALSE);
 			continue;
@@ -428,35 +470,35 @@ register GV *gv;
 #endif
 #ifdef HAS_RENAME
 #ifndef DOSISH
-		    if (rename(oldname,SvPVX(sv)) < 0) {
+		    if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) {
 			warn("Can't rename %s to %s: %s, skipping file",
-			  oldname, SvPVX(sv), Strerror(errno) );
+			  PL_oldname, SvPVX(sv), Strerror(errno) );
 			do_close(gv,FALSE);
 			continue;
 		    }
 #else
 		    do_close(gv,FALSE);
-		    (void)unlink(SvPVX(sv));
-		    (void)rename(oldname,SvPVX(sv));
-		    do_open(gv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp);
+		    (void)PerlLIO_unlink(SvPVX(sv));
+		    (void)PerlLIO_rename(PL_oldname,SvPVX(sv));
+		    do_open(gv,SvPVX(sv),SvCUR(sv),PL_inplace!=0,O_RDONLY,0,Nullfp);
 #endif /* DOSISH */
 #else
 		    (void)UNLINK(SvPVX(sv));
-		    if (link(oldname,SvPVX(sv)) < 0) {
+		    if (link(PL_oldname,SvPVX(sv)) < 0) {
 			warn("Can't rename %s to %s: %s, skipping file",
-			  oldname, SvPVX(sv), Strerror(errno) );
+			  PL_oldname, SvPVX(sv), Strerror(errno) );
 			do_close(gv,FALSE);
 			continue;
 		    }
-		    (void)UNLINK(oldname);
+		    (void)UNLINK(PL_oldname);
 #endif
 		}
 		else {
 #if !defined(DOSISH) && !defined(AMIGAOS)
 #  ifndef VMS  /* Don't delete; use automatic file versioning */
-		    if (UNLINK(oldname) < 0) {
-			warn("Can't rename %s to %s: %s, skipping file",
-			  oldname, SvPVX(sv), Strerror(errno) );
+		    if (UNLINK(PL_oldname) < 0) {
+			warn("Can't remove %s: %s, skipping file",
+			  PL_oldname, Strerror(errno) );
 			do_close(gv,FALSE);
 			continue;
 		    }
@@ -466,32 +508,38 @@ register GV *gv;
 #endif
 		}
 
-		sv_setpvn(sv,">",1);
-		sv_catpv(sv,oldname);
+		sv_setpvn(sv,">",!PL_inplace);
+		sv_catpvn(sv,PL_oldname,oldlen);
 		SETERRNO(0,0);		/* in case sprintf set errno */
-		if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp)) {
+#ifdef VMS
+		if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0,
+                 O_WRONLY|O_CREAT|O_TRUNC,0,Nullfp)) { 
+#else
+		if (!do_open(PL_argvoutgv,SvPVX(sv),SvCUR(sv),PL_inplace!=0,
+			     O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) {
+#endif
 		    warn("Can't do inplace edit on %s: %s",
-		      oldname, Strerror(errno) );
+		      PL_oldname, Strerror(errno) );
 		    do_close(gv,FALSE);
 		    continue;
 		}
-		setdefout(argvoutgv);
-		lastfd = PerlIO_fileno(IoIFP(GvIOp(argvoutgv)));
-		(void)Fstat(lastfd,&statbuf);
+		setdefout(PL_argvoutgv);
+		PL_lastfd = PerlIO_fileno(IoIFP(GvIOp(PL_argvoutgv)));
+		(void)PerlLIO_fstat(PL_lastfd,&PL_statbuf);
 #ifdef HAS_FCHMOD
-		(void)fchmod(lastfd,filemode);
+		(void)fchmod(PL_lastfd,PL_filemode);
 #else
 #  if !(defined(WIN32) && defined(__BORLANDC__))
 		/* Borland runtime creates a readonly file! */
-		(void)chmod(oldname,filemode);
+		(void)PerlLIO_chmod(PL_oldname,PL_filemode);
 #  endif
 #endif
-		if (fileuid != statbuf.st_uid || filegid != statbuf.st_gid) {
+		if (fileuid != PL_statbuf.st_uid || filegid != PL_statbuf.st_gid) {
 #ifdef HAS_FCHOWN
-		    (void)fchown(lastfd,fileuid,filegid);
+		    (void)fchown(PL_lastfd,fileuid,filegid);
 #else
 #ifdef HAS_CHOWN
-		    (void)chown(oldname,fileuid,filegid);
+		    (void)PerlLIO_chown(PL_oldname,fileuid,filegid);
 #endif
 #endif
 		}
@@ -499,10 +547,11 @@ register GV *gv;
 	    return IoIFP(GvIOp(gv));
 	}
 	else
-	    PerlIO_printf(PerlIO_stderr(), "Can't open %s: %s\n",SvPV(sv, na), Strerror(errno));
+	    PerlIO_printf(PerlIO_stderr(), "Can't open %s: %s\n",
+	      SvPV(sv, oldlen), Strerror(errno));
     }
-    if (inplace) {
-	(void)do_close(argvoutgv,FALSE);
+    if (PL_inplace) {
+	(void)do_close(PL_argvoutgv,FALSE);
 	setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO));
     }
     return Nullfp;
@@ -510,10 +559,7 @@ register GV *gv;
 
 #ifdef HAS_PIPE
 void
-do_pipe(sv, rgv, wgv)
-SV *sv;
-GV *rgv;
-GV *wgv;
+do_pipe(SV *sv, GV *rgv, GV *wgv)
 {
     register IO *rstio;
     register IO *wstio;
@@ -532,7 +578,7 @@ GV *wgv;
     if (IoIFP(wstio))
 	do_close(wgv,FALSE);
 
-    if (pipe(fd) < 0)
+    if (PerlProc_pipe(fd) < 0)
 	goto badexit;
     IoIFP(rstio) = PerlIO_fdopen(fd[0], "r");
     IoOFP(wstio) = PerlIO_fdopen(fd[1], "w");
@@ -541,44 +587,42 @@ GV *wgv;
     IoTYPE(wstio) = '>';
     if (!IoIFP(rstio) || !IoOFP(wstio)) {
 	if (IoIFP(rstio)) PerlIO_close(IoIFP(rstio));
-	else close(fd[0]);
+	else PerlLIO_close(fd[0]);
 	if (IoOFP(wstio)) PerlIO_close(IoOFP(wstio));
-	else close(fd[1]);
+	else PerlLIO_close(fd[1]);
 	goto badexit;
     }
 
-    sv_setsv(sv,&sv_yes);
+    sv_setsv(sv,&PL_sv_yes);
     return;
 
 badexit:
-    sv_setsv(sv,&sv_undef);
+    sv_setsv(sv,&PL_sv_undef);
     return;
 }
 #endif
 
 /* explicit renamed to avoid C++ conflict    -- kja */
 bool
-#ifndef CAN_PROTOTYPE
-do_close(gv,not_implicit)
-GV *gv;
-bool not_implicit;
-#else
 do_close(GV *gv, bool not_implicit)
-#endif /* CAN_PROTOTYPE */
 {
     bool retval;
     IO *io;
 
     if (!gv)
-	gv = argvgv;
+	gv = PL_argvgv;
     if (!gv || SvTYPE(gv) != SVt_PVGV) {
-	SETERRNO(EBADF,SS$_IVCHAN);
+	if (not_implicit)
+	    SETERRNO(EBADF,SS$_IVCHAN);
 	return FALSE;
     }
     io = GvIO(gv);
     if (!io) {		/* never opened */
-	if (dowarn && not_implicit)
-	    warn("Close on unopened file <%s>",GvENAME(gv));
+	if (not_implicit) {
+	    if (PL_dowarn)
+		warn("Close on unopened file <%s>",GvENAME(gv));
+	    SETERRNO(EBADF,SS$_IVCHAN);
+	}
 	return FALSE;
     }
     retval = io_close(io);
@@ -592,15 +636,14 @@ do_close(GV *gv, bool not_implicit)
 }
 
 bool
-io_close(io)
-IO* io;
+io_close(IO *io)
 {
     bool retval = FALSE;
     int status;
 
     if (IoIFP(io)) {
 	if (IoTYPE(io) == '|') {
-	    status = my_pclose(IoIFP(io));
+	    status = PerlProc_pclose(IoIFP(io));
 	    STATUS_NATIVE_SET(status);
 	    retval = (STATUS_POSIX == 0);
 	}
@@ -616,14 +659,17 @@ IO* io;
 	}
 	IoOFP(io) = IoIFP(io) = Nullfp;
     }
+    else {
+	SETERRNO(EBADF,SS$_IVCHAN);
+    }
 
     return retval;
 }
 
 bool
-do_eof(gv)
-GV *gv;
+do_eof(GV *gv)
 {
+    dTHR;
     register IO *io;
     int ch;
 
@@ -648,8 +694,8 @@ GV *gv;
 	    if (PerlIO_get_cnt(IoIFP(io)) < -1)
 		PerlIO_set_cnt(IoIFP(io),-1);
 	}
-	if (op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
-	    if (!nextargv(argvgv))	/* get another fp handy */
+	if (PL_op->op_flags & OPf_SPECIAL) { /* not necessarily a real EOF yet? */
+	    if (!nextargv(PL_argvgv))	/* get another fp handy */
 		return TRUE;
 	}
 	else
@@ -659,8 +705,7 @@ GV *gv;
 }
 
 long
-do_tell(gv)
-GV *gv;
+do_tell(GV *gv)
 {
     register IO *io;
     register PerlIO *fp;
@@ -672,17 +717,14 @@ GV *gv;
 #endif
 	return PerlIO_tell(fp);
     }
-    if (dowarn)
+    if (PL_dowarn)
 	warn("tell() on unopened file");
     SETERRNO(EBADF,RMS$_IFI);
     return -1L;
 }
 
 bool
-do_seek(gv, pos, whence)
-GV *gv;
-long pos;
-int whence;
+do_seek(GV *gv, long int pos, int whence)
 {
     register IO *io;
     register PerlIO *fp;
@@ -694,29 +736,66 @@ int whence;
 #endif
 	return PerlIO_seek(fp, pos, whence) >= 0;
     }
-    if (dowarn)
+    if (PL_dowarn)
 	warn("seek() on unopened file");
     SETERRNO(EBADF,RMS$_IFI);
     return FALSE;
 }
 
 long
-do_sysseek(gv, pos, whence)
-GV *gv;
-long pos;
-int whence;
+do_sysseek(GV *gv, long int pos, int whence)
 {
     register IO *io;
     register PerlIO *fp;
 
     if (gv && (io = GvIO(gv)) && (fp = IoIFP(io)))
-	return lseek(PerlIO_fileno(fp), pos, whence);
-    if (dowarn)
+	return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
+    if (PL_dowarn)
 	warn("sysseek() on unopened file");
     SETERRNO(EBADF,RMS$_IFI);
     return -1L;
 }
 
+int
+do_binmode(PerlIO *fp, int iotype, int flag)
+{
+    if (flag != TRUE)
+	croak("panic: unsetting binmode"); /* Not implemented yet */
+#ifdef DOSISH
+#if defined(atarist) || defined(__MINT__)
+    if (!PerlIO_flush(fp) && (fp->_flag |= _IOBIN))
+	return 1;
+    else
+	return 0;
+#else
+    if (PerlLIO_setmode(PerlIO_fileno(fp), OP_BINARY) != -1) {
+#if defined(WIN32) && defined(__BORLANDC__)
+	/* The translation mode of the stream is maintained independent
+	 * of the translation mode of the fd in the Borland RTL (heavy
+	 * digging through their runtime sources reveal).  User has to
+	 * set the mode explicitly for the stream (though they don't
+	 * document this anywhere). GSAR 97-5-24
+	 */
+	PerlIO_seek(fp,0L,0);
+	((FILE*)fp)->flags |= _F_BIN;
+#endif
+	return 1;
+    }
+    else
+	return 0;
+#endif
+#else
+#if defined(USEMYBINMODE)
+    if (my_binmode(fp,iotype) != NULL)
+	return 1;
+    else
+	return 0;
+#else
+    return 1;
+#endif
+#endif
+}
+
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
 	/* code courtesy of William Kucharski */
 #define HAS_CHSIZE
@@ -728,19 +807,19 @@ Off_t length;		/* length to set file to */
     struct flock fl;
     struct stat filebuf;
 
-    if (Fstat(fd, &filebuf) < 0)
+    if (PerlLIO_fstat(fd, &filebuf) < 0)
 	return -1;
 
     if (filebuf.st_size < length) {
 
 	/* extend file length */
 
-	if ((lseek(fd, (length - 1), 0)) < 0)
+	if ((PerlLIO_lseek(fd, (length - 1), 0)) < 0)
 	    return -1;
 
 	/* write a "0" byte */
 
-	if ((write(fd, "", 1)) != 1)
+	if ((PerlLIO_write(fd, "", 1)) != 1)
 	    return -1;
     }
     else {
@@ -769,9 +848,7 @@ Off_t length;		/* length to set file to */
 #endif /* F_FREESP */
 
 bool
-do_print(sv,fp)
-register SV *sv;
-PerlIO *fp;
+do_print(register SV *sv, PerlIO *fp)
 {
     register char *tmps;
     STRLEN len;
@@ -779,22 +856,22 @@ PerlIO *fp;
     /* assuming fp is checked earlier */
     if (!sv)
 	return TRUE;
-    if (ofmt) {
+    if (PL_ofmt) {
 	if (SvGMAGICAL(sv))
 	    mg_get(sv);
         if (SvIOK(sv) && SvIVX(sv) != 0) {
-	    PerlIO_printf(fp, ofmt, (double)SvIVX(sv));
+	    PerlIO_printf(fp, PL_ofmt, (double)SvIVX(sv));
 	    return !PerlIO_error(fp);
 	}
 	if (  (SvNOK(sv) && SvNVX(sv) != 0.0)
 	   || (looks_like_number(sv) && sv_2nv(sv) != 0.0) ) {
-	    PerlIO_printf(fp, ofmt, SvNVX(sv));
+	    PerlIO_printf(fp, PL_ofmt, SvNVX(sv));
 	    return !PerlIO_error(fp);
 	}
     }
     switch (SvTYPE(sv)) {
     case SVt_NULL:
-	if (dowarn)
+	if (PL_dowarn)
 	    warn(warn_uninit);
 	return TRUE;
     case SVt_IV:
@@ -815,37 +892,38 @@ PerlIO *fp;
 }
 
 I32
-my_stat(ARGS)
-dARGS
+my_stat(ARGSproto)
 {
-    dSP;
+    djSP;
     IO *io;
     GV* tmpgv;
 
-    if (op->op_flags & OPf_REF) {
-	EXTEND(sp,1);
+    if (PL_op->op_flags & OPf_REF) {
+	EXTEND(SP,1);
 	tmpgv = cGVOP->op_gv;
       do_fstat:
 	io = GvIO(tmpgv);
 	if (io && IoIFP(io)) {
-	    statgv = tmpgv;
-	    sv_setpv(statname,"");
-	    laststype = OP_STAT;
-	    return (laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache));
+	    PL_statgv = tmpgv;
+	    sv_setpv(PL_statname,"");
+	    PL_laststype = OP_STAT;
+	    return (PL_laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &PL_statcache));
 	}
 	else {
-	    if (tmpgv == defgv)
-		return laststatval;
-	    if (dowarn)
+	    if (tmpgv == PL_defgv)
+		return PL_laststatval;
+	    if (PL_dowarn)
 		warn("Stat on unopened file <%s>",
 		  GvENAME(tmpgv));
-	    statgv = Nullgv;
-	    sv_setpv(statname,"");
-	    return (laststatval = -1);
+	    PL_statgv = Nullgv;
+	    sv_setpv(PL_statname,"");
+	    return (PL_laststatval = -1);
 	}
     }
     else {
 	SV* sv = POPs;
+	char *s;
+	STRLEN n_a;
 	PUTBACK;
 	if (SvTYPE(sv) == SVt_PVGV) {
 	    tmpgv = (GV*)sv;
@@ -856,97 +934,96 @@ dARGS
 	    goto do_fstat;
 	}
 
-	statgv = Nullgv;
-	sv_setpv(statname,SvPV(sv, na));
-	laststype = OP_STAT;
-	laststatval = Stat(SvPV(sv, na),&statcache);
-	if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n'))
+	s = SvPV(sv, n_a);
+	PL_statgv = Nullgv;
+	sv_setpv(PL_statname, s);
+	PL_laststype = OP_STAT;
+	PL_laststatval = PerlLIO_stat(s, &PL_statcache);
+	if (PL_laststatval < 0 && PL_dowarn && strchr(s, '\n'))
 	    warn(warn_nl, "stat");
-	return laststatval;
+	return PL_laststatval;
     }
 }
 
 I32
-my_lstat(ARGS)
-dARGS
+my_lstat(ARGSproto)
 {
-    dSP;
+    djSP;
     SV *sv;
-    if (op->op_flags & OPf_REF) {
-	EXTEND(sp,1);
-	if (cGVOP->op_gv == defgv) {
-	    if (laststype != OP_LSTAT)
+    STRLEN n_a;
+    if (PL_op->op_flags & OPf_REF) {
+	EXTEND(SP,1);
+	if (cGVOP->op_gv == PL_defgv) {
+	    if (PL_laststype != OP_LSTAT)
 		croak("The stat preceding -l _ wasn't an lstat");
-	    return laststatval;
+	    return PL_laststatval;
 	}
 	croak("You can't use -l on a filehandle");
     }
 
-    laststype = OP_LSTAT;
-    statgv = Nullgv;
+    PL_laststype = OP_LSTAT;
+    PL_statgv = Nullgv;
     sv = POPs;
     PUTBACK;
-    sv_setpv(statname,SvPV(sv, na));
+    sv_setpv(PL_statname,SvPV(sv, n_a));
 #ifdef HAS_LSTAT
-    laststatval = lstat(SvPV(sv, na),&statcache);
+    PL_laststatval = PerlLIO_lstat(SvPV(sv, n_a),&PL_statcache);
 #else
-    laststatval = Stat(SvPV(sv, na),&statcache);
+    PL_laststatval = PerlLIO_stat(SvPV(sv, n_a),&PL_statcache);
 #endif
-    if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n'))
+    if (PL_laststatval < 0 && PL_dowarn && strchr(SvPV(sv, n_a), '\n'))
 	warn(warn_nl, "lstat");
-    return laststatval;
+    return PL_laststatval;
 }
 
 bool
-do_aexec(really,mark,sp)
-SV *really;
-register SV **mark;
-register SV **sp;
+do_aexec(SV *really, register SV **mark, register SV **sp)
 {
     register char **a;
     char *tmps;
+    STRLEN n_a;
 
     if (sp > mark) {
-	New(401,Argv, sp - mark + 1, char*);
-	a = Argv;
+	dTHR;
+	New(401,PL_Argv, sp - mark + 1, char*);
+	a = PL_Argv;
 	while (++mark <= sp) {
 	    if (*mark)
-		*a++ = SvPVx(*mark, na);
+		*a++ = SvPVx(*mark, n_a);
 	    else
 		*a++ = "";
 	}
 	*a = Nullch;
-	if (*Argv[0] != '/')	/* will execvp use PATH? */
+	if (*PL_Argv[0] != '/')	/* will execvp use PATH? */
 	    TAINT_ENV();		/* testing IFS here is overkill, probably */
-	if (really && *(tmps = SvPV(really, na)))
-	    execvp(tmps,Argv);
+	if (really && *(tmps = SvPV(really, n_a)))
+	    PerlProc_execvp(tmps,PL_Argv);
 	else
-	    execvp(Argv[0],Argv);
-	if (dowarn)
-	    warn("Can't exec \"%s\": %s", Argv[0], Strerror(errno));
+	    PerlProc_execvp(PL_Argv[0],PL_Argv);
+	if (PL_dowarn)
+	    warn("Can't exec \"%s\": %s", PL_Argv[0], Strerror(errno));
     }
     do_execfree();
     return FALSE;
 }
 
 void
-do_execfree()
+do_execfree(void)
 {
-    if (Argv) {
-	Safefree(Argv);
-	Argv = Null(char **);
+    if (PL_Argv) {
+	Safefree(PL_Argv);
+	PL_Argv = Null(char **);
     }
-    if (Cmd) {
-	Safefree(Cmd);
-	Cmd = Nullch;
+    if (PL_Cmd) {
+	Safefree(PL_Cmd);
+	PL_Cmd = Nullch;
     }
 }
 
-#if !defined(OS2) && !defined(WIN32)
+#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP)
 
 bool
-do_exec(cmd)
-char *cmd;
+do_exec(char *cmd)
 {
     register char **a;
     register char *s;
@@ -958,9 +1035,9 @@ char *cmd;
     /* save an extra exec if possible */
 
 #ifdef CSH
-    if (strnEQ(cmd,cshname,cshlen) && strnEQ(cmd+cshlen," -c",3)) {
+    if (strnEQ(cmd,PL_cshname,PL_cshlen) && strnEQ(cmd+PL_cshlen," -c",3)) {
 	strcpy(flags,"-c");
-	s = cmd+cshlen+3;
+	s = cmd+PL_cshlen+3;
 	if (*s == 'f') {
 	    s++;
 	    strcat(flags,"f");
@@ -976,7 +1053,7 @@ char *cmd;
 		*--s = '\0';
 	    if (s[-1] == '\'') {
 		*--s = '\0';
-		execl(cshname,"csh", flags,ncmd,(char*)0);
+		PerlProc_execl(PL_cshname,"csh", flags,ncmd,(char*)0);
 		*s = '\'';
 		return FALSE;
 	    }
@@ -1003,15 +1080,15 @@ char *cmd;
 		break;
 	    }
 	  doshell:
-	    execl(sh_path, "sh", "-c", cmd, (char*)0);
+	    PerlProc_execl(PL_sh_path, "sh", "-c", cmd, (char*)0);
 	    return FALSE;
 	}
     }
 
-    New(402,Argv, (s - cmd) / 2 + 2, char*);
-    Cmd = savepvn(cmd, s-cmd);
-    a = Argv;
-    for (s = Cmd; *s;) {
+    New(402,PL_Argv, (s - cmd) / 2 + 2, char*);
+    PL_Cmd = savepvn(cmd, s-cmd);
+    a = PL_Argv;
+    for (s = PL_Cmd; *s;) {
 	while (*s && isSPACE(*s)) s++;
 	if (*s)
 	    *(a++) = s;
@@ -1020,14 +1097,14 @@ char *cmd;
 	    *s++ = '\0';
     }
     *a = Nullch;
-    if (Argv[0]) {
-	execvp(Argv[0],Argv);
+    if (PL_Argv[0]) {
+	PerlProc_execvp(PL_Argv[0],PL_Argv);
 	if (errno == ENOEXEC) {		/* for system V NIH syndrome */
 	    do_execfree();
 	    goto doshell;
 	}
-	if (dowarn)
-	    warn("Can't exec \"%s\": %s", Argv[0], Strerror(errno));
+	if (PL_dowarn)
+	    warn("Can't exec \"%s\": %s", PL_Argv[0], Strerror(errno));
     }
     do_execfree();
     return FALSE;
@@ -1036,18 +1113,24 @@ char *cmd;
 #endif /* OS2 || WIN32 */
 
 I32
-apply(type,mark,sp)
-I32 type;
-register SV **mark;
-register SV **sp;
+apply(I32 type, register SV **mark, register SV **sp)
 {
+    dTHR;
     register I32 val;
     register I32 val2;
     register I32 tot = 0;
+    char *what;
     char *s;
     SV **oldmark = mark;
+    STRLEN n_a;
+
+#define APPLY_TAINT_PROPER() \
+    STMT_START {							\
+	if (PL_tainted) { TAINT_PROPER(what); }				\
+    } STMT_END
 
-    if (tainting) {
+    /* This is a first heuristic; it doesn't catch tainting magic. */
+    if (PL_tainting) {
 	while (++mark <= sp) {
 	    if (SvTAINTED(*mark)) {
 		TAINT;
@@ -1058,37 +1141,51 @@ register SV **sp;
     }
     switch (type) {
     case OP_CHMOD:
-	TAINT_PROPER("chmod");
+	what = "chmod";
+	APPLY_TAINT_PROPER();
 	if (++mark <= sp) {
-	    tot = sp - mark;
 	    val = SvIVx(*mark);
+	    APPLY_TAINT_PROPER();
+	    tot = sp - mark;
 	    while (++mark <= sp) {
-		if (chmod(SvPVx(*mark, na),val))
+		char *name = SvPVx(*mark, n_a);
+		APPLY_TAINT_PROPER();
+		if (PerlLIO_chmod(name, val))
 		    tot--;
 	    }
 	}
 	break;
 #ifdef HAS_CHOWN
     case OP_CHOWN:
-	TAINT_PROPER("chown");
+	what = "chown";
+	APPLY_TAINT_PROPER();
 	if (sp - mark > 2) {
 	    val = SvIVx(*++mark);
 	    val2 = SvIVx(*++mark);
+	    APPLY_TAINT_PROPER();
 	    tot = sp - mark;
 	    while (++mark <= sp) {
-		if (chown(SvPVx(*mark, na),val,val2))
+		char *name = SvPVx(*mark, n_a);
+		APPLY_TAINT_PROPER();
+		if (PerlLIO_chown(name, val, val2))
 		    tot--;
 	    }
 	}
 	break;
 #endif
+/* 
+XXX Should we make lchown() directly available from perl?
+For now, we'll let Configure test for HAS_LCHOWN, but do
+nothing in the core.
+    --AD  5/1998
+*/
 #ifdef HAS_KILL
     case OP_KILL:
-	TAINT_PROPER("kill");
+	what = "kill";
+	APPLY_TAINT_PROPER();
 	if (mark == sp)
 	    break;
-	s = SvPVx(*++mark, na);
-	tot = sp - mark;
+	s = SvPVx(*++mark, n_a);
 	if (isUPPER(*s)) {
 	    if (*s == 'S' && s[1] == 'I' && s[2] == 'G')
 		s += 3;
@@ -1097,6 +1194,8 @@ register SV **sp;
 	}
 	else
 	    val = SvIVx(*mark);
+	APPLY_TAINT_PROPER();
+	tot = sp - mark;
 #ifdef VMS
 	/* kill() doesn't do process groups (job trees?) under VMS */
 	if (val < 0) val = -val;
@@ -1109,6 +1208,7 @@ register SV **sp;
 	    while (++mark <= sp) {
 		I32 proc = SvIVx(*mark);
 		register unsigned long int __vmssts;
+		APPLY_TAINT_PROPER();
 		if (!((__vmssts = sys$delprc(&proc,0)) & 1)) {
 		    tot--;
 		    switch (__vmssts) {
@@ -1131,36 +1231,41 @@ register SV **sp;
 	    val = -val;
 	    while (++mark <= sp) {
 		I32 proc = SvIVx(*mark);
+		APPLY_TAINT_PROPER();
 #ifdef HAS_KILLPG
-		if (killpg(proc,val))	/* BSD */
+		if (PerlProc_killpg(proc,val))	/* BSD */
 #else
-		if (kill(-proc,val))	/* SYSV */
+		if (PerlProc_kill(-proc,val))	/* SYSV */
 #endif
 		    tot--;
 	    }
 	}
 	else {
 	    while (++mark <= sp) {
-		if (kill(SvIVx(*mark),val))
+		I32 proc = SvIVx(*mark);
+		APPLY_TAINT_PROPER();
+		if (PerlProc_kill(proc, val))
 		    tot--;
 	    }
 	}
 	break;
 #endif
     case OP_UNLINK:
-	TAINT_PROPER("unlink");
+	what = "unlink";
+	APPLY_TAINT_PROPER();
 	tot = sp - mark;
 	while (++mark <= sp) {
-	    s = SvPVx(*mark, na);
-	    if (euid || unsafe) {
+	    s = SvPVx(*mark, n_a);
+	    APPLY_TAINT_PROPER();
+	    if (PL_euid || PL_unsafe) {
 		if (UNLINK(s))
 		    tot--;
 	    }
 	    else {	/* don't let root wipe out directories without -U */
 #ifdef HAS_LSTAT
-		if (lstat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode))
+		if (PerlLIO_lstat(s,&PL_statbuf) < 0 || S_ISDIR(PL_statbuf.st_mode))
 #else
-		if (Stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode))
+		if (PerlLIO_stat(s,&PL_statbuf) < 0 || S_ISDIR(PL_statbuf.st_mode))
 #endif
 		    tot--;
 		else {
@@ -1172,28 +1277,32 @@ register SV **sp;
 	break;
 #ifdef HAS_UTIME
     case OP_UTIME:
-	TAINT_PROPER("utime");
+	what = "utime";
+	APPLY_TAINT_PROPER();
 	if (sp - mark > 2) {
 #if defined(I_UTIME) || defined(VMS)
 	    struct utimbuf utbuf;
 #else
 	    struct {
-		long    actime;
-		long	modtime;
+		Time_t	actime;
+		Time_t	modtime;
 	    } utbuf;
 #endif
 
 	    Zero(&utbuf, sizeof utbuf, char);
 #ifdef BIG_TIME
-	    utbuf.actime = (Time_t)SvNVx(*++mark);    /* time accessed */
-	    utbuf.modtime = (Time_t)SvNVx(*++mark);    /* time modified */
+	    utbuf.actime = (Time_t)SvNVx(*++mark);	/* time accessed */
+	    utbuf.modtime = (Time_t)SvNVx(*++mark);	/* time modified */
 #else
-	    utbuf.actime = SvIVx(*++mark);    /* time accessed */
-	    utbuf.modtime = SvIVx(*++mark);    /* time modified */
+	    utbuf.actime = (Time_t)SvIVx(*++mark);	/* time accessed */
+	    utbuf.modtime = (Time_t)SvIVx(*++mark);	/* time modified */
 #endif
+	    APPLY_TAINT_PROPER();
 	    tot = sp - mark;
 	    while (++mark <= sp) {
-		if (utime(SvPVx(*mark, na),&utbuf))
+		char *name = SvPVx(*mark, n_a);
+		APPLY_TAINT_PROPER();
+		if (PerlLIO_utime(name, &utbuf))
 		    tot--;
 	    }
 	}
@@ -1203,15 +1312,14 @@ register SV **sp;
 #endif
     }
     return tot;
+
+#undef APPLY_TAINT_PROPER
 }
 
 /* Do the permissions allow some operation?  Assumes statcache already set. */
 #ifndef VMS /* VMS' cando is in vms.c */
 I32
-cando(bit, effective, statbufp)
-I32 bit;
-I32 effective;
-register struct stat *statbufp;
+cando(I32 bit, I32 effective, register struct stat *statbufp)
 {
 #ifdef DOSISH
     /* [Comments and code from Len Reed]
@@ -1238,7 +1346,7 @@ register struct stat *statbufp;
      return (bit & statbufp->st_mode) ? TRUE : FALSE;
 
 #else /* ! DOSISH */
-    if ((effective ? euid : uid) == 0) {	/* root is special */
+    if ((effective ? PL_euid : PL_uid) == 0) {	/* root is special */
 	if (bit == S_IXUSR) {
 	    if (statbufp->st_mode & 0111 || S_ISDIR(statbufp->st_mode))
 		return TRUE;
@@ -1247,7 +1355,7 @@ register struct stat *statbufp;
 	    return TRUE;		/* root reads and writes anything */
 	return FALSE;
     }
-    if (statbufp->st_uid == (effective ? euid : uid) ) {
+    if (statbufp->st_uid == (effective ? PL_euid : PL_uid) ) {
 	if (statbufp->st_mode & bit)
 	    return TRUE;	/* ok as "user" */
     }
@@ -1263,11 +1371,9 @@ register struct stat *statbufp;
 #endif /* ! VMS */
 
 I32
-ingroup(testgid,effective)
-I32 testgid;
-I32 effective;
+ingroup(I32 testgid, I32 effective)
 {
-    if (testgid == (effective ? egid : gid))
+    if (testgid == (effective ? PL_egid : PL_gid))
 	return TRUE;
 #ifdef HAS_GETGROUPS
 #ifndef NGROUPS
@@ -1289,11 +1395,9 @@ I32 effective;
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 
 I32
-do_ipcget(optype, mark, sp)
-I32 optype;
-SV **mark;
-SV **sp;
+do_ipcget(I32 optype, SV **mark, SV **sp)
 {
+    dTHR;
     key_t key;
     I32 n, flags;
 
@@ -1324,18 +1428,13 @@ SV **sp;
 }
 
 I32
-do_ipcctl(optype, mark, sp)
-I32 optype;
-SV **mark;
-SV **sp;
+do_ipcctl(I32 optype, SV **mark, SV **sp)
 {
+    dTHR;
     SV *astr;
     char *a;
     I32 id, n, cmd, infosize, getinfo;
     I32 ret = -1;
-#if defined(__linux__) || defined (__OpenBSD__)	/* XXX Need metaconfig test */
-    union semun unsemds;
-#endif
 
     id = SvIVx(*++mark);
     n = (optype == OP_SEMCTL) ? SvIVx(*++mark) : 0;
@@ -1365,23 +1464,12 @@ SV **sp;
 	else if (cmd == GETALL || cmd == SETALL)
 	{
 	    struct semid_ds semds;
-#if defined(__linux__) || defined (__OpenBSD__)	/* XXX Need metaconfig test */
-/* linux & OpenBSD (and Solaris2?) uses :
-   int semctl (int semid, int semnum, int cmd, union semun arg)
-       union semun {
-            int val;
-            struct semid_ds *buf;
-            ushort *array;
-       };
-*/
-            union semun semun;
+	    union semun semun;
+
             semun.buf = &semds;
-	    if (semctl(id, 0, IPC_STAT, semun) == -1)
-#else
-	    if (semctl(id, 0, IPC_STAT, &semds) == -1)
-#endif
-		return -1;
 	    getinfo = (cmd == GETALL);
+	    if (Semctl(id, 0, IPC_STAT, semun) == -1)
+		return -1;
 	    infosize = semds.sem_nsems * sizeof(short);
 		/* "short" is technically wrong but much more portable
 		   than guessing about u_?short(_t)? */
@@ -1424,13 +1512,12 @@ SV **sp;
 	break;
 #endif
 #ifdef HAS_SEM
-    case OP_SEMCTL:
-#if defined(__linux__) || defined (__OpenBSD__)	/* XXX Need metaconfig test */
-        unsemds.buf = (struct semid_ds *)a;
-	ret = semctl(id, n, cmd, unsemds);
-#else
-	ret = semctl(id, n, cmd, (struct semid_ds *)a);
-#endif
+    case OP_SEMCTL: {
+            union semun unsemds;
+
+            unsemds.buf = (struct semid_ds *)a;
+	    ret = Semctl(id, n, cmd, unsemds);
+        }
 	break;
 #endif
 #ifdef HAS_SHM
@@ -1448,11 +1535,10 @@ SV **sp;
 }
 
 I32
-do_msgsnd(mark, sp)
-SV **mark;
-SV **sp;
+do_msgsnd(SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
+    dTHR;
     SV *mstr;
     char *mbuf;
     I32 id, msize, flags;
@@ -1472,11 +1558,10 @@ SV **sp;
 }
 
 I32
-do_msgrcv(mark, sp)
-SV **mark;
-SV **sp;
+do_msgrcv(SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
+    dTHR;
     SV *mstr;
     char *mbuf;
     long mtype;
@@ -1510,11 +1595,10 @@ SV **sp;
 }
 
 I32
-do_semop(mark, sp)
-SV **mark;
-SV **sp;
+do_semop(SV **mark, SV **sp)
 {
 #ifdef HAS_SEM
+    dTHR;
     SV *opstr;
     char *opbuf;
     I32 id;
@@ -1536,12 +1620,10 @@ SV **sp;
 }
 
 I32
-do_shmio(optype, mark, sp)
-I32 optype;
-SV **mark;
-SV **sp;
+do_shmio(I32 optype, SV **mark, SV **sp)
 {
 #ifdef HAS_SHM
+    dTHR;
     SV *mstr;
     char *mbuf, *shm;
     I32 id, mpos, msize;
@@ -1559,7 +1641,7 @@ SV **sp;
 	SETERRNO(EFAULT,SS$_ACCVIO);		/* can't do as caller requested */
 	return -1;
     }
-    shm = (Shmat_t)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
+    shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
     if (shm == (char *)-1)	/* I hate System V IPC, I really do */
 	return -1;
     if (optype == OP_SHMREAD) {
@@ -1588,3 +1670,4 @@ SV **sp;
 }
 
 #endif /* SYSV IPC */
+