[5.004_5* PATCH] Make ornaments default in Term::ReadLine

[perl5.git] / doio.c

diff --git a/doio.c b/doio.c
index bb0ac47..3167aea 100644 (file)
--- a/doio.c
+++ b/doio.c
@@ -34,18 +34,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 +82,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;
@@ -106,7 +106,7 @@ PerlIO *supplied_fp;
            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));
@@ -127,7 +127,7 @@ PerlIO *supplied_fp;
        result = rawmode & 3;
        IoTYPE(io) = "<>++"[result];
        writing = (result > 0);
-       fd = open(name, rawmode, rawperm);
+       fd = PerlLIO_open3(name, rawmode, rawperm);
        if (fd == -1)
            fp = NULL;
        else {
@@ -142,7 +142,7 @@ PerlIO *supplied_fp;
                fpmode = (result == 1) ? "w" : "r+";
            fp = PerlIO_fdopen(fd, fpmode);
            if (!fp)
-               close(fd);
+               PerlLIO_close(fd);
        }
     }
     else {
@@ -172,7 +172,7 @@ PerlIO *supplied_fp;
            TAINT_PROPER("piped open");
            if (dowarn && name[strlen(name)-1] == '|')
                warn("Can't do bidirectional pipe");
-           fp = my_popen(name,"w");
+           fp = PerlProc_popen(name,"w");
            writing = 1;
        }
        else if (*name == '>') {
@@ -220,10 +220,10 @@ PerlIO *supplied_fp;
                            fd = -1;
                    }
                    if (dodup)
-                       fd = dup(fd);
+                       fd = PerlLIO_dup(fd);
                    if (!(fp = PerlIO_fdopen(fd,mode))) {
                        if (dodup)
-                           close(fd);
+                           PerlLIO_close(fd);
                        }
                }
            }
@@ -261,7 +261,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 {
@@ -284,7 +284,7 @@ PerlIO *supplied_fp;
     if (IoTYPE(io) &&
       IoTYPE(io) != '|' && IoTYPE(io) != '-') {
        dTHR;
-       if (Fstat(PerlIO_fileno(fp),&statbuf) < 0) {
+       if (PerlLIO_fstat(PerlIO_fileno(fp),&statbuf) < 0) {
            (void)PerlIO_close(fp);
            goto say_false;
        }
@@ -300,7 +300,7 @@ PerlIO *supplied_fp;
        ) {
            char tmpbuf[256];
            Sock_size_t buflen = sizeof tmpbuf;
-           if (getsockname(PerlIO_fileno(fp), (struct sockaddr *)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 */
@@ -322,7 +322,7 @@ PerlIO *supplied_fp;
            int pid;
            SV *sv;
 
-           dup2(PerlIO_fileno(fp), fd);
+           PerlLIO_dup2(PerlIO_fileno(fp), fd);
            sv = *av_fetch(fdpid,PerlIO_fileno(fp),TRUE);
            (void)SvUPGRADE(sv, SVt_IV);
            pid = SvIVX(sv);
@@ -364,8 +364,7 @@ say_false:
 }
 
 PerlIO *
-nextargv(gv)
-register GV *gv;
+nextargv(register GV *gv)
 {
     register SV *sv;
 #ifndef FLEXFILENAMES
@@ -382,22 +381,22 @@ register GV *gv;
 #ifdef HAS_FCHMOD
        (void)fchmod(lastfd,filemode);
 #else
-       (void)chmod(oldname,filemode);
+       (void)PerlLIO_chmod(oldname,filemode);
 #endif
     }
     filemode = 0;
     while (av_len(GvAV(gv)) >= 0) {
        dTHR;
-       STRLEN len;
+       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)) {
+       oldname = SvPVx(GvSV(gv), oldlen);
+       if (do_open(gv,oldname,oldlen,inplace!=0,0,0,Nullfp)) {
            if (inplace) {
                TAINT_PROPER("inplace open");
-               if (strEQ(oldname,"-")) {
+               if (oldlen == 1 && *oldname == '-') {
                    setdefout(gv_fetchpv("STDOUT",TRUE,SVt_PVIO));
                    return IoIFP(GvIOp(gv));
                }
@@ -421,10 +420,14 @@ register GV *gv;
                    sv_catpv(sv,inplace);
 #endif
 #ifndef FLEXFILENAMES
-                   if (Stat(SvPVX(sv),&statbuf) >= 0
+                   if (PerlLIO_stat(SvPVX(sv),&statbuf) >= 0
                      && statbuf.st_dev == filedev
-                     && statbuf.st_ino == fileino ) {
-                       warn("Can't do inplace edit: %s > 14 characters",
+                     && 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;
@@ -432,7 +435,7 @@ register GV *gv;
 #endif
 #ifdef HAS_RENAME
 #ifndef DOSISH
-                   if (rename(oldname,SvPVX(sv)) < 0) {
+                   if (PerlLIO_rename(oldname,SvPVX(sv)) < 0) {
                        warn("Can't rename %s to %s: %s, skipping file",
                          oldname, SvPVX(sv), Strerror(errno) );
                        do_close(gv,FALSE);
@@ -440,9 +443,9 @@ register GV *gv;
                    }
 #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(oldname,SvPVX(sv));
+                   do_open(gv,SvPVX(sv),SvCUR(sv),inplace!=0,0,0,Nullfp);
 #endif /* DOSISH */
 #else
                    (void)UNLINK(SvPVX(sv));
@@ -459,8 +462,8 @@ register GV *gv;
 #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) );
+                       warn("Can't remove %s: %s, skipping file",
+                         oldname, Strerror(errno) );
                        do_close(gv,FALSE);
                        continue;
                    }
@@ -470,10 +473,11 @@ register GV *gv;
 #endif
                }
 
-               sv_setpvn(sv,">",1);
-               sv_catpv(sv,oldname);
+               sv_setpvn(sv,">",!inplace);
+               sv_catpvn(sv,oldname,oldlen);
                SETERRNO(0,0);          /* in case sprintf set errno */
-               if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),FALSE,0,0,Nullfp)) {
+               if (!do_open(argvoutgv,SvPVX(sv),SvCUR(sv),inplace!=0,
+                            O_WRONLY|O_CREAT|OPEN_EXCL,0666,Nullfp)) {
                    warn("Can't do inplace edit on %s: %s",
                      oldname, Strerror(errno) );
                    do_close(gv,FALSE);
@@ -481,13 +485,13 @@ register GV *gv;
                }
                setdefout(argvoutgv);
                lastfd = PerlIO_fileno(IoIFP(GvIOp(argvoutgv)));
-               (void)Fstat(lastfd,&statbuf);
+               (void)PerlLIO_fstat(lastfd,&statbuf);
 #ifdef HAS_FCHMOD
                (void)fchmod(lastfd,filemode);
 #else
 #  if !(defined(WIN32) && defined(__BORLANDC__))
                /* Borland runtime creates a readonly file! */
-               (void)chmod(oldname,filemode);
+               (void)PerlLIO_chmod(oldname,filemode);
 #  endif
 #endif
                if (fileuid != statbuf.st_uid || filegid != statbuf.st_gid) {
@@ -503,7 +507,8 @@ 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, na), Strerror(errno));
     }
     if (inplace) {
        (void)do_close(argvoutgv,FALSE);
@@ -514,10 +519,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;
@@ -536,7 +538,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");
@@ -545,9 +547,9 @@ 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;
     }
 
@@ -596,15 +598,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);
        }
@@ -625,8 +626,7 @@ IO* io;
 }
 
 bool
-do_eof(gv)
-GV *gv;
+do_eof(GV *gv)
 {
     dTHR;
     register IO *io;
@@ -664,8 +664,7 @@ GV *gv;
 }
 
 long
-do_tell(gv)
-GV *gv;
+do_tell(GV *gv)
 {
     register IO *io;
     register PerlIO *fp;
@@ -684,10 +683,7 @@ GV *gv;
 }
 
 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;
@@ -706,16 +702,13 @@ int whence;
 }
 
 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);
+       return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
     if (dowarn)
        warn("sysseek() on unopened file");
     SETERRNO(EBADF,RMS$_IFI);
@@ -733,19 +726,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 {
@@ -774,9 +767,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;
@@ -820,10 +811,9 @@ PerlIO *fp;
 }
 
 I32
-my_stat(ARGS)
-dARGS
+my_stat(ARGSproto)
 {
-    dSP;
+    djSP;
     IO *io;
     GV* tmpgv;
 
@@ -836,7 +826,7 @@ dARGS
            statgv = tmpgv;
            sv_setpv(statname,"");
            laststype = OP_STAT;
-           return (laststatval = Fstat(PerlIO_fileno(IoIFP(io)), &statcache));
+           return (laststatval = PerlLIO_fstat(PerlIO_fileno(IoIFP(io)), &statcache));
        }
        else {
            if (tmpgv == defgv)
@@ -864,7 +854,7 @@ dARGS
        statgv = Nullgv;
        sv_setpv(statname,SvPV(sv, na));
        laststype = OP_STAT;
-       laststatval = Stat(SvPV(sv, na),&statcache);
+       laststatval = PerlLIO_stat(SvPV(sv, na),&statcache);
        if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n'))
            warn(warn_nl, "stat");
        return laststatval;
@@ -872,10 +862,9 @@ dARGS
 }
 
 I32
-my_lstat(ARGS)
-dARGS
+my_lstat(ARGSproto)
 {
-    dSP;
+    djSP;
     SV *sv;
     if (op->op_flags & OPf_REF) {
        EXTEND(sp,1);
@@ -893,9 +882,9 @@ dARGS
     PUTBACK;
     sv_setpv(statname,SvPV(sv, na));
 #ifdef HAS_LSTAT
-    laststatval = lstat(SvPV(sv, na),&statcache);
+    laststatval = PerlLIO_lstat(SvPV(sv, na),&statcache);
 #else
-    laststatval = Stat(SvPV(sv, na),&statcache);
+    laststatval = PerlLIO_stat(SvPV(sv, na),&statcache);
 #endif
     if (laststatval < 0 && dowarn && strchr(SvPV(sv, na), '\n'))
        warn(warn_nl, "lstat");
@@ -903,10 +892,7 @@ dARGS
 }
 
 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;
@@ -925,9 +911,9 @@ register SV **sp;
        if (*Argv[0] != '/')    /* will execvp use PATH? */
            TAINT_ENV();                /* testing IFS here is overkill, probably */
        if (really && *(tmps = SvPV(really, na)))
-           execvp(tmps,Argv);
+           PerlProc_execvp(tmps,Argv);
        else
-           execvp(Argv[0],Argv);
+           PerlProc_execvp(Argv[0],Argv);
        if (dowarn)
            warn("Can't exec \"%s\": %s", Argv[0], Strerror(errno));
     }
@@ -936,7 +922,7 @@ register SV **sp;
 }
 
 void
-do_execfree()
+do_execfree(void)
 {
     if (Argv) {
        Safefree(Argv);
@@ -948,11 +934,10 @@ do_execfree()
     }
 }
 
-#ifndef OS2
+#if !defined(OS2) && !defined(WIN32) && !defined(DJGPP)
 
 bool
-do_exec(cmd)
-char *cmd;
+do_exec(char *cmd)
 {
     register char **a;
     register char *s;
@@ -982,7 +967,7 @@ char *cmd;
                *--s = '\0';
            if (s[-1] == '\'') {
                *--s = '\0';
-               execl(cshname,"csh", flags,ncmd,(char*)0);
+               PerlProc_execl(cshname,"csh", flags,ncmd,(char*)0);
                *s = '\'';
                return FALSE;
            }
@@ -1009,7 +994,7 @@ char *cmd;
                break;
            }
          doshell:
-           execl(sh_path, "sh", "-c", cmd, (char*)0);
+           PerlProc_execl(sh_path, "sh", "-c", cmd, (char*)0);
            return FALSE;
        }
     }
@@ -1027,7 +1012,7 @@ char *cmd;
     }
     *a = Nullch;
     if (Argv[0]) {
-       execvp(Argv[0],Argv);
+       PerlProc_execvp(Argv[0],Argv);
        if (errno == ENOEXEC) {         /* for system V NIH syndrome */
            do_execfree();
            goto doshell;
@@ -1039,13 +1024,10 @@ char *cmd;
     return FALSE;
 }
 
-#endif /* OS2 */
+#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;
@@ -1070,7 +1052,7 @@ register SV **sp;
            tot = sp - mark;
            val = SvIVx(*mark);
            while (++mark <= sp) {
-               if (chmod(SvPVx(*mark, na),val))
+               if (PerlLIO_chmod(SvPVx(*mark, na),val))
                    tot--;
            }
        }
@@ -1139,16 +1121,16 @@ register SV **sp;
            while (++mark <= sp) {
                I32 proc = SvIVx(*mark);
 #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))
+               if (PerlProc_kill(SvIVx(*mark),val))
                    tot--;
            }
        }
@@ -1165,9 +1147,9 @@ register SV **sp;
            }
            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,&statbuf) < 0 || S_ISDIR(statbuf.st_mode))
 #else
-               if (Stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode))
+               if (PerlLIO_stat(s,&statbuf) < 0 || S_ISDIR(statbuf.st_mode))
 #endif
                    tot--;
                else {
@@ -1200,7 +1182,7 @@ register SV **sp;
 #endif
            tot = sp - mark;
            while (++mark <= sp) {
-               if (utime(SvPVx(*mark, na),&utbuf))
+               if (PerlLIO_utime(SvPVx(*mark, na),&utbuf))
                    tot--;
            }
        }
@@ -1215,10 +1197,7 @@ register SV **sp;
 /* 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]
@@ -1270,9 +1249,7 @@ register struct stat *statbufp;
 #endif /* ! VMS */
 
 I32
-ingroup(testgid,effective)
-I32 testgid;
-I32 effective;
+ingroup(I32 testgid, I32 effective)
 {
     if (testgid == (effective ? egid : gid))
        return TRUE;
@@ -1296,10 +1273,7 @@ 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;
@@ -1332,10 +1306,7 @@ 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;
@@ -1373,29 +1344,25 @@ SV **sp;
            infosize = sizeof(struct semid_ds);
        else if (cmd == GETALL || cmd == SETALL)
        {
+           struct semid_ds semds;
 #ifdef __linux__       /* XXX Need metaconfig test */
-/* linux uses :
-   int semctl (int semid, int semnun, int cmd, union semun arg)
-
+/* linux (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 semds;
-           if (semctl(id, 0, IPC_STAT, semds) == -1)
+            union semun semun;
+            semun.buf = &semds;
+           if (semctl(id, 0, IPC_STAT, semun) == -1)
 #else
-           struct semid_ds semds;
            if (semctl(id, 0, IPC_STAT, &semds) == -1)
 #endif
                return -1;
            getinfo = (cmd == GETALL);
-#ifdef __linux__       /* XXX Need metaconfig test */
-           infosize = semds.buf->sem_nsems * sizeof(short);
-#else
            infosize = semds.sem_nsems * sizeof(short);
-#endif
                /* "short" is technically wrong but much more portable
                   than guessing about u_?short(_t)? */
        }
@@ -1461,9 +1428,7 @@ SV **sp;
 }
 
 I32
-do_msgsnd(mark, sp)
-SV **mark;
-SV **sp;
+do_msgsnd(SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
     dTHR;
@@ -1486,9 +1451,7 @@ SV **sp;
 }
 
 I32
-do_msgrcv(mark, sp)
-SV **mark;
-SV **sp;
+do_msgrcv(SV **mark, SV **sp)
 {
 #ifdef HAS_MSG
     dTHR;
@@ -1525,9 +1488,7 @@ SV **sp;
 }
 
 I32
-do_semop(mark, sp)
-SV **mark;
-SV **sp;
+do_semop(SV **mark, SV **sp)
 {
 #ifdef HAS_SEM
     dTHR;
@@ -1552,10 +1513,7 @@ 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;
@@ -1576,7 +1534,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) {
@@ -1605,3 +1563,4 @@ SV **sp;
 }
 
 #endif /* SYSV IPC */
+