X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fvms.c;h=84330e2f98e355111ca5cb687ec38a39909ca79c;hb=88bf70ddad663558df6e83dce8f369f639fc7dd6;hp=98f34cef354d111cfd7e7fadfa15ac752de17a14;hpb=ff0cee690d2ef6ba882e59dd4baaa0c944adb7a2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/vms/vms.c b/vms/vms.c index 98f34ce..84330e2 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -2,8 +2,8 @@ * * VMS-specific routines for perl5 * - * Last revised: 15-Feb-1997 by Charles Bailey bailey@genetics.upenn.edu - * Version: 5.3.27 + * Last revised: 11-Apr-1997 by Charles Bailey bailey@genetics.upenn.edu + * Version: 5.3.97c */ #include @@ -42,9 +42,9 @@ # define SS$_NOSUCHOBJECT 2696 #endif -/* Don't intercept calls to vfork, since my_vfork below needs to - * get to the underlying CRTL routine. */ -#define __DONT_MASK_VFORK +/* Don't replace system definitions of vfork, getenv, and stat, + * code below needs to get to the underlying CRTL routines. */ +#define DONT_MASK_RTL_CALLS #include "EXTERN.h" #include "perl.h" #include "XSUB.h" @@ -162,6 +162,8 @@ my_getenv(char *lnm) } /* end of my_getenv() */ /*}}}*/ +static FILE *safe_popen(char *, char *); + /*{{{ void prime_env_iter() */ void prime_env_iter(void) @@ -188,9 +190,9 @@ prime_env_iter(void) (void) hv_fetch(envhv,"USER",4,TRUE); /* Now, go get the logical names */ - if ((sholog = my_popen("$ Show Logical *","r")) == Nullfp) + if ((sholog = safe_popen("$ Show Logical *","r")) == Nullfp) _ckvmssts(vaxc$errno); - /* We use Perl's sv_gets to read from the pipe, since my_popen is + /* We use Perl's sv_gets to read from the pipe, since safe_popen is * tied to Perl's I/O layer, so it may not return a simple FILE * */ oldrs = rs; rs = newSVpv("\n",1); @@ -333,7 +335,7 @@ do_rmdir(char *name) { char dirfile[NAM$C_MAXRSS+1]; int retval; - struct stat st; + struct mystat st; if (do_fileify_dirspec(name,dirfile,0) == NULL) return -1; if (flex_stat(dirfile,&st) || !S_ISDIR(st.st_mode)) retval = -1; @@ -453,6 +455,28 @@ kill_file(char *name) } /* end of kill_file() */ /*}}}*/ + +/*{{{int my_mkdir(char *,Mode_t)*/ +int +my_mkdir(char *dir, Mode_t mode) +{ + STRLEN dirlen = strlen(dir); + + /* CRTL mkdir() doesn't tolerate trailing /, since that implies + * null file name/type. However, it's commonplace under Unix, + * so we'll allow it for a gain in portability. + */ + if (dir[dirlen-1] == '/') { + char *newdir = savepvn(dir,dirlen-1); + int ret = mkdir(newdir,mode); + Safefree(newdir); + return ret; + } + else return mkdir(dir,mode); +} /* end of my_mkdir */ +/*}}}*/ + + static void create_mbx(unsigned short int *chan, struct dsc$descriptor_s *namdsc) { @@ -502,7 +526,8 @@ static int waitpid_asleep = 0; static unsigned long int pipe_exit_routine() { - unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT, sts; + unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT; + int sts; while (open_pipes != NULL) { if (!open_pipes->done) { /* Tap them gently on the shoulder . . .*/ @@ -511,7 +536,8 @@ pipe_exit_routine() } if (!open_pipes->done) /* We tried to be nice . . . */ _ckvmssts(sys$delprc(&open_pipes->pid,0)); - if (!((sts = my_pclose(open_pipes->fp))&1)) retsts = sts; + if ((sts = my_pclose(open_pipes->fp)) == -1) retsts = vaxc$errno; + else if (!(sts & 1)) retsts = sts; } return retsts; } @@ -531,9 +557,8 @@ popen_completion_ast(struct pipe_details *thispipe) } } -/*{{{ FILE *my_popen(char *cmd, char *mode)*/ -FILE * -my_popen(char *cmd, char *mode) +static FILE * +safe_popen(char *cmd, char *mode) { static int handler_set_up = FALSE; char mbxname[64]; @@ -553,7 +578,7 @@ my_popen(char *cmd, char *mode) return Nullfp; } - New(7001,info,1,struct pipe_details); + New(1301,info,1,struct pipe_details); /* create mailbox */ create_mbx(&chan,&namdsc); @@ -591,7 +616,18 @@ my_popen(char *cmd, char *mode) forkprocess = info->pid; return info->fp; +} /* end of safe_popen */ + + +/*{{{ FILE *my_popen(char *cmd, char *mode)*/ +FILE * +my_popen(char *cmd, char *mode) +{ + TAINT_ENV(); + TAINT_PROPER("popen"); + return safe_popen(cmd,mode); } + /*}}}*/ /*{{{ I32 my_pclose(FILE *fp)*/ @@ -603,9 +639,11 @@ I32 my_pclose(FILE *fp) for (info = open_pipes; info != NULL; last = info, info = info->next) if (info->fp == fp) break; - if (info == NULL) - /* get here => no such pipe open */ - croak("No such pipe open"); + if (info == NULL) { /* no such pipe open */ + set_errno(ECHILD); /* quoth POSIX */ + set_vaxc_errno(SS$_NONEXPR); + return -1; + } /* If we were writing to a subprocess, insure that someone reading from * the mailbox gets an EOF. It looks like a simple fclose() doesn't @@ -736,30 +774,41 @@ my_gconvert(double val, int ndig, int trail, char *buf) * rmesexpand() returns the address of the resultant string if * successful, and NULL on error. */ +static char *do_tounixspec(char *, char *, int); + static char * do_rmsexpand(char *filespec, char *outbuf, int ts, char *defspec, unsigned opts) { static char __rmsexpand_retbuf[NAM$C_MAXRSS+1]; + char vmsfspec[NAM$C_MAXRSS+1], tmpfspec[NAM$C_MAXRSS+1]; char esa[NAM$C_MAXRSS], *cp, *out = NULL; struct FAB myfab = cc$rms_fab; struct NAM mynam = cc$rms_nam; STRLEN speclen; - unsigned long int retsts, haslower = 0; + unsigned long int retsts, haslower = 0, isunix = 0; if (!filespec || !*filespec) { set_vaxc_errno(LIB$_INVARG); set_errno(EINVAL); return NULL; } if (!outbuf) { - if (ts) out = New(7019,outbuf,NAM$C_MAXRSS+1,char); + if (ts) out = New(1319,outbuf,NAM$C_MAXRSS+1,char); else outbuf = __rmsexpand_retbuf; } + if ((isunix = (strchr(filespec,'/') != NULL))) { + if (do_tovmsspec(filespec,vmsfspec,0) == NULL) return NULL; + filespec = vmsfspec; + } myfab.fab$l_fna = filespec; myfab.fab$b_fns = strlen(filespec); myfab.fab$l_nam = &mynam; if (defspec && *defspec) { + if (strchr(defspec,'/') != NULL) { + if (do_tovmsspec(defspec,tmpfspec,0) == NULL) return NULL; + defspec = tmpfspec; + } myfab.fab$l_dna = defspec; myfab.fab$b_dns = strlen(defspec); } @@ -814,7 +863,17 @@ do_rmsexpand(char *filespec, char *outbuf, int ts, char *defspec, unsigned opts) if (haslower) __mystrtolower(out); /* Have we been working with an expanded, but not resultant, spec? */ - if (!mynam.nam$b_rsl) strcpy(outbuf,esa); + /* Also, convert back to Unix syntax if necessary. */ + if (!mynam.nam$b_rsl) { + if (isunix) { + if (do_tounixspec(esa,outbuf,0) == NULL) return NULL; + } + else strcpy(outbuf,esa); + } + else if (isunix) { + if (do_tounixspec(outbuf,tmpfspec,0) == NULL) return NULL; + strcpy(outbuf,tmpfspec); + } return outbuf; } /*}}}*/ @@ -859,8 +918,6 @@ char *rmsexpand_ts(char *spec, char *buf, char *def, unsigned opt) ** found in the Perl standard distribution. */ -static char *do_tounixspec(char *, char *, int); - /*{{{ char *fileify_dirspec[_ts](char *path, char *buf)*/ static char *do_fileify_dirspec(char *dir,char *buf,int ts) { @@ -976,7 +1033,7 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) } retlen = dirlen + (addmfd ? 13 : 6); if (buf) retspec = buf; - else if (ts) New(7009,retspec,retlen+1,char); + else if (ts) New(1309,retspec,retlen+1,char); else retspec = __fileify_retbuf; if (addmfd) { dirlen = lastdir - dir; @@ -1057,7 +1114,7 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) if (dirnam.nam$l_fnb & NAM$M_EXP_NAME) { /* They provided at least the name; we added the type, if necessary, */ if (buf) retspec = buf; /* in sys$parse() */ - else if (ts) New(7011,retspec,dirnam.nam$b_esl+1,char); + else if (ts) New(1311,retspec,dirnam.nam$b_esl+1,char); else retspec = __fileify_retbuf; strcpy(retspec,esa); return retspec; @@ -1076,7 +1133,7 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) /* There's more than one directory in the path. Just roll back. */ *cp1 = term; if (buf) retspec = buf; - else if (ts) New(7011,retspec,retlen+7,char); + else if (ts) New(1311,retspec,retlen+7,char); else retspec = __fileify_retbuf; strcpy(retspec,esa); } @@ -1091,7 +1148,7 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) } retlen = dirnam.nam$b_esl - 9; /* esa - '][' - '].DIR;1' */ if (buf) retspec = buf; - else if (ts) New(7012,retspec,retlen+16,char); + else if (ts) New(1312,retspec,retlen+16,char); else retspec = __fileify_retbuf; cp1 = strstr(esa,"]["); dirlen = cp1 - esa; @@ -1119,7 +1176,7 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) } else { /* This is a top-level dir. Add the MFD to the path. */ if (buf) retspec = buf; - else if (ts) New(7012,retspec,retlen+16,char); + else if (ts) New(1312,retspec,retlen+16,char); else retspec = __fileify_retbuf; cp1 = esa; cp2 = retspec; @@ -1166,7 +1223,7 @@ static char *do_pathify_dirspec(char *dir,char *buf, int ts) /* Trap simple rooted lnms, and return lnm:[000000] */ if (!strcmp(trndir+trnlen-2,".]")) { if (buf) retpath = buf; - else if (ts) New(7018,retpath,strlen(dir)+10,char); + else if (ts) New(1318,retpath,strlen(dir)+10,char); else retpath = __pathify_retbuf; strcpy(retpath,dir); strcat(retpath,":[000000]"); @@ -1206,7 +1263,7 @@ static char *do_pathify_dirspec(char *dir,char *buf, int ts) } } if (buf) retpath = buf; - else if (ts) New(7013,retpath,retlen+1,char); + else if (ts) New(1313,retpath,retlen+1,char); else retpath = __pathify_retbuf; strncpy(retpath,dir,retlen-1); if (retpath[retlen-2] != '/') { /* If the path doesn't already end */ @@ -1251,7 +1308,7 @@ static char *do_pathify_dirspec(char *dir,char *buf, int ts) dir[dirfab.fab$b_fns-1] == '>' || dir[dirfab.fab$b_fns-1] == ':') { /* It's already a VMS 'path' */ if (buf) retpath = buf; - else if (ts) New(7014,retpath,strlen(dir)+1,char); + else if (ts) New(1314,retpath,strlen(dir)+1,char); else retpath = __pathify_retbuf; strcpy(retpath,dir); return retpath; @@ -1308,7 +1365,7 @@ static char *do_pathify_dirspec(char *dir,char *buf, int ts) *(dirnam.nam$l_type + 1) = '\0'; retlen = dirnam.nam$l_type - esa + 2; if (buf) retpath = buf; - else if (ts) New(7014,retpath,retlen,char); + else if (ts) New(1314,retpath,retlen,char); else retpath = __pathify_retbuf; strcpy(retpath,esa); /* $PARSE may have upcased filespec, so convert output to lower @@ -1346,7 +1403,7 @@ static char *do_tounixspec(char *spec, char *buf, int ts) { expand++; cp1 +=2; } /* VMS '...' ==> Unix '/.../' */ } } - New(7015,rslt,retlen+2+2*expand,char); + New(1315,rslt,retlen+2+2*expand,char); } else rslt = __tounixspec_retbuf; if (strchr(spec,'/') != NULL) { @@ -1462,7 +1519,7 @@ static char *do_tovmsspec(char *path, char *buf, int ts) { if (path == NULL) return NULL; if (buf) rslt = buf; - else if (ts) New(7016,rslt,strlen(path)+9,char); + else if (ts) New(1316,rslt,strlen(path)+9,char); else rslt = __tovmsspec_retbuf; if (strpbrk(path,"]:>") || (dirend = strrchr(path,'/')) == NULL) { @@ -1604,7 +1661,7 @@ static char *do_tovmspath(char *path, char *buf, int ts) { if (buf) return buf; else if (ts) { vmslen = strlen(vmsified); - New(7017,cp,vmslen+1,char); + New(1317,cp,vmslen+1,char); memcpy(cp,vmsified,vmslen); cp[vmslen] = '\0'; return cp; @@ -1633,7 +1690,7 @@ static char *do_tounixpath(char *path, char *buf, int ts) { if (buf) return buf; else if (ts) { unixlen = strlen(unixified); - New(7017,cp,unixlen+1,char); + New(1317,cp,unixlen+1,char); memcpy(cp,unixified,unixlen); cp[unixlen] = '\0'; return cp; @@ -1702,7 +1759,7 @@ static int background_process(int argc, char **argv); static void pipe_and_fork(char **cmargv); /*{{{ void getredirection(int *ac, char ***av)*/ -void +static void getredirection(int *ac, char ***av) /* * Process vms redirection arg's. Exit if any error is seen. @@ -1851,7 +1908,7 @@ getredirection(int *ac, char ***av) * Allocate and fill in the new argument vector, Some Unix's terminate * the list with an extra null pointer. */ - New(7002, argv, item_count+1, char *); + New(1302, argv, item_count+1, char *); *av = argv; for (j = 0; j < item_count; ++j, list_head = list_head->next) argv[j] = list_head->value; @@ -1938,11 +1995,11 @@ static void add_item(struct list_item **head, { if (*head == 0) { - New(7003,*head,1,struct list_item); + New(1303,*head,1,struct list_item); *tail = *head; } else { - New(7004,(*tail)->next,1,struct list_item); + New(1304,(*tail)->next,1,struct list_item); *tail = (*tail)->next; } (*tail)->value = value; @@ -1996,7 +2053,7 @@ unsigned long int zero = 0, sts; char *string; char *c; - New(7005,string,resultspec.dsc$w_length+1,char); + New(1305,string,resultspec.dsc$w_length+1,char); strncpy(string, resultspec.dsc$a_pointer, resultspec.dsc$w_length); string[resultspec.dsc$w_length] = '\0'; if (NULL == had_version) @@ -2164,6 +2221,34 @@ unsigned long int flags = 17, one = 1, retsts; /*}}}*/ /***** End of code taken from Mark Pizzolato's argproc.c package *****/ + +/* OS-specific initialization at image activation (not thread startup) */ +/*{{{void vms_image_init(int *, char ***)*/ +void +vms_image_init(int *argcp, char ***argvp) +{ + unsigned long int *mask, iosb[2], i; + unsigned short int dummy; + union prvdef iprv; + struct itmlst_3 jpilist[2] = { {sizeof iprv, JPI$_IMAGPRIV, &iprv, &dummy}, + { 0, 0, 0, 0} }; + + _ckvmssts(sys$getjpiw(0,NULL,NULL,jpilist,iosb,NULL,NULL)); + _ckvmssts(iosb[0]); + mask = (unsigned long int *) &iprv; /* Quick change of view */; + for (i = 0; i < (sizeof iprv + sizeof(unsigned long int) - 1) / sizeof(unsigned long int); i++) { + if (mask[i]) { /* Running image installed with privs? */ + _ckvmssts(sys$setprv(0,&iprv,0,NULL)); /* Turn 'em off. */ + tainting = TRUE; + break; + } + } + getredirection(argcp,argvp); + return; +} +/*}}}*/ + + /* trim_unixpath() * Trim Unix-style prefix off filespec, so it looks like what a shell * glob expansion would return (i.e. from specified prefix on, not @@ -2327,7 +2412,6 @@ trim_unixpath(char *fspec, char *wildspec, int opts) /* * VMS readdir() routines. * Written by Rich $alz, in August, 1990. - * This code has no copyright. * * 21-Jul-1994 Charles Bailey bailey@genetics.upenn.edu * Minor modifications to original routines. @@ -2347,12 +2431,12 @@ opendir(char *name) char dir[NAM$C_MAXRSS+1]; /* Get memory for the handle, and the pattern. */ - New(7006,dd,1,DIR); + New(1306,dd,1,DIR); if (do_tovmspath(name,dir,0) == NULL) { Safefree((char *)dd); return(NULL); } - New(7007,dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); + New(1307,dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); /* Fill in the fields; mainly playing with the descriptor. */ (void)sprintf(dd->pattern, "%s*.*",dir); @@ -2411,7 +2495,7 @@ collectversions(dd) /* Add the version wildcard, ignoring the "*.*" put on before */ i = strlen(dd->pattern); - New(7008,text,i + e->d_namlen + 3,char); + New(1308,text,i + e->d_namlen + 3,char); (void)strcpy(text, dd->pattern); (void)sprintf(&text[i - 3], "%s;*", e->d_name); @@ -2599,6 +2683,7 @@ vms_execfree() { static char * setup_argstr(SV *really, SV **mark, SV **sp) { + dTHR; char *junk, *tmps = Nullch; register size_t cmdlen = 0; size_t rlen; @@ -2741,6 +2826,8 @@ vms_do_exec(char *cmd) { /* no vfork - act VMSish */ unsigned long int retsts; + TAINT_ENV(); + TAINT_PROPER("exec"); if ((retsts = setup_cmddsc(cmd,1)) & 1) retsts = lib$do_command(&VMScmd); @@ -2774,6 +2861,8 @@ do_spawn(char *cmd) { unsigned long int substs, hadcmd = 1; + TAINT_ENV(); + TAINT_PROPER("spawn"); if (!cmd || !*cmd) { hadcmd = 0; _ckvmssts(lib$spawn(0,0,0,0,0,0,&substs,0,0,0,0,0,0)); @@ -2820,6 +2909,22 @@ my_fwrite(void *src, size_t itmsz, size_t nitm, FILE *dest) } /* end of my_fwrite() */ /*}}}*/ +/*{{{ int my_flush(FILE *fp)*/ +int +my_flush(FILE *fp) +{ + int res; + if ((res = fflush(fp)) == 0) { +#ifdef VMS_DO_SOCKETS + struct mystat s; + if (Fstat(fileno(fp), &s) == 0 && !S_ISSOCK(s.st_mode)) +#endif + res = fsync(fileno(fp)); + } + return res; +} +/*}}}*/ + /* * Here are replacements for the following Unix routines in the VMS environment: * getpwuid Get information for a particular UIC or UID @@ -2965,7 +3070,7 @@ struct passwd *my_getpwnam(char *name) { struct dsc$descriptor_s name_desc; union uicdef uic; - unsigned long int status, stat; + unsigned long int status, sts; __pwdcache = __passwd_empty; if (!fillpasswd(name, &__pwdcache)) { @@ -2974,17 +3079,17 @@ struct passwd *my_getpwnam(char *name) name_desc.dsc$b_dtype= DSC$K_DTYPE_T; name_desc.dsc$b_class= DSC$K_CLASS_S; name_desc.dsc$a_pointer= (char *) name; - if ((stat = sys$asctoid(&name_desc, &uic, 0)) == SS$_NORMAL) { + if ((sts = sys$asctoid(&name_desc, &uic, 0)) == SS$_NORMAL) { __pwdcache.pw_uid= uic.uic$l_uic; __pwdcache.pw_gid= uic.uic$v_group; } else { - if (stat == SS$_NOSUCHID || stat == SS$_IVIDENT || stat == RMS$_PRV) { - set_vaxc_errno(stat); - set_errno(stat == RMS$_PRV ? EACCES : EINVAL); + if (sts == SS$_NOSUCHID || sts == SS$_IVIDENT || sts == RMS$_PRV) { + set_vaxc_errno(sts); + set_errno(sts == RMS$_PRV ? EACCES : EINVAL); return NULL; } - else { _ckvmssts(stat); } + else { _ckvmssts(sts); } } } strncpy(__pw_namecache, name, sizeof(__pw_namecache)); @@ -3073,6 +3178,79 @@ void my_endpwent() } /*}}}*/ +#if __VMS_VER < 70000000 || __DECC_VER < 50200000 +/* Signal handling routines, pulled into the core from POSIX.xs. + * + * We need these for threads, so they've been rolled into the core, + * rather than left in POSIX.xs. + * + * (DRS, Oct 23, 1997) + */ + +/* sigset_t is atomic under VMS, so these routines are easy */ +int my_sigemptyset(sigset_t *set) { + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + *set = 0; return 0; +} +int my_sigfillset(sigset_t *set) { + int i; + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + for (i = 0; i < NSIG; i++) *set |= (1 << i); + return 0; +} +int my_sigaddset(sigset_t *set, int sig) { + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + if (sig > NSIG) { SETERRNO(EINVAL,LIB$_INVARG); return -1; } + *set |= (1 << (sig - 1)); + return 0; +} +int my_sigdelset(sigset_t *set, int sig) { + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + if (sig > NSIG) { SETERRNO(EINVAL,LIB$_INVARG); return -1; } + *set &= ~(1 << (sig - 1)); + return 0; +} +int my_sigismember(sigset_t *set, int sig) { + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + if (sig > NSIG) { SETERRNO(EINVAL,LIB$_INVARG); return -1; } + *set & (1 << (sig - 1)); +} +int my_sigprocmask(int how, sigset_t *set, sigset_t *oset) { + sigset_t tempmask; + + /* If set and oset are both null, then things are badky wrong. Bail */ + if ((oset == NULL) && (set == NULL)) { + set_errno(EFAULT); set_vaxc_errno(SS$_ACCVIO); + return -1; + } + + /* If set's null, then we're just handling a fetch. */ + if (set == NULL) { + tempmask = sigblock(0); + } else { + switch (how) { + case SIG_SETMASK: + tempmask = sigsetmask(*set); + break; + case SIG_BLOCK: + tempmask = sigblock(*set); + break; + case SIG_UNBLOCK: + tempmask = sigblock(0); + sigsetmask(*oset & ~tempmask); + break; + default: + set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); + return -1; + } + } + + /* Did they pass us an oset? If so, stick our holding mask into it */ + if (oset) + *oset = tempmask; + + return 0; +} /* Used for UTC calculation in my_gmtime(), my_localtime(), my_time(), * my_utime(), and flex_stat(), all of which operate on UTC unless @@ -3103,6 +3281,7 @@ static long int utc_offset_secs; /*{{{time_t my_time(time_t *timep)*/ time_t my_time(time_t *timep) { + dTHR; time_t when; if (gmtime_emulation_type == 0) { @@ -3150,9 +3329,15 @@ time_t my_time(time_t *timep) struct tm * my_gmtime(const time_t *timep) { + dTHR; char *p; time_t when; + if (timep == NULL) { + set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); + return NULL; + } + if (*timep == 0) gmtime_emulation_type = 0; /* possibly reset TZ */ if (gmtime_emulation_type == 0) (void) my_time(NULL); /* Init UTC */ when = *timep; @@ -3170,8 +3355,14 @@ my_gmtime(const time_t *timep) struct tm * my_localtime(const time_t *timep) { + dTHR; time_t when; + if (timep == NULL) { + set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); + return NULL; + } + if (*timep == 0) gmtime_emulation_type = 0; /* possibly reset TZ */ if (gmtime_emulation_type == 0) (void) my_time(NULL); /* Init UTC */ when = *timep; @@ -3189,6 +3380,7 @@ my_localtime(const time_t *timep) #define localtime(t) my_localtime(t) #define time(t) my_time(t) +#endif /* VMS VER < 7.0 || Dec C < 5.2 /* my_utime - update modification time of a file * calling sequence is identical to POSIX utime(), but under @@ -3210,6 +3402,7 @@ static const long int utime_baseadjust[2] = { 0x4beb4000, 0x7c9567 }; /*{{{int my_utime(char *path, struct utimbuf *utimes)*/ int my_utime(char *file, struct utimbuf *utimes) { + dTHR; register int i; long int bintime[2], len = 2, lowbit, unixtime, secscale = 10000000; /* seconds --> 100 ns intervals */ @@ -3252,7 +3445,7 @@ int my_utime(char *file, struct utimbuf *utimes) */ lowbit = (utimes->modtime & 1) ? secscale : 0; unixtime = (long int) utimes->modtime; -# ifdef VMSISH_TIME +#if defined(VMSISH_TIME) && (__VMS_VER < 70000000 || __DECC_VER < 50200000) if (!VMSISH_TIME) { /* Input was UTC; convert to local for sys svc */ if (!gmtime_emulation_type) (void) time(NULL); /* Initialize UTC */ unixtime += utc_offset_secs; @@ -3388,11 +3581,11 @@ int my_utime(char *file, struct utimbuf *utimes) * on the first call. */ #define LOCKID_MASK 0x80000000 /* Use 0 to force device name use only */ -static dev_t encode_dev (const char *dev) +static mydev_t encode_dev (const char *dev) { int i; unsigned long int f; - dev_t enc; + mydev_t enc; char c; const char *q; @@ -3456,14 +3649,15 @@ is_null_device(name) /* Do the permissions allow some operation? Assumes statcache already set. */ /* Do this via $Check_Access on VMS, since the CRTL stat() returns only a - * subset of the applicable information. + * subset of the applicable information. (We have to stick with struct + * stat instead of struct mystat in the prototype since we have to match + * the one in proto.h.) */ /*{{{I32 cando(I32 bit, I32 effective, struct stat *statbufp)*/ I32 cando(I32 bit, I32 effective, struct stat *statbufp) { - if (statbufp == &statcache) - return cando_by_name(bit,effective,namecache); + if (statbufp == &statcache) return cando_by_name(bit,effective,namecache); else { char fname[NAM$C_MAXRSS+1]; unsigned long int retsts; @@ -3472,13 +3666,13 @@ cando(I32 bit, I32 effective, struct stat *statbufp) /* If the struct mystat is stale, we're OOL; stat() overwrites the device name on successive calls */ - devdsc.dsc$a_pointer = statbufp->st_devnam; - devdsc.dsc$w_length = strlen(statbufp->st_devnam); + devdsc.dsc$a_pointer = ((struct mystat *)statbufp)->st_devnam; + devdsc.dsc$w_length = strlen(((struct mystat *)statbufp)->st_devnam); namdsc.dsc$a_pointer = fname; namdsc.dsc$w_length = sizeof fname - 1; - retsts = lib$fid_to_name(&devdsc,&(statbufp->st_ino),&namdsc, - &namdsc.dsc$w_length,0,0); + retsts = lib$fid_to_name(&devdsc,&(((struct mystat *)statbufp)->st_ino), + &namdsc,&namdsc.dsc$w_length,0,0); if (retsts & 1) { fname[namdsc.dsc$w_length] = '\0'; return cando_by_name(bit,effective,fname); @@ -3589,23 +3783,26 @@ cando_by_name(I32 bit, I32 effective, char *fname) /*}}}*/ -/*{{{ int flex_fstat(int fd, struct stat *statbuf)*/ -#undef stat +/*{{{ int flex_fstat(int fd, struct mystat *statbuf)*/ int flex_fstat(int fd, struct mystat *statbufp) { + dTHR; + if (!fstat(fd,(stat_t *) statbufp)) { - if (statbufp == &statcache) *namecache == '\0'; + if (statbufp == (struct mystat *) &statcache) *namecache == '\0'; statbufp->st_dev = encode_dev(statbufp->st_devnam); # ifdef VMSISH_TIME if (!VMSISH_TIME) { /* Return UTC instead of local time */ # else if (1) { # endif +#if __VMS_VER < 70000000 || __DECC_VER < 50200000 if (!gmtime_emulation_type) (void)time(NULL); statbufp->st_mtime -= utc_offset_secs; statbufp->st_atime -= utc_offset_secs; statbufp->st_ctime -= utc_offset_secs; +#endif } return 0; } @@ -3614,19 +3811,16 @@ flex_fstat(int fd, struct mystat *statbufp) } /* end of flex_fstat() */ /*}}}*/ -/*{{{ int flex_stat(char *fspec, struct stat *statbufp)*/ -/* We defined 'stat' as 'mystat' in vmsish.h so that declarations of - * 'struct stat' elsewhere in Perl would use our struct. We go back - * to the system version here, since we're actually calling their - * stat(). - */ +/*{{{ int flex_stat(char *fspec, struct mystat *statbufp)*/ int flex_stat(char *fspec, struct mystat *statbufp) { + dTHR; char fileified[NAM$C_MAXRSS+1]; int retval = -1; - if (statbufp == &statcache) do_tovmsspec(fspec,namecache,0); + if (statbufp == (struct mystat *) &statcache) + do_tovmsspec(fspec,namecache,0); if (is_null_device(fspec)) { /* Fake a stat() for the null device */ memset(statbufp,0,sizeof *statbufp); statbufp->st_dev = encode_dev("_NLA0:"); @@ -3648,7 +3842,8 @@ flex_stat(char *fspec, struct mystat *statbufp) */ if (do_fileify_dirspec(fspec,fileified,0) != NULL) { retval = stat(fileified,(stat_t *) statbufp); - if (!retval && statbufp == &statcache) strcpy(namecache,fileified); + if (!retval && statbufp == (struct mystat *) &statcache) + strcpy(namecache,fileified); } if (retval) retval = stat(fspec,(stat_t *) statbufp); if (!retval) { @@ -3658,17 +3853,17 @@ flex_stat(char *fspec, struct mystat *statbufp) # else if (1) { # endif +#if __VMS_VER < 70000000 || __DECC_VER < 50200000 if (!gmtime_emulation_type) (void)time(NULL); statbufp->st_mtime -= utc_offset_secs; statbufp->st_atime -= utc_offset_secs; statbufp->st_ctime -= utc_offset_secs; +#endif } } return retval; } /* end of flex_stat() */ -/* Reset definition for later calls */ -#define stat mystat /*}}}*/ /* Insures that no carriage-control translation will be done on a file. */ @@ -4030,7 +4225,7 @@ candelete_fromperl(CV *cv) } } - ST(0) = cando_by_name(S_IDUSR,0,fsp) ? &sv_yes : &sv_no; + ST(0) = boolSV(cando_by_name(S_IDUSR,0,fsp)); XSRETURN(1); } @@ -4083,7 +4278,7 @@ rmscopy_fromperl(CV *cv) } date_flag = (items == 3) ? SvIV(ST(2)) : 0; - ST(0) = rmscopy(inp,outp,date_flag) ? &sv_yes : &sv_no; + ST(0) = boolSV(rmscopy(inp,outp,date_flag)); XSRETURN(1); }