X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fvms.c;h=1212555d049cfc1928551d4ac926cebf2d44fb20;hb=3eeba6fb8b434fcb27f601771baa0ea98f44d487;hp=f59818245f1d1b17e37c3d4f3c5a8b721c95e215;hpb=740ce14cd863bb8986a54f425a6f1ec20b26c6cc;p=p5sagit%2Fp5-mst-13.2.git diff --git a/vms/vms.c b/vms/vms.c index f598182..1212555 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -2,8 +2,8 @@ * * VMS-specific routines for perl5 * - * Last revised: 18-Jul-1996 by Charles Bailey bailey@genetics.upenn.edu - * Version: 5.3.1 + * Last revised: 24-Apr-1999 by Charles Bailey bailey@newman.upenn.edu + * Version: 5.5.58 */ #include @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,8 @@ #include #include #include +#include +#include #include #include #include @@ -28,7 +31,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -41,12 +45,16 @@ # 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" +/* Anticipating future expansion in lexical warnings . . . */ +#ifndef WARN_INTERNAL +# define WARN_INTERNAL WARN_MISC +#endif /* gcc's header files don't #define direct access macros * corresponding to VAXC's variant structs */ @@ -74,91 +82,217 @@ static char *__mystrtolower(char *str) return str; } +static struct dsc$descriptor_s fildevdsc = + { 12, DSC$K_DTYPE_T, DSC$K_CLASS_S, "LNM$FILE_DEV" }; +static struct dsc$descriptor_s crtlenvdsc = + { 8, DSC$K_DTYPE_T, DSC$K_CLASS_S, "CRTL_ENV" }; +static struct dsc$descriptor_s *fildev[] = { &fildevdsc, NULL }; +static struct dsc$descriptor_s *defenv[] = { &fildevdsc, &crtlenvdsc, NULL }; +static struct dsc$descriptor_s **env_tables = defenv; +static bool will_taint = FALSE; /* tainting active, but no PL_curinterp yet */ + +/*{{{int vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, struct dsc$descriptor_s **tabvec, unsigned long int flags) */ int -my_trnlnm(char *lnm, char *eqv, unsigned long int idx) +vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, + struct dsc$descriptor_s **tabvec, unsigned long int flags) { - static char __my_trnlnm_eqv[LNM$C_NAMLENGTH+1]; - unsigned short int eqvlen; + char uplnm[LNM$C_NAMLENGTH], *cp1, *cp2; + unsigned short int eqvlen, curtab, ivlnm = 0, ivsym = 0, ivenv = 0, secure; unsigned long int retsts, attr = LNM$M_CASE_BLIND; - $DESCRIPTOR(tabdsc,"LNM$FILE_DEV"); - struct dsc$descriptor_s lnmdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; - struct itmlst_3 lnmlst[3] = {{sizeof idx, LNM$_INDEX, &idx, 0}, - {LNM$C_NAMLENGTH, LNM$_STRING, 0, &eqvlen}, + unsigned char acmode; + struct dsc$descriptor_s lnmdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}, + tmpdsc = {6,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; + struct itmlst_3 lnmlst[3] = {{sizeof idx, LNM$_INDEX, &idx, 0}, + {LNM$C_NAMLENGTH, LNM$_STRING, eqv, &eqvlen}, {0, 0, 0, 0}}; + $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); - if (!lnm || idx > LNM$_MAX_INDEX) { + if (!lnm || !eqv || idx > LNM$_MAX_INDEX) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return 0; } - if (!eqv) eqv = __my_trnlnm_eqv; - lnmlst[1].bufadr = (void *)eqv; - lnmdsc.dsc$a_pointer = lnm; - lnmdsc.dsc$w_length = strlen(lnm); - retsts = sys$trnlnm(&attr,&tabdsc,&lnmdsc,0,lnmlst); - if (retsts == SS$_NOLOGNAM || retsts == SS$_IVLOGNAM) { - set_vaxc_errno(retsts); set_errno(EINVAL); return 0; + for (cp1 = (char *)lnm, cp2 = uplnm; *cp1; cp1++, cp2++) { + *cp2 = _toupper(*cp1); + if (cp1 - lnm > LNM$C_NAMLENGTH) { + set_errno(EINVAL); set_vaxc_errno(SS$_IVLOGNAM); + return 0; + } + } + lnmdsc.dsc$w_length = cp1 - lnm; + lnmdsc.dsc$a_pointer = uplnm; + secure = flags & PERL__TRNENV_SECURE; + acmode = secure ? PSL$C_EXEC : PSL$C_USER; + if (!tabvec || !*tabvec) tabvec = env_tables; + + for (curtab = 0; tabvec[curtab]; curtab++) { + if (!str$case_blind_compare(tabvec[curtab],&crtlenv)) { + if (!ivenv && !secure) { + char *eq, *end; + int i; + if (!environ) { + ivenv = 1; + warn("Can't read CRTL environ\n"); + continue; + } + retsts = SS$_NOLOGNAM; + for (i = 0; environ[i]; i++) { + if ((eq = strchr(environ[i],'=')) && + !strncmp(environ[i],uplnm,eq - environ[i])) { + eq++; + for (eqvlen = 0; eq[eqvlen]; eqvlen++) eqv[eqvlen] = eq[eqvlen]; + if (!eqvlen) continue; + retsts = SS$_NORMAL; + break; + } + } + if (retsts != SS$_NOLOGNAM) break; + } + } + else if ((tmpdsc.dsc$a_pointer = tabvec[curtab]->dsc$a_pointer) && + !str$case_blind_compare(&tmpdsc,&clisym)) { + if (!ivsym && !secure) { + unsigned short int deflen = LNM$C_NAMLENGTH; + struct dsc$descriptor_d eqvdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_D,0}; + /* dynamic dsc to accomodate possible long value */ + _ckvmssts(lib$sget1_dd(&deflen,&eqvdsc)); + retsts = lib$get_symbol(&lnmdsc,&eqvdsc,&eqvlen,0); + if (retsts & 1) { + if (eqvlen > 1024) { + set_errno(EVMSERR); set_vaxc_errno(LIB$_STRTRU); + eqvlen = 1024; + if (ckWARN(WARN_MISC)) + warner(WARN_MISC,"Value of CLI symbol \"%s\" too long",lnm); + } + strncpy(eqv,eqvdsc.dsc$a_pointer,eqvlen); + } + _ckvmssts(lib$sfree1_dd(&eqvdsc)); + if (retsts == LIB$_INVSYMNAM) { ivsym = 1; continue; } + if (retsts == LIB$_NOSUCHSYM) continue; + break; + } + } + else if (!ivlnm) { + retsts = sys$trnlnm(&attr,tabvec[curtab],&lnmdsc,&acmode,lnmlst); + if (retsts == SS$_IVLOGNAM) { ivlnm = 1; continue; } + if (retsts == SS$_NOLOGNAM) continue; + break; + } } - else if (retsts & 1) { - eqv[eqvlen] = '\0'; - return eqvlen; + if (retsts & 1) { eqv[eqvlen] = '\0'; return eqvlen; } + else if (retsts == LIB$_NOSUCHSYM || retsts == LIB$_INVSYMNAM || + retsts == SS$_IVLOGNAM || retsts == SS$_IVLOGTAB || + retsts == SS$_NOLOGNAM) { + set_errno(EINVAL); set_vaxc_errno(retsts); } - _ckvmssts(retsts); /* Must be an error */ - return 0; /* Not reached, assuming _ckvmssts() bails out */ + else _ckvmssts(retsts); + return 0; +} /* end of vmstrnenv */ +/*}}}*/ -} /* end of my_trnlnm */ + +/*{{{ int my_trnlnm(const char *lnm, char *eqv, unsigned long int idx)*/ +/* Define as a function so we can access statics. */ +int my_trnlnm(const char *lnm, char *eqv, unsigned long int idx) +{ + return vmstrnenv(lnm,eqv,idx,fildev, +#ifdef SECURE_INTERNAL_GETENV + (PL_curinterp ? PL_tainting : will_taint) ? PERL__TRNENV_SECURE : 0 +#else + 0 +#endif + ); +} +/*}}}*/ /* my_getenv - * Translate a logical name. Substitute for CRTL getenv() to avoid - * memory leak, and to keep my_getenv() and my_setenv() in the same - * domain (mostly - my_getenv() need not return a translation from - * the process logical name table) - * - * Note: Uses static buffer -- not thread-safe! + * Note: Uses Perl temp to store result so char * can be returned to + * caller; this pointer will be invalidated at next Perl statement + * transition. + * We define this as a function rather than a macro in terms of my_getenv_sv() + * so that it'll work when PL_curinterp is undefined (and we therefore can't + * allocate SVs). */ -/*{{{ char *my_getenv(char *lnm)*/ +/*{{{ char *my_getenv(const char *lnm, bool sys)*/ char * -my_getenv(char *lnm) +my_getenv(const char *lnm, bool sys) { static char __my_getenv_eqv[LNM$C_NAMLENGTH+1]; - char uplnm[LNM$C_NAMLENGTH], *cp1, *cp2; + char uplnm[LNM$C_NAMLENGTH+1], *cp1, *cp2, *eqv; unsigned long int idx = 0; - - for (cp1 = lnm, cp2= uplnm; *cp1; cp1++, cp2++) *cp2 = _toupper(*cp1); - *cp2 = '\0'; - if (cp1 - lnm == 7 && !strncmp(uplnm,"DEFAULT",7)) { - getcwd(__my_getenv_eqv,sizeof __my_getenv_eqv); - return __my_getenv_eqv; + int trnsuccess; + SV *tmpsv; + + if (PL_curinterp) { /* Perl interpreter running -- may be threaded */ + /* Set up a temporary buffer for the return value; Perl will + * clean it up at the next statement transition */ + tmpsv = sv_2mortal(newSVpv("",LNM$C_NAMLENGTH+1)); + if (!tmpsv) return NULL; + eqv = SvPVX(tmpsv); + } + else eqv = __my_getenv_eqv; /* Assume no interpreter ==> single thread */ + for (cp1 = (char *) lnm, cp2 = eqv; *cp1; cp1++,cp2++) *cp2 = _toupper(*cp1); + if (cp1 - lnm == 7 && !strncmp(eqv,"DEFAULT",7)) { + getcwd(eqv,LNM$C_NAMLENGTH); + return eqv; } else { - if ((cp2 = strchr(uplnm,';')) != NULL) { - *cp2 = '\0'; + if ((cp2 = strchr(lnm,';')) != NULL) { + strcpy(uplnm,lnm); + uplnm[cp2-lnm] = '\0'; idx = strtoul(cp2+1,NULL,0); + lnm = uplnm; } - if (my_trnlnm(uplnm,__my_getenv_eqv,idx)) { - return __my_getenv_eqv; - } - else { - unsigned long int retsts; - struct dsc$descriptor_s symdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}, - valdsc = {sizeof __my_getenv_eqv,DSC$K_DTYPE_T, - DSC$K_CLASS_S, __my_getenv_eqv}; - symdsc.dsc$w_length = cp1 - lnm; - symdsc.dsc$a_pointer = uplnm; - retsts = lib$get_symbol(&symdsc,&valdsc,&(valdsc.dsc$w_length),0); - if (retsts == LIB$_INVSYMNAM) return Nullch; - if (retsts != LIB$_NOSUCHSYM) { - /* We want to return only logical names or CRTL Unix emulations */ - if (retsts & 1) return Nullch; - _ckvmssts(retsts); - } - /* Try for CRTL emulation of a Unix/POSIX name */ - else return getenv(uplnm); - } + if (vmstrnenv(lnm,eqv,idx, + sys ? fildev : NULL, +#ifdef SECURE_INTERNAL_GETENV + sys ? PERL__TRNENV_SECURE : 0 +#else + 0 +#endif + )) return eqv; + else return Nullch; } - return Nullch; } /* end of my_getenv() */ /*}}}*/ + +/*{{{ SV *my_getenv_sv(const char *lnm, bool sys)*/ +SV * +my_getenv_sv(const char *lnm, bool sys) +{ + char buf[LNM$C_NAMLENGTH+1], *cp1, *cp2; + unsigned long int len, idx = 0; + + for (cp1 = (char *)lnm, cp2 = buf; *cp1; cp1++,cp2++) *cp2 = _toupper(*cp1); + if (cp1 - lnm == 7 && !strncmp(buf,"DEFAULT",7)) { + getcwd(buf,LNM$C_NAMLENGTH); + return newSVpv(buf,0); + } + else { + if ((cp2 = strchr(lnm,';')) != NULL) { + strcpy(buf,lnm); + buf[cp2-lnm] = '\0'; + idx = strtoul(cp2+1,NULL,0); + lnm = buf; + } + if ((len = vmstrnenv(lnm,buf,idx, + sys ? fildev : NULL, +#ifdef SECURE_INTERNAL_GETENV + sys ? PERL__TRNENV_SECURE : 0 +#else + 0 +#endif + ))) return newSVpv(buf,len); + else return &PL_sv_undef; + } + +} /* end of my_getenv_sv() */ +/*}}}*/ + +static void create_mbx(unsigned short int *, struct dsc$descriptor_s *); + +static void riseandshine(unsigned long int dummy) { sys$wake(0,0); } + /*{{{ void prime_env_iter() */ void prime_env_iter(void) @@ -166,91 +300,321 @@ prime_env_iter(void) * find, in preparation for iterating over it. */ { - static int primed = 0; /* XXX Not thread-safe!!! */ - HV *envhv = GvHVn(envgv); - FILE *sholog; - char eqv[LNM$C_NAMLENGTH+1],*start,*end; - STRLEN eqvlen; - SV *oldrs, *linesv, *eqvsv; + dTHR; + static int primed = 0; + HV *seenhv = NULL, *envhv; + char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = Nullch; + unsigned short int chan; +#ifndef CLI$M_TRUSTED +# define CLI$M_TRUSTED 0x40 /* Missing from VAXC headers */ +#endif + unsigned long int defflags = CLI$M_NOWAIT | CLI$M_NOKEYPAD | CLI$M_TRUSTED; + unsigned long int mbxbufsiz, flags, retsts, subpid = 0, substs = 0, wakect = 0; + long int i; + bool have_sym = FALSE, have_lnm = FALSE; + struct dsc$descriptor_s tmpdsc = {6,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; + $DESCRIPTOR(cmddsc,cmd); $DESCRIPTOR(nldsc,"_NLA0:"); + $DESCRIPTOR(clidsc,"DCL"); $DESCRIPTOR(clitabdsc,"DCLTABLES"); + $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); + $DESCRIPTOR(local,"_LOCAL"); $DESCRIPTOR(mbxdsc,mbxnam); +#ifdef USE_THREADS + static perl_mutex primenv_mutex; + MUTEX_INIT(&primenv_mutex); +#endif - if (primed) return; + if (primed || !PL_envgv) return; + MUTEX_LOCK(&primenv_mutex); + if (primed) { MUTEX_UNLOCK(&primenv_mutex); return; } + envhv = GvHVn(PL_envgv); /* Perform a dummy fetch as an lval to insure that the hash table is - * set up. Otherwise, the hv_store() will turn into a nullop */ + * set up. Otherwise, the hv_store() will turn into a nullop. */ (void) hv_fetch(envhv,"DEFAULT",7,TRUE); - /* Also, set up the four "special" keys that the CRTL defines, - * whether or not underlying logical names exist. */ - (void) hv_fetch(envhv,"HOME",4,TRUE); - (void) hv_fetch(envhv,"TERM",4,TRUE); - (void) hv_fetch(envhv,"PATH",4,TRUE); - (void) hv_fetch(envhv,"USER",4,TRUE); - - /* Now, go get the logical names */ - if ((sholog = my_popen("$ Show Logical *","r")) == Nullfp) - _ckvmssts(vaxc$errno); - /* We use Perl's sv_gets to read from the pipe, since my_popen is - * tied to Perl's I/O layer, so it may not return a simple FILE * */ - oldrs = rs; - rs = newSVpv("\n",1); - linesv = newSVpv("",0); - while (1) { - if ((start = sv_gets(linesv,sholog,0)) == Nullch) { - my_pclose(sholog); - SvREFCNT_dec(linesv); SvREFCNT_dec(rs); rs = oldrs; - primed = 1; - return; + + for (i = 0; env_tables[i]; i++) { + if (!have_sym && (tmpdsc.dsc$a_pointer = env_tables[i]->dsc$a_pointer) && + !str$case_blind_compare(&tmpdsc,&clisym)) have_sym = 1; + if (!have_lnm && !str$case_blind_compare(env_tables[i],&crtlenv)) have_lnm = 1; + } + if (have_sym || have_lnm) { + long int syiitm = SYI$_MAXBUF, dviitm = DVI$_DEVNAM; + _ckvmssts(lib$getsyi(&syiitm, &mbxbufsiz, 0, 0, 0, 0)); + _ckvmssts(sys$crembx(0,&chan,mbxbufsiz,mbxbufsiz,0xff0f,0,0)); + _ckvmssts(lib$getdvi(&dviitm, &chan, NULL, NULL, &mbxdsc, &mbxdsc.dsc$w_length)); + } + + for (i--; i >= 0; i--) { + if (!str$case_blind_compare(env_tables[i],&crtlenv)) { + char *start; + int j; + for (j = 0; environ[j]; j++) { + if (!(start = strchr(environ[j],'='))) { + if (ckWARN(WARN_INTERNAL)) + warner(WARN_INTERNAL,"Ill-formed CRTL environ value \"%s\"\n",environ[j]); + } + else { + start++; + (void) hv_store(envhv,environ[j],start - environ[j] - 1, + newSVpv(start,0),0); + } + } + continue; + } + else if ((tmpdsc.dsc$a_pointer = env_tables[i]->dsc$a_pointer) && + !str$case_blind_compare(&tmpdsc,&clisym)) { + strcpy(cmd,"Show Symbol/Global *"); + cmddsc.dsc$w_length = 20; + if (env_tables[i]->dsc$w_length == 12 && + (tmpdsc.dsc$a_pointer = env_tables[i]->dsc$a_pointer + 6) && + !str$case_blind_compare(&tmpdsc,&local)) strcpy(cmd+12,"Local *"); + flags = defflags | CLI$M_NOLOGNAM; } - while (*start != '"' && *start != '=' && *start) start++; - if (*start != '"') continue; - for (end = ++start; *end && *end != '"'; end++) ; - if (*end) *end = '\0'; - else end = Nullch; - if ((eqvlen = my_trnlnm(start,eqv,0)) == 0) _ckvmssts(vaxc$errno); else { - eqvsv = newSVpv(eqv,eqvlen); - hv_store(envhv,start,(end ? end - start : strlen(start)),eqvsv,0); + strcpy(cmd,"Show Logical *"); + if (str$case_blind_compare(env_tables[i],&fildevdsc)) { + strcat(cmd," /Table="); + strncat(cmd,env_tables[i]->dsc$a_pointer,env_tables[i]->dsc$w_length); + cmddsc.dsc$w_length = strlen(cmd); + } + else cmddsc.dsc$w_length = 14; /* N.B. We test this below */ + flags = defflags | CLI$M_NOCLISYM; + } + + /* Create a new subprocess to execute each command, to exclude the + * remote possibility that someone could subvert a mbx or file used + * to write multiple commands to a single subprocess. + */ + do { + retsts = lib$spawn(&cmddsc,&nldsc,&mbxdsc,&flags,0,&subpid,&substs, + 0,&riseandshine,0,0,&clidsc,&clitabdsc); + flags &= ~CLI$M_TRUSTED; /* Just in case we hit a really old version */ + defflags &= ~CLI$M_TRUSTED; + } while (retsts == LIB$_INVARG && (flags | CLI$M_TRUSTED)); + _ckvmssts(retsts); + if (!buf) New(1322,buf,mbxbufsiz + 1,char); + if (seenhv) SvREFCNT_dec(seenhv); + seenhv = newHV(); + while (1) { + char *cp1, *cp2, *key; + unsigned long int sts, iosb[2], retlen, keylen; + register U32 hash; + + sts = sys$qiow(0,chan,IO$_READVBLK,iosb,0,0,buf,mbxbufsiz,0,0,0,0); + if (sts & 1) sts = iosb[0] & 0xffff; + if (sts == SS$_ENDOFFILE) { + int wakect = 0; + while (substs == 0) { sys$hiber(); wakect++;} + if (wakect > 1) sys$wake(0,0); /* Stole someone else's wake */ + _ckvmssts(substs); + break; + } + _ckvmssts(sts); + retlen = iosb[0] >> 16; + if (!retlen) continue; /* blank line */ + buf[retlen] = '\0'; + if (iosb[1] != subpid) { + if (iosb[1]) { + croak("Unknown process %x sent message to prime_env_iter: %s",buf); + } + continue; + } + if (sts == SS$_BUFFEROVF && ckWARN(WARN_INTERNAL)) + warner(WARN_INTERNAL,"Buffer overflow in prime_env_iter: %s",buf); + + for (cp1 = buf; *cp1 && isspace(*cp1); cp1++) ; + if (*cp1 == '(' || /* Logical name table name */ + *cp1 == '=' /* Next eqv of searchlist */) continue; + if (*cp1 == '"') cp1++; + for (cp2 = cp1; *cp2 && *cp2 != '"' && *cp2 != ' '; cp2++) ; + key = cp1; keylen = cp2 - cp1; + if (keylen && hv_exists(seenhv,key,keylen)) continue; + while (*cp2 && *cp2 != '=') cp2++; + while (*cp2 && *cp2 != '"') cp2++; + for (cp1 = buf + retlen; *cp1 != '"'; cp1--) ; + if ((!keylen || (cp1 - cp2 <= 0)) && ckWARN(WARN_INTERNAL)) { + warner(WARN_INTERNAL,"Ill-formed message in prime_env_iter: |%s|",buf); + continue; + } + /* Skip "" surrounding translation */ + PERL_HASH(hash,key,keylen); + hv_store(envhv,key,keylen,newSVpv(cp2+1,cp1 - cp2 - 1),hash); + hv_store(seenhv,key,keylen,&PL_sv_yes,hash); + } + if (cmddsc.dsc$w_length == 14) { /* We just read LNM$FILE_DEV */ + /* get the PPFs for this process, not the subprocess */ + char *ppfs[] = {"SYS$COMMAND", "SYS$INPUT", "SYS$OUTPUT", "SYS$ERROR", NULL}; + char eqv[LNM$C_NAMLENGTH+1]; + int trnlen, i; + for (i = 0; ppfs[i]; i++) { + trnlen = vmstrnenv(ppfs[i],eqv,0,fildev,0); + hv_store(envhv,ppfs[i],strlen(ppfs[i]),newSVpv(eqv,trnlen),0); + } } } + primed = 1; + if (have_sym || have_lnm) _ckvmssts(sys$dassgn(chan)); + if (buf) Safefree(buf); + if (seenhv) SvREFCNT_dec(seenhv); + MUTEX_UNLOCK(&primenv_mutex); + return; + } /* end of prime_env_iter */ /*}}}*/ - -/*{{{ void my_setenv(char *lnm, char *eqv)*/ -void -my_setenv(char *lnm,char *eqv) -/* Define a supervisor-mode logical name in the process table. - * In the future we'll add tables, attribs, and acmodes, - * probably through a different call. + +/*{{{ int vmssetenv(char *lnm, char *eqv)*/ +/* Define or delete an element in the same "environment" as + * vmstrnenv(). If an element is to be deleted, it's removed from + * the first place it's found. If it's to be set, it's set in the + * place designated by the first element of the table vector. + * Like setenv() returns 0 for success, non-zero on error. */ +int +vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) { char uplnm[LNM$C_NAMLENGTH], *cp1, *cp2; + unsigned short int curtab, ivlnm = 0, ivsym = 0, ivenv = 0; unsigned long int retsts, usermode = PSL$C_USER; - $DESCRIPTOR(tabdsc,"LNM$PROCESS"); struct dsc$descriptor_s lnmdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,uplnm}, - eqvdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; - - for(cp1 = lnm, cp2 = uplnm; *cp1; cp1++, cp2++) *cp2 = _toupper(*cp1); + eqvdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}, + tmpdsc = {6,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; + $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); + $DESCRIPTOR(local,"_LOCAL"); + + for (cp1 = lnm, cp2 = uplnm; *cp1; cp1++, cp2++) { + *cp2 = _toupper(*cp1); + if (cp1 - lnm > LNM$C_NAMLENGTH) { + set_errno(EINVAL); set_vaxc_errno(SS$_IVLOGNAM); + return SS$_IVLOGNAM; + } + } lnmdsc.dsc$w_length = cp1 - lnm; - - if (!eqv || !*eqv) { /* we're deleting a logical name */ - retsts = sys$dellnm(&tabdsc,&lnmdsc,&usermode); /* try user mode first */ - if (retsts == SS$_IVLOGNAM) return; - if (retsts != SS$_NOLOGNAM) _ckvmssts(retsts); - if (!(retsts & 1)) { - retsts = lib$delete_logical(&lnmdsc,&tabdsc); /* then supervisor mode */ - if (retsts != SS$_NOLOGNAM) _ckvmssts(retsts); + if (!tabvec || !*tabvec) tabvec = env_tables; + + if (!eqv) { /* we're deleting n element */ + for (curtab = 0; tabvec[curtab]; curtab++) { + if (!ivenv && !str$case_blind_compare(tabvec[curtab],&crtlenv)) { + int i; + for (i = 0; environ[i]; i++) { /* Iff it's an environ elt, reset */ + if ((cp1 = strchr(environ[i],'=')) && + !strncmp(environ[i],lnm,cp1 - environ[i])) { +#ifdef HAS_SETENV + return setenv(lnm,eqv,1) ? vaxc$errno : 0; + } + } + ivenv = 1; retsts = SS$_NOLOGNAM; +#else + if (ckWARN(WARN_INTERNAL)) + warner(WARN_INTERNAL,"This Perl can't reset CRTL environ elements (%s)",lnm); + ivenv = 1; retsts = SS$_NOSUCHPGM; + break; + } + } +#endif + } + else if ((tmpdsc.dsc$a_pointer = tabvec[curtab]->dsc$a_pointer) && + !str$case_blind_compare(&tmpdsc,&clisym)) { + unsigned int symtype; + if (tabvec[curtab]->dsc$w_length == 12 && + (tmpdsc.dsc$a_pointer = tabvec[curtab]->dsc$a_pointer + 6) && + !str$case_blind_compare(&tmpdsc,&local)) + symtype = LIB$K_CLI_LOCAL_SYM; + else symtype = LIB$K_CLI_GLOBAL_SYM; + retsts = lib$delete_symbol(&lnmdsc,&symtype); + if (retsts == LIB$_INVSYMNAM) { ivsym = 1; continue; } + if (retsts == LIB$_NOSUCHSYM) continue; + break; + } + else if (!ivlnm) { + retsts = sys$dellnm(tabvec[curtab],&lnmdsc,&usermode); /* try user mode first */ + if (retsts == SS$_IVLOGNAM) { ivlnm = 1; continue; } + if (retsts != SS$_NOLOGNAM && retsts != SS$_NOLOGTAB) break; + retsts = lib$delete_logical(&lnmdsc,tabvec[curtab]); /* then supervisor mode */ + if (retsts != SS$_NOLOGNAM && retsts != SS$_NOLOGTAB) break; + } + } + } + else { /* we're defining a value */ + if (!ivenv && !str$case_blind_compare(tabvec[0],&crtlenv)) { +#ifdef HAS_SETENV + return setenv(lnm,eqv,1) ? vaxc$errno : 0; +#else + if (ckWARN(WARN_INTERNAL)) + warner(WARN_INTERNAL,"This Perl can't set CRTL environ elements (%s=%s)",lnm,eqv); + retsts = SS$_NOSUCHPGM; +#endif + } + else { + eqvdsc.dsc$a_pointer = eqv; + eqvdsc.dsc$w_length = strlen(eqv); + if ((tmpdsc.dsc$a_pointer = tabvec[0]->dsc$a_pointer) && + !str$case_blind_compare(&tmpdsc,&clisym)) { + unsigned int symtype; + if (tabvec[0]->dsc$w_length == 12 && + (tmpdsc.dsc$a_pointer = tabvec[0]->dsc$a_pointer + 6) && + !str$case_blind_compare(&tmpdsc,&local)) + symtype = LIB$K_CLI_LOCAL_SYM; + else symtype = LIB$K_CLI_GLOBAL_SYM; + retsts = lib$set_symbol(&lnmdsc,&eqvdsc,&symtype); + } + else { + if (!*eqv) eqvdsc.dsc$w_length = 1; + retsts = lib$set_logical(&lnmdsc,&eqvdsc,tabvec[0],0,0); + } } } + if (!(retsts & 1)) { + switch (retsts) { + case LIB$_AMBSYMDEF: case LIB$_INSCLIMEM: + case SS$_NOLOGTAB: case SS$_TOOMANYLNAM: case SS$_IVLOGTAB: + set_errno(EVMSERR); break; + case LIB$_INVARG: case LIB$_INVSYMNAM: case SS$_IVLOGNAM: + case LIB$_NOSUCHSYM: case SS$_NOLOGNAM: + set_errno(EINVAL); break; + case SS$_NOPRIV: + set_errno(EACCES); + default: + _ckvmssts(retsts); + set_errno(EVMSERR); + } + set_vaxc_errno(retsts); + return (int) retsts || 44; /* retsts should never be 0, but just in case */ + } else { - eqvdsc.dsc$w_length = strlen(eqv); - eqvdsc.dsc$a_pointer = eqv; - - _ckvmssts(lib$set_logical(&lnmdsc,&eqvdsc,&tabdsc,0,0)); + /* We reset error values on success because Perl does an hv_fetch() + * before each hv_store(), and if the thing we're setting didn't + * previously exist, we've got a leftover error message. (Of course, + * this fails in the face of + * $foo = $ENV{nonexistent}; $ENV{existent} = 'foo'; + * in that the error reported in $! isn't spurious, + * but it's right more often than not.) + */ + set_errno(0); set_vaxc_errno(retsts); + return 0; } -} /* end of my_setenv() */ +} /* end of vmssetenv() */ +/*}}}*/ + +/*{{{ void my_setenv(char *lnm, char *eqv)*/ +/* This has to be a function since there's a prototype for it in proto.h */ +void +my_setenv(char *lnm,char *eqv) +{ + if (lnm && *lnm && strlen(lnm) == 7) { + char uplnm[8]; + int i; + for (i = 0; lnm[i]; i++) uplnm[i] = _toupper(lnm[i]); + if (!strcmp(uplnm,"DEFAULT")) { + if (eqv && *eqv) chdir(eqv); + return; + } + } + (void) vmssetenv(lnm,eqv,NULL); +} /*}}}*/ + /*{{{ char *my_crypt(const char *textpasswd, const char *usrname)*/ /* my_crypt - VMS password hashing * my_crypt() provides an interface compatible with the Unix crypt() @@ -313,6 +677,7 @@ my_crypt(const char *textpasswd, const char *usrname) /*}}}*/ +static char *do_rmsexpand(char *, char *, int, char *, unsigned); static char *do_fileify_dirspec(char *, char *, int); static char *do_tovmsspec(char *, char *, int); @@ -322,7 +687,7 @@ do_rmdir(char *name) { char dirfile[NAM$C_MAXRSS+1]; int retval; - struct stat st; + Stat_t st; if (do_fileify_dirspec(name,dirfile,0) == NULL) return -1; if (flex_stat(dirfile,&st) || !S_ISDIR(st.st_mode)) retval = -1; @@ -344,7 +709,7 @@ do_rmdir(char *name) int kill_file(char *name) { - char vmsname[NAM$C_MAXRSS+1]; + char vmsname[NAM$C_MAXRSS+1], rspec[NAM$C_MAXRSS+1]; unsigned long int jpicode = JPI$_UIC, type = ACL$C_FILE; unsigned long int cxt = 0, aclsts, fndsts, rmsts = -1; struct dsc$descriptor_s fildsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; @@ -365,7 +730,12 @@ kill_file(char *name) lcklst[2] = {{sizeof newace, ACL$C_WLOCK_ACL, &newace, 0},{0,0,0,0}}, ulklst[2] = {{sizeof newace, ACL$C_UNLOCK_ACL, &newace, 0},{0,0,0,0}}; - if (!remove(name)) return 0; /* Can we just get rid of it? */ + /* Expand the input spec using RMS, since the CRTL remove() and + * system services won't do this by themselves, so we may miss + * a file "hiding" behind a logical name or search list. */ + if (do_tovmsspec(name,vmsname,0) == NULL) return -1; + if (do_rmsexpand(vmsname,rspec,1,NULL,0) == NULL) return -1; + if (!remove(rspec)) return 0; /* Can we just get rid of it? */ /* If not, can changing protections help? */ if (vaxc$errno != RMS$_PRV) return -1; @@ -374,9 +744,8 @@ kill_file(char *name) * to delete the file. */ _ckvmssts(lib$getjpi(&jpicode,0,0,&(oldace.myace$l_ident),0,0)); - if (do_tovmsspec(name,vmsname,0) == NULL) return -1; - fildsc.dsc$w_length = strlen(vmsname); - fildsc.dsc$a_pointer = vmsname; + fildsc.dsc$w_length = strlen(rspec); + fildsc.dsc$a_pointer = rspec; cxt = 0; newace.myace$l_ident = oldace.myace$l_ident; if (!((aclsts = sys$change_acl(0,&type,&fildsc,lcklst,0,0,0)) & 1)) { @@ -438,163 +807,28 @@ kill_file(char *name) } /* end of kill_file() */ /*}}}*/ -/* my_utime - update modification time of a file - * calling sequence is identical to POSIX utime(), but under - * VMS only the modification time is changed; ODS-2 does not - * maintain access times. Restrictions differ from the POSIX - * definition in that the time can be changed as long as the - * caller has permission to execute the necessary IO$_MODIFY $QIO; - * no separate checks are made to insure that the caller is the - * owner of the file or has special privs enabled. - * Code here is based on Joe Meadows' FILE utility. - */ - -/* Adjustment from Unix epoch (01-JAN-1970 00:00:00.00) - * to VMS epoch (01-JAN-1858 00:00:00.00) - * in 100 ns intervals. - */ -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) +/*{{{int my_mkdir(char *,Mode_t)*/ +int +my_mkdir(char *dir, Mode_t mode) { - register int i; - long int bintime[2], len = 2, lowbit, unixtime, - secscale = 10000000; /* seconds --> 100 ns intervals */ - unsigned long int chan, iosb[2], retsts; - char vmsspec[NAM$C_MAXRSS+1], rsa[NAM$C_MAXRSS], esa[NAM$C_MAXRSS]; - struct FAB myfab = cc$rms_fab; - struct NAM mynam = cc$rms_nam; -#if defined (__DECC) && defined (__VAX) - /* VAX DEC C atrdef.h has unsigned type for pointer member atr$l_addr, - * at least through VMS V6.1, which causes a type-conversion warning. - */ -# pragma message save -# pragma message disable cvtdiftypes -#endif - struct atrdef myatr[2] = {{sizeof bintime, ATR$C_REVDATE, bintime}, {0,0,0}}; - struct fibdef myfib; -#if defined (__DECC) && defined (__VAX) - /* This should be right after the declaration of myatr, but due - * to a bug in VAX DEC C, this takes effect a statement early. - */ -# pragma message restore -#endif - struct dsc$descriptor fibdsc = {sizeof(myfib), DSC$K_DTYPE_Z, DSC$K_CLASS_S,(char *) &myfib}, - devdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}, - fnmdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}; - - if (file == NULL || *file == '\0') { - set_errno(ENOENT); - set_vaxc_errno(LIB$_INVARG); - return -1; - } - if (do_tovmsspec(file,vmsspec,0) == NULL) return -1; - - if (utimes != NULL) { - /* Convert Unix time (seconds since 01-JAN-1970 00:00:00.00) - * to VMS quadword time (100 nsec intervals since 01-JAN-1858 00:00:00.00). - * Since time_t is unsigned long int, and lib$emul takes a signed long int - * as input, we force the sign bit to be clear by shifting unixtime right - * one bit, then multiplying by an extra factor of 2 in lib$emul(). - */ - lowbit = (utimes->modtime & 1) ? secscale : 0; - unixtime = (long int) utimes->modtime; - unixtime >> 1; secscale << 1; - retsts = lib$emul(&secscale, &unixtime, &lowbit, bintime); - if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); - return -1; - } - retsts = lib$addx(bintime,utime_baseadjust,bintime,&len); - if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); - return -1; - } - } - else { - /* Just get the current time in VMS format directly */ - retsts = sys$gettim(bintime); - if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); - return -1; - } - } + STRLEN dirlen = strlen(dir); - myfab.fab$l_fna = vmsspec; - myfab.fab$b_fns = (unsigned char) strlen(vmsspec); - myfab.fab$l_nam = &mynam; - mynam.nam$l_esa = esa; - mynam.nam$b_ess = (unsigned char) sizeof esa; - mynam.nam$l_rsa = rsa; - mynam.nam$b_rss = (unsigned char) sizeof rsa; - - /* Look for the file to be affected, letting RMS parse the file - * specification for us as well. I have set errno using only - * values documented in the utime() man page for VMS POSIX. + /* 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. */ - retsts = sys$parse(&myfab,0,0); - if (!(retsts & 1)) { - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else if (retsts == RMS$_DIR) set_errno(ENOTDIR); - else set_errno(EVMSERR); - return -1; - } - retsts = sys$search(&myfab,0,0); - if (!(retsts & 1)) { - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else if (retsts == RMS$_FNF) set_errno(ENOENT); - else set_errno(EVMSERR); - return -1; - } - - devdsc.dsc$w_length = mynam.nam$b_dev; - devdsc.dsc$a_pointer = (char *) mynam.nam$l_dev; - - retsts = sys$assign(&devdsc,&chan,0,0); - if (!(retsts & 1)) { - set_vaxc_errno(retsts); - if (retsts == SS$_IVDEVNAM) set_errno(ENOTDIR); - else if (retsts == SS$_NOPRIV) set_errno(EACCES); - else if (retsts == SS$_NOSUCHDEV) set_errno(ENOTDIR); - else set_errno(EVMSERR); - return -1; - } - - fnmdsc.dsc$a_pointer = mynam.nam$l_name; - fnmdsc.dsc$w_length = mynam.nam$b_name + mynam.nam$b_type + mynam.nam$b_ver; - - memset((void *) &myfib, 0, sizeof myfib); -#ifdef __DECC - for (i=0;i<3;i++) myfib.fib$w_fid[i] = mynam.nam$w_fid[i]; - for (i=0;i<3;i++) myfib.fib$w_did[i] = mynam.nam$w_did[i]; - /* This prevents the revision time of the file being reset to the current - * time as a result of our IO$_MODIFY $QIO. */ - myfib.fib$l_acctl = FIB$M_NORECORD; -#else - for (i=0;i<3;i++) myfib.fib$r_fid_overlay.fib$w_fid[i] = mynam.nam$w_fid[i]; - for (i=0;i<3;i++) myfib.fib$r_did_overlay.fib$w_did[i] = mynam.nam$w_did[i]; - myfib.fib$r_acctl_overlay.fib$l_acctl = FIB$M_NORECORD; -#endif - retsts = sys$qiow(0,chan,IO$_MODIFY,iosb,0,0,&fibdsc,&fnmdsc,0,0,myatr,0); - _ckvmssts(sys$dassgn(chan)); - if (retsts & 1) retsts = iosb[0]; - if (!(retsts & 1)) { - set_vaxc_errno(retsts); - if (retsts == SS$_NOPRIV) set_errno(EACCES); - else set_errno(EVMSERR); - return -1; + if (dir[dirlen-1] == '/') { + char *newdir = savepvn(dir,dirlen-1); + int ret = mkdir(newdir,mode); + Safefree(newdir); + return ret; } - - return 0; -} /* end of my_utime() */ + else return mkdir(dir,mode); +} /* end of my_mkdir */ /*}}}*/ + static void create_mbx(unsigned short int *chan, struct dsc$descriptor_s *namdsc) { @@ -641,19 +875,80 @@ static struct pipe_details *open_pipes = NULL; static $DESCRIPTOR(nl_desc, "NL:"); static int waitpid_asleep = 0; +/* Send an EOF to a mbx. N.B. We don't check that fp actually points + * to a mbx; that's the caller's responsibility. + */ +static unsigned long int +pipe_eof(FILE *fp) +{ + char devnam[NAM$C_MAXRSS+1], *cp; + unsigned long int chan, iosb[2], retsts, retsts2; + struct dsc$descriptor devdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, devnam}; + + if (fgetname(fp,devnam,1)) { + /* It oughta be a mailbox, so fgetname should give just the device + * name, but just in case . . . */ + if ((cp = strrchr(devnam,':')) != NULL) *(cp+1) = '\0'; + devdsc.dsc$w_length = strlen(devnam); + _ckvmssts(sys$assign(&devdsc,&chan,0,0)); + retsts = sys$qiow(0,chan,IO$_WRITEOF,iosb,0,0,0,0,0,0,0,0); + if (retsts & 1) retsts = iosb[0]; + retsts2 = sys$dassgn(chan); /* Be sure to deassign the channel */ + if (retsts & 1) retsts = retsts2; + _ckvmssts(retsts); + return retsts; + } + else _ckvmssts(vaxc$errno); /* Should never happen */ + return (unsigned long int) vaxc$errno; +} + static unsigned long int pipe_exit_routine() { - unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT, sts; - - while (open_pipes != NULL) { - if (!open_pipes->done) { /* Tap them gently on the shoulder . . .*/ - _ckvmssts(sys$forcex(&open_pipes->pid,0,&abort)); - sleep(1); + struct pipe_details *info; + unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT; + int sts, did_stuff; + + /* + first we try sending an EOF...ignore if doesn't work, make sure we + don't hang + */ + did_stuff = 0; + info = open_pipes; + + while (info) { + if (info->mode != 'r' && !info->done) { + if (pipe_eof(info->fp) & 1) did_stuff = 1; + } + info = info->next; + } + if (did_stuff) sleep(1); /* wait for EOF to have an effect */ + + did_stuff = 0; + info = open_pipes; + while (info) { + if (!info->done) { /* Tap them gently on the shoulder . . .*/ + sts = sys$forcex(&info->pid,0,&abort); + if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts(sts); + did_stuff = 1; } - 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; + info = info->next; + } + if (did_stuff) sleep(1); /* wait for them to respond */ + + info = open_pipes; + while (info) { + if (!info->done) { /* We tried to be nice . . . */ + sts = sys$delprc(&info->pid,0); + if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts(sts); + info->done = 1; /* so my_pclose doesn't try to write EOF */ + } + info = info->next; + } + + while(open_pipes) { + if ((sts = my_pclose(open_pipes->fp)) == -1) retsts = vaxc$errno; + else if (!(sts & 1)) retsts = sts; } return retsts; } @@ -673,9 +968,8 @@ popen_completion_ast(struct pipe_details *thispipe) } } -/*{{{ FILE *my_popen(char *cmd, char *mode)*/ -FILE * -my_popen(char *cmd, char *mode) +static PerlIO * +safe_popen(char *cmd, char *mode) { static int handler_set_up = FALSE; char mbxname[64]; @@ -695,7 +989,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); @@ -731,9 +1025,21 @@ my_popen(char *cmd, char *mode) info->next=open_pipes; /* prepend to list */ open_pipes=info; - forkprocess = info->pid; + PL_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"); + PERL_FLUSHALL_FOR_CHILD; + return safe_popen(cmd,mode); } + /*}}}*/ /*{{{ I32 my_pclose(FILE *fp)*/ @@ -745,10 +1051,16 @@ 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 + * produce an EOF record in the mailbox. */ + if (info->mode != 'r' && !info->done) pipe_eof(info->fp); PerlIO_close(info->fp); if (info->done) retsts = info->completion; @@ -764,9 +1076,9 @@ I32 my_pclose(FILE *fp) } /* end of my_pclose() */ /* sort-of waitpid; use only with popen() */ -/*{{{unsigned long int waitpid(unsigned long int pid, int *statusp, int flags)*/ -unsigned long int -waitpid(unsigned long int pid, int *statusp, int flags) +/*{{{Pid_t my_waitpid(Pid_t pid, int *statusp, int flags)*/ +Pid_t +my_waitpid(Pid_t pid, int *statusp, int flags) { struct pipe_details *info; @@ -787,11 +1099,11 @@ waitpid(unsigned long int pid, int *statusp, int flags) unsigned long int ownercode = JPI$_OWNER, ownerpid, mypid; unsigned long int interval[2],sts; - if (dowarn) { + if (ckWARN(WARN_EXEC)) { _ckvmssts(lib$getjpi(&ownercode,&pid,0,&ownerpid,0,0)); _ckvmssts(lib$getjpi(&ownercode,0,0,&mypid,0,0)); if (ownerpid != mypid) - warn("pid %d not a child",pid); + warner(WARN_EXEC,"pid %x not a child",pid); } _ckvmssts(sys$bintim(&intdsc,interval)); @@ -823,6 +1135,14 @@ my_gconvert(double val, int ndig, int trail, char *buf) char *loc; loc = buf ? buf : __gcvtbuf; + +#ifndef __DECC /* VAXCRTL gcvt uses E format for numbers < 1 */ + if (val < 1) { + sprintf(loc,"%.*g",ndig,val); + return loc; + } +#endif + if (val) { if (!buf && ndig > DBL_DIG) ndig = DBL_DIG; return gcvt(val,ndig,loc); @@ -835,6 +1155,164 @@ my_gconvert(double val, int ndig, int trail, char *buf) } /*}}}*/ + +/*{{{char *do_rmsexpand(char *fspec, char *out, int ts, char *def, unsigned opts)*/ +/* Shortcut for common case of simple calls to $PARSE and $SEARCH + * to expand file specification. Allows for a single default file + * specification and a simple mask of options. If outbuf is non-NULL, + * it must point to a buffer at least NAM$C_MAXRSS bytes long, into which + * the resultant file specification is placed. If outbuf is NULL, the + * resultant file specification is placed into a static buffer. + * The third argument, if non-NULL, is taken to be a default file + * specification string. The fourth argument is unused at present. + * 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, trimver, trimtype, haslower = 0, isunix = 0; + + if (!filespec || !*filespec) { + set_vaxc_errno(LIB$_INVARG); set_errno(EINVAL); + return NULL; + } + if (!outbuf) { + 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); + } + + mynam.nam$l_esa = esa; + mynam.nam$b_ess = sizeof esa; + mynam.nam$l_rsa = outbuf; + mynam.nam$b_rss = NAM$C_MAXRSS; + + retsts = sys$parse(&myfab,0,0); + if (!(retsts & 1)) { + mynam.nam$b_nop |= NAM$M_SYNCHK; + if (retsts == RMS$_DNF || retsts == RMS$_DIR || + retsts == RMS$_DEV || retsts == RMS$_DEV) { + retsts = sys$parse(&myfab,0,0); + if (retsts & 1) goto expanded; + } + mynam.nam$l_rlf = NULL; myfab.fab$b_dns = 0; + (void) sys$parse(&myfab,0,0); /* Free search context */ + if (out) Safefree(out); + set_vaxc_errno(retsts); + if (retsts == RMS$_PRV) set_errno(EACCES); + else if (retsts == RMS$_DEV) set_errno(ENODEV); + else if (retsts == RMS$_DIR) set_errno(ENOTDIR); + else set_errno(EVMSERR); + return NULL; + } + retsts = sys$search(&myfab,0,0); + if (!(retsts & 1) && retsts != RMS$_FNF) { + mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; + myfab.fab$b_dns = 0; (void) sys$parse(&myfab,0,0); /* Free search context */ + if (out) Safefree(out); + set_vaxc_errno(retsts); + if (retsts == RMS$_PRV) set_errno(EACCES); + else set_errno(EVMSERR); + return NULL; + } + + /* If the input filespec contained any lowercase characters, + * downcase the result for compatibility with Unix-minded code. */ + expanded: + for (out = myfab.fab$l_fna; *out; out++) + if (islower(*out)) { haslower = 1; break; } + if (mynam.nam$b_rsl) { out = outbuf; speclen = mynam.nam$b_rsl; } + else { out = esa; speclen = mynam.nam$b_esl; } + /* Trim off null fields added by $PARSE + * If type > 1 char, must have been specified in original or default spec + * (not true for version; $SEARCH may have added version of existing file). + */ + trimver = !(mynam.nam$l_fnb & NAM$M_EXP_VER); + trimtype = !(mynam.nam$l_fnb & NAM$M_EXP_TYPE) && + (mynam.nam$l_ver - mynam.nam$l_type == 1); + if (trimver || trimtype) { + if (defspec && *defspec) { + char defesa[NAM$C_MAXRSS]; + struct FAB deffab = cc$rms_fab; + struct NAM defnam = cc$rms_nam; + + deffab.fab$l_nam = &defnam; + deffab.fab$l_fna = defspec; deffab.fab$b_fns = myfab.fab$b_dns; + defnam.nam$l_esa = defesa; defnam.nam$b_ess = sizeof defesa; + defnam.nam$b_nop = NAM$M_SYNCHK; + if (sys$parse(&deffab,0,0) & 1) { + if (trimver) trimver = !(defnam.nam$l_fnb & NAM$M_EXP_VER); + if (trimtype) trimtype = !(defnam.nam$l_fnb & NAM$M_EXP_TYPE); + } + } + if (trimver) speclen = mynam.nam$l_ver - out; + if (trimtype) { + /* If we didn't already trim version, copy down */ + if (speclen > mynam.nam$l_ver - out) + memcpy(mynam.nam$l_type, mynam.nam$l_ver, + speclen - (mynam.nam$l_ver - out)); + speclen -= mynam.nam$l_ver - mynam.nam$l_type; + } + } + /* If we just had a directory spec on input, $PARSE "helpfully" + * adds an empty name and type for us */ + if (mynam.nam$l_name == mynam.nam$l_type && + mynam.nam$l_ver == mynam.nam$l_type + 1 && + !(mynam.nam$l_fnb & NAM$M_EXP_NAME)) + speclen = mynam.nam$l_name - out; + out[speclen] = '\0'; + if (haslower) __mystrtolower(out); + + /* Have we been working with an expanded, but not resultant, spec? */ + /* 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); + } + mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; + mynam.nam$l_rsa = NULL; mynam.nam$b_rss = 0; + myfab.fab$b_dns = 0; (void) sys$parse(&myfab,0,0); /* Free search context */ + return outbuf; +} +/*}}}*/ +/* External entry points */ +char *rmsexpand(char *spec, char *buf, char *def, unsigned opt) +{ return do_rmsexpand(spec,buf,0,def,opt); } +char *rmsexpand_ts(char *spec, char *buf, char *def, unsigned opt) +{ return do_rmsexpand(spec,buf,1,def,opt); } + + /* ** The following routines are provided to make life easier when ** converting among VMS-style and Unix-style directory specifications. @@ -862,32 +1340,33 @@ my_gconvert(double val, int ndig, int trail, char *buf) ** tounixspec() - convert any file spec into a Unix-style file spec. ** tovmsspec() - convert any file spec into a VMS-style spec. ** -** Copyright 1996 by Charles Bailey +** Copyright 1996 by Charles Bailey ** Permission is given to distribute this code as part of the Perl ** standard distribution under the terms of the GNU General Public ** License or the Perl Artistic License. Copies of each may be ** 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) { static char __fileify_retbuf[NAM$C_MAXRSS+1]; unsigned long int dirlen, retlen, addmfd = 0, hasfilename = 0; char *retspec, *cp1, *cp2, *lastdir; - char trndir[NAM$C_MAXRSS+1], vmsdir[NAM$C_MAXRSS+1]; + char trndir[NAM$C_MAXRSS+2], vmsdir[NAM$C_MAXRSS+1]; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; } dirlen = strlen(dir); - if (dir[dirlen-1] == '/') --dirlen; - if (!dirlen) { - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; + while (dir[dirlen-1] == '/') --dirlen; + if (!dirlen) { /* We had Unixish '/' -- substitute top of current tree */ + strcpy(trndir,"/sys$disk/000000"); + dir = trndir; + dirlen = 16; + } + if (dirlen > NAM$C_MAXRSS) { + set_errno(ENAMETOOLONG); set_vaxc_errno(RMS$_SYN); return NULL; } if (!strpbrk(dir+1,"/]>:")) { strcpy(trndir,*dir == '/' ? dir + 1: dir); @@ -948,11 +1427,28 @@ static char *do_fileify_dirspec(char *dir,char *buf,int ts) if (*(cp1+2) == '.') cp1++; if (*(cp1+2) == '/' || *(cp1+2) == '\0') { if (do_tovmsspec(dir,vmsdir,0) == NULL) return NULL; + if (strchr(vmsdir,'/') != NULL) { + /* If do_tovmsspec() returned it, it must have VMS syntax + * delimiters in it, so it's a mixed VMS/Unix spec. We take + * the time to check this here only so we avoid a recursion + * loop; otherwise, gigo. + */ + set_errno(EINVAL); set_vaxc_errno(RMS$_SYN); return NULL; + } if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) return NULL; return do_tounixspec(trndir,buf,ts); } cp1++; } while ((cp1 = strstr(cp1,"/.")) != NULL); + lastdir = strrchr(dir,'/'); + } + else if (!strcmp(&dir[dirlen-7],"/000000")) { + /* Ditto for specs that end in an MFD -- let the VMS code + * figure out whether it's a real device or a rooted logical. */ + dir[dirlen] = '/'; dir[dirlen+1] = '\0'; + if (do_tovmsspec(dir,vmsdir,0) == NULL) return NULL; + if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) return NULL; + return do_tounixspec(trndir,buf,ts); } else { if ( !(lastdir = cp1 = strrchr(dir,'/')) && @@ -986,7 +1482,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; @@ -1067,7 +1563,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; @@ -1086,7 +1582,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); } @@ -1101,7 +1597,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; @@ -1129,7 +1625,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; @@ -1176,7 +1672,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]"); @@ -1193,7 +1689,11 @@ static char *do_pathify_dirspec(char *dir,char *buf, int ts) if ( !(cp1 = strrchr(dir,'/')) && !(cp1 = strrchr(dir,']')) && !(cp1 = strrchr(dir,'>')) ) cp1 = dir; - if ((cp2 = strchr(cp1,'.')) != NULL) { + if ((cp2 = strchr(cp1,'.')) != NULL && + (*(cp2-1) != '/' || /* Trailing '.', '..', */ + !(*(cp2+1) == '\0' || /* or '...' are dirs. */ + (*(cp2+1) == '.' && *(cp2+2) == '\0') || + (*(cp2+1) == '.' && *(cp2+2) == '.' && *(cp2+3) == '\0')))) { int ver; char *cp3; if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ @@ -1212,7 +1712,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 */ @@ -1257,7 +1757,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; @@ -1314,7 +1814,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 @@ -1336,7 +1836,7 @@ static char *do_tounixspec(char *spec, char *buf, int ts) { static char __tounixspec_retbuf[NAM$C_MAXRSS+1]; char *dirend, *rslt, *cp1, *cp2, *cp3, tmp[NAM$C_MAXRSS+1]; - int devlen, dirlen, retlen = NAM$C_MAXRSS+1, dashes = 0; + int devlen, dirlen, retlen = NAM$C_MAXRSS+1, expand = 0; if (spec == NULL) return NULL; if (strlen(spec) > NAM$C_MAXRSS) return NULL; @@ -1346,9 +1846,13 @@ static char *do_tounixspec(char *spec, char *buf, int ts) cp1 = strchr(spec,'['); if (!cp1) cp1 = strchr(spec,'<'); if (cp1) { - for (cp1++; *cp1 == '-'; cp1++) dashes++; /* VMS '-' ==> Unix '../' */ + for (cp1++; *cp1; cp1++) { + if (*cp1 == '-') expand++; /* VMS '-' ==> Unix '../' */ + if (*cp1 == '.' && *(cp1+1) == '.' && *(cp1+2) == '.') + { expand++; cp1 +=2; } /* VMS '...' ==> Unix '/.../' */ + } } - New(7015,rslt,retlen+2+2*dashes,char); + New(1315,rslt,retlen+2+2*expand,char); } else rslt = __tounixspec_retbuf; if (strchr(spec,'/') != NULL) { @@ -1371,11 +1875,10 @@ static char *do_tounixspec(char *spec, char *buf, int ts) else { /* the VMS spec begins with directories */ cp2++; if (*cp2 == ']' || *cp2 == '>') { - strcpy(rslt,"./"); + *(cp1++) = '.'; *(cp1++) = '/'; *(cp1++) = '\0'; return rslt; } - else if ( *cp2 != '.' && *cp2 != '-') { - *(cp1++) = '/'; /* add the implied device into the Unix spec */ + else if ( *cp2 != '.' && *cp2 != '-') { /* add the implied device */ if (getcwd(tmp,sizeof tmp,1) == NULL) { if (ts) Safefree(rslt); return NULL; @@ -1385,27 +1888,37 @@ static char *do_tounixspec(char *spec, char *buf, int ts) while (*cp3 != ':' && *cp3) cp3++; *(cp3++) = '\0'; if (strchr(cp3,']') != NULL) break; - } while (((cp3 = my_getenv(tmp)) != NULL) && strcpy(tmp,cp3)); - cp3 = tmp; - while (*cp3) *(cp1++) = *(cp3++); - *(cp1++) = '/'; - if (ts && + } while (vmstrnenv(tmp,tmp,0,fildev,0)); + if (ts && !buf && ((devlen = strlen(tmp)) + (dirlen = strlen(cp2)) + 1 > retlen)) { - int offset = cp1 - rslt; - retlen = devlen + dirlen; - Renew(rslt,retlen+1+2*dashes,char); - cp1 = rslt + offset; + Renew(rslt,retlen+1+2*expand,char); + cp1 = rslt; } + cp3 = tmp; + *(cp1++) = '/'; + while (*cp3) { + *(cp1++) = *(cp3++); + if (cp1 - rslt > NAM$C_MAXRSS && !ts && !buf) return NULL; /* No room */ + } + *(cp1++) = '/'; + } + else if ( *cp2 == '.') { + if (*(cp2+1) == '.' && *(cp2+2) == '.') { + *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '/'; + cp2 += 3; + } + else cp2++; } - else if (*cp2 == '.') cp2++; } for (; cp2 <= dirend; cp2++) { if (*cp2 == ':') { *(cp1++) = '/'; if (*(cp2+1) == '[') cp2++; } - else if (*cp2 == ']' || *cp2 == '>') *(cp1++) = '/'; + else if (*cp2 == ']' || *cp2 == '>') { + if (*(cp1-1) != '/') *(cp1++) = '/'; /* Don't double after ellipsis */ + } else if (*cp2 == '.') { *(cp1++) = '/'; if (*(cp2+1) == ']' || *(cp2+1) == '>') { @@ -1414,6 +1927,10 @@ static char *do_tounixspec(char *spec, char *buf, int ts) if (!strncmp(cp2,"[000000",7) && (*(cp2+7) == ']' || *(cp2+7) == '>' || *(cp2+7) == '.')) cp2 += 7; } + else if ( *(cp2+1) == '.' && *(cp2+2) == '.') { + *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) ='/'; + cp2 += 2; + } } else if (*cp2 == '-') { if (*(cp2-1) == '[' || *(cp2-1) == '<' || *(cp2-1) == '.') { @@ -1451,7 +1968,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) { @@ -1463,9 +1980,10 @@ static char *do_tovmsspec(char *path, char *buf, int ts) { else strcpy(rslt,path); return rslt; } - if (*(dirend+1) == '.') { /* do we have trailing "/." or "/.."? */ + if (*(dirend+1) == '.') { /* do we have trailing "/." or "/.." or "/..."? */ if (!*(dirend+2)) dirend +=2; if (*(dirend+2) == '.' && !*(dirend+3)) dirend += 3; + if (*(dirend+2) == '.' && *(dirend+3) == '.' && !*(dirend+4)) dirend += 4; } cp1 = rslt; cp2 = path; @@ -1475,6 +1993,11 @@ static char *do_tovmsspec(char *path, char *buf, int ts) { STRLEN trnend; while (*(cp2+1) == '/') cp2++; /* Skip multiple /s */ + if (!*(cp2+1)) { + if (!buf & ts) Renew(rslt,18,char); + strcpy(rslt,"sys$disk:[000000]"); + return rslt; + } while (*(++cp2) != '/' && *cp2) *(cp1++) = *cp2; *cp1 = '\0'; islnm = my_trnlnm(rslt,trndev,0); @@ -1514,6 +2037,12 @@ static char *do_tovmsspec(char *path, char *buf, int ts) { *(cp1++) = '-'; /* "../" --> "-" */ cp2 += 3; } + else if (*(cp2+1) == '.' && *(cp2+2) == '.' && + (*(cp2+3) == '/' || *(cp2+3) == '\0')) { + *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '.'; /* ".../" --> "..." */ + if (!*(cp2+4)) *(cp1++) = '.'; /* Simulate trailing '/' for later */ + cp2 += 4; + } if (cp2 > dirend) cp2 = dirend; } else *(cp1++) = '.'; @@ -1541,6 +2070,16 @@ static char *do_tovmsspec(char *path, char *buf, int ts) { cp2 += 2; if (cp2 == dirend) break; } + else if ( *(cp2+1) == '.' && *(cp2+2) == '.' && + (*(cp2+3) == '/' || *(cp2+3) == '\0') ) { + if (*(cp1-1) != '.') *(cp1++) = '.'; /* May already have 1 from '/' */ + *(cp1++) = '.'; *(cp1++) = '.'; /* ".../" --> "..." */ + if (!*(cp2+3)) { + *(cp1++) = '.'; /* Simulate trailing '/' */ + cp2 += 2; /* for loop will incr this to == dirend */ + } + else cp2 += 3; /* Trailing '/' was there, so skip it, too */ + } else *(cp1++) = '_'; /* fix up syntax - '.' in name not allowed */ } else { @@ -1576,7 +2115,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; @@ -1605,7 +2144,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; @@ -1635,7 +2174,7 @@ char *tounixpath_ts(char *path, char *buf) { return do_tounixpath(path,buf,1); } * gain. * * * * 27-Aug-1994 Modified for inclusion in perl5 * - * by Charles Bailey bailey@genetics.upenn.edu * + * by Charles Bailey bailey@newman.upenn.edu * ***************************************************************************** */ @@ -1674,7 +2213,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. @@ -1823,7 +2362,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; @@ -1910,11 +2449,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; @@ -1932,14 +2471,18 @@ int isunix = 0; char *had_version; char *had_device; int had_directory; -char *devdir; +char *devdir,*cp; char vmsspec[NAM$C_MAXRSS+1]; $DESCRIPTOR(filespec, ""); $DESCRIPTOR(defaultspec, "SYS$DISK:[]"); $DESCRIPTOR(resultspec, ""); unsigned long int zero = 0, sts; - if (strcspn(item, "*%") == strlen(item) || strchr(item,' ') != NULL) + for (cp = item; *cp; cp++) { + if (*cp == '*' || *cp == '%' || isspace(*cp)) break; + if (*cp == '.' && *(cp-1) == '.' && *(cp-2) =='.') break; + } + if (!*cp || isspace(*cp)) { add_item(head, tail, item, count); return; @@ -1968,7 +2511,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) @@ -1986,7 +2529,7 @@ unsigned long int zero = 0, sts; for (c = string; *c; ++c) if (isupper(*c)) *c = tolower(*c); - if (isunix) trim_unixpath(string,item); + if (isunix) trim_unixpath(string,item,1); add_item(head, tail, string, count); ++expcount; } @@ -2001,6 +2544,7 @@ unsigned long int zero = 0, sts; set_errno(ENOENT); break; case RMS$_DEV: set_errno(ENODEV); break; + case RMS$_FNM: case RMS$_SYN: set_errno(EINVAL); break; case RMS$_PRV: @@ -2135,6 +2679,124 @@ 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) */ +/* Older VAXC header files lack these constants */ +#ifndef JPI$_RIGHTS_SIZE +# define JPI$_RIGHTS_SIZE 817 +#endif +#ifndef KGB$M_SUBSYSTEM +# define KGB$M_SUBSYSTEM 0x8 +#endif + +/*{{{void vms_image_init(int *, char ***)*/ +void +vms_image_init(int *argcp, char ***argvp) +{ + char eqv[LNM$C_NAMLENGTH+1] = ""; + unsigned int len, tabct = 8, tabidx = 0; + unsigned long int *mask, iosb[2], i, rlst[128], rsz; + unsigned long int iprv[(sizeof(union prvdef) + sizeof(unsigned long int) - 1) / sizeof(unsigned long int)]; + unsigned short int dummy, rlen; + struct dsc$descriptor_s **tabvec; + struct itmlst_3 jpilist[4] = { {sizeof iprv, JPI$_IMAGPRIV, iprv, &dummy}, + {sizeof rlst, JPI$_RIGHTSLIST, rlst, &rlen}, + { sizeof rsz, JPI$_RIGHTS_SIZE, &rsz, &dummy}, + { 0, 0, 0, 0} }; + + _ckvmssts(sys$getjpiw(0,NULL,NULL,jpilist,iosb,NULL,NULL)); + _ckvmssts(iosb[0]); + for (i = 0; i < sizeof iprv / sizeof(unsigned long int); i++) { + if (iprv[i]) { /* Running image installed with privs? */ + _ckvmssts(sys$setprv(0,iprv,0,NULL)); /* Turn 'em off. */ + will_taint = TRUE; + break; + } + } + /* Rights identifiers might trigger tainting as well. */ + if (!will_taint && (rlen || rsz)) { + while (rlen < rsz) { + /* We didn't get all the identifiers on the first pass. Allocate a + * buffer much larger than $GETJPI wants (rsz is size in bytes that + * were needed to hold all identifiers at time of last call; we'll + * allocate that many unsigned long ints), and go back and get 'em. + */ + if (jpilist[1].bufadr != rlst) Safefree(jpilist[1].bufadr); + jpilist[1].bufadr = New(1320,mask,rsz,unsigned long int); + jpilist[1].buflen = rsz * sizeof(unsigned long int); + _ckvmssts(sys$getjpiw(0,NULL,NULL,&jpilist[1],iosb,NULL,NULL)); + _ckvmssts(iosb[0]); + } + mask = jpilist[1].bufadr; + /* Check attribute flags for each identifier (2nd longword); protected + * subsystem identifiers trigger tainting. + */ + for (i = 1; i < (rlen + sizeof(unsigned long int) - 1) / sizeof(unsigned long int); i += 2) { + if (mask[i] & KGB$M_SUBSYSTEM) { + will_taint = TRUE; + break; + } + } + if (mask != rlst) Safefree(mask); + } + /* We need to use this hack to tell Perl it should run with tainting, + * since its tainting flag may be part of the PL_curinterp struct, which + * hasn't been allocated when vms_image_init() is called. + */ + if (will_taint) { + char ***newap; + New(1320,newap,*argcp+2,char **); + newap[0] = argvp[0]; + *newap[1] = "-T"; + Copy(argvp[1],newap[2],*argcp-1,char **); + /* We orphan the old argv, since we don't know where it's come from, + * so we don't know how to free it. + */ + *argcp++; argvp = newap; + } + else { /* Did user explicitly request tainting? */ + int i; + char *cp, **av = *argvp; + for (i = 1; i < *argcp; i++) { + if (*av[i] != '-') break; + for (cp = av[i]+1; *cp; cp++) { + if (*cp == 'T') { will_taint = 1; break; } + else if ( (*cp == 'd' || *cp == 'V') && *(cp+1) == ':' || + strchr("DFIiMmx",*cp)) break; + } + if (will_taint) break; + } + } + + for (tabidx = 0; + len = my_trnlnm("PERL_ENV_TABLES",eqv,tabidx); + tabidx++) { + if (!tabidx) New(1321,tabvec,tabct,struct dsc$descriptor_s *); + else if (tabidx >= tabct) { + tabct += 8; + Renew(tabvec,tabct,struct dsc$descriptor_s *); + } + New(1322,tabvec[tabidx],1,struct dsc$descriptor_s); + tabvec[tabidx]->dsc$w_length = 0; + tabvec[tabidx]->dsc$b_dtype = DSC$K_DTYPE_T; + tabvec[tabidx]->dsc$b_class = DSC$K_CLASS_D; + tabvec[tabidx]->dsc$a_pointer = NULL; + _ckvmssts(lib$scopy_r_dx(&len,eqv,tabvec[tabidx])); + } + if (tabidx) { tabvec[tabidx] = NULL; env_tables = tabvec; } + + getredirection(argcp,argvp); +#if defined(USE_THREADS) && defined(__DECC) + { +# include + (void) decc$set_reentrancy(C$C_MULTITHREAD); + } +#endif + 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 @@ -2142,23 +2804,26 @@ unsigned long int flags = 17, one = 1, retsts; * of whether input filespec was VMS-style or Unix-style. * * fspec is filespec to be trimmed, and wildspec is wildcard spec used to - * determine prefix (both may be in VMS or Unix syntax). + * determine prefix (both may be in VMS or Unix syntax). opts is a bit + * vector of options; at present, only bit 0 is used, and if set tells + * trim unixpath to try the current default directory as a prefix when + * presented with a possibly ambiguous ... wildcard. * * Returns !=0 on success, with trimmed filespec replacing contents of * fspec, and 0 on failure, with contents of fpsec unchanged. */ -/*{{{int trim_unixpath(char *fspec, char *wildspec)*/ +/*{{{int trim_unixpath(char *fspec, char *wildspec, int opts)*/ int -trim_unixpath(char *fspec, char *wildspec) +trim_unixpath(char *fspec, char *wildspec, int opts) { char unixified[NAM$C_MAXRSS+1], unixwild[NAM$C_MAXRSS+1], - *template, *base, *cp1, *cp2; - register int tmplen, reslen = 0; + *template, *base, *end, *cp1, *cp2; + register int tmplen, reslen = 0, dirs = 0; if (!wildspec || !fspec) return 0; if (strpbrk(wildspec,"]>:") != NULL) { if (do_tounixspec(wildspec,unixwild,0) == NULL) return 0; - else template = unixified; + else template = unixwild; } else template = wildspec; if (strpbrk(fspec,"]>:") != NULL) { @@ -2180,63 +2845,112 @@ trim_unixpath(char *fspec, char *wildspec) return 1; } - /* Find prefix to template consisting of path elements without wildcards */ - if ((cp1 = strpbrk(template,"*%?")) == NULL) - for (cp1 = template; *cp1; cp1++) ; - else while (cp1 > template && *cp1 != '/') cp1--; - for (cp2 = base; *cp2; cp2++) ; /* Find end of resultant filespec */ - - /* Wildcard was in first element, so we don't have a reliable string to - * match against. Guess where to trim resultant filespec by counting - * directory levels in the Unix template. (We could do this instead of - * string matching in all cases, since Unix doesn't have a ... wildcard - * that can expand into multiple levels of subdirectory, but we try for - * the string match so our caller can interpret foo/.../bar.* as - * [.foo...]bar.* if it wants, and only get burned if there was a - * wildcard in the first word (in which case, caveat caller). */ - if (cp1 == template) { - int subdirs = 0; - for ( ; *cp1; cp1++) if (*cp1 == '/') subdirs++; - /* need to back one more '/' than in template, to pick up leading dirname */ - subdirs++; - while (cp2 > base) { - if (*cp2 == '/') subdirs--; - if (!subdirs) break; /* quit without decrement when we hit last '/' */ - cp2--; - } - /* ran out of directories on resultant; allow for already trimmed - * resultant, which hits start of string looking for leading '/' */ - if (subdirs && (cp2 != base || subdirs != 1)) return 0; - /* Move past leading '/', if there is one */ - base = cp2 + (*cp2 == '/' ? 1 : 0); - tmplen = strlen(base); - if (reslen && tmplen > reslen) return 0; /* not enough space */ - memmove(fspec,base,tmplen+1); /* copy result to fspec, with trailing NUL */ + for (end = base; *end; end++) ; /* Find end of resultant filespec */ + if ((cp1 = strstr(template,".../")) == NULL) { /* No ...; just count elts */ + for (cp1 = template; *cp1; cp1++) if (*cp1 == '/') dirs++; + for (cp1 = end ;cp1 >= base; cp1--) + if ((*cp1 == '/') && !dirs--) /* postdec so we get front of rel path */ + { cp1++; break; } + if (cp1 != fspec) memmove(fspec,cp1, end - cp1 + 1); return 1; } - /* We have a prefix string of complete directory names, so we - * try to find it on the resultant filespec */ - else { - tmplen = cp1 - template; - if (!memcmp(base,template,tmplen)) { /* Nothing before prefix; we're done */ - if (reslen) { /* we converted to Unix syntax; copy result over */ - tmplen = cp2 - base; - if (tmplen > reslen) return 0; /* not enough space */ - memmove(fspec,base,tmplen+1); /* Copy trimmed spec + trailing NUL */ + else { + char tpl[NAM$C_MAXRSS+1], lcres[NAM$C_MAXRSS+1]; + char *front, *nextell, *lcend, *lcfront, *ellipsis = cp1; + int ells = 1, totells, segdirs, match; + struct dsc$descriptor_s wilddsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, tpl}, + resdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + + while ((cp1 = strstr(ellipsis+4,".../")) != NULL) {ellipsis = cp1; ells++;} + totells = ells; + for (cp1 = ellipsis+4; *cp1; cp1++) if (*cp1 == '/') dirs++; + if (ellipsis == template && opts & 1) { + /* Template begins with an ellipsis. Since we can't tell how many + * directory names at the front of the resultant to keep for an + * arbitrary starting point, we arbitrarily choose the current + * default directory as a starting point. If it's there as a prefix, + * clip it off. If not, fall through and act as if the leading + * ellipsis weren't there (i.e. return shortest possible path that + * could match template). + */ + if (getcwd(tpl, sizeof tpl,0) == NULL) return 0; + for (cp1 = tpl, cp2 = base; *cp1 && *cp2; cp1++,cp2++) + if (_tolower(*cp1) != _tolower(*cp2)) break; + segdirs = dirs - totells; /* Min # of dirs we must have left */ + for (front = cp2+1; *front; front++) if (*front == '/') segdirs--; + if (*cp1 == '\0' && *cp2 == '/' && segdirs < 1) { + memcpy(fspec,cp2+1,end - cp2); + return 1; } - return 1; } - for ( ; cp2 - base > tmplen; base++) { - if (*base != '/') continue; - if (!memcmp(base + 1,template,tmplen)) break; + /* First off, back up over constant elements at end of path */ + if (dirs) { + for (front = end ; front >= base; front--) + if (*front == '/' && !dirs--) { front++; break; } } - - if (cp2 - base == tmplen) return 0; /* Not there - not good */ - base++; /* Move past leading '/' */ - if (reslen && cp2 - base > reslen) return 0; /* not enough space */ - /* Copy down remaining portion of filespec, including trailing NUL */ - memmove(fspec,base,cp2 - base + 1); + for (cp1=template,cp2=lcres; *cp1 && cp2 <= lcres + sizeof lcres; + cp1++,cp2++) *cp2 = _tolower(*cp1); /* Make lc copy for match */ + if (cp1 != '\0') return 0; /* Path too long. */ + lcend = cp2; + *cp2 = '\0'; /* Pick up with memcpy later */ + lcfront = lcres + (front - base); + /* Now skip over each ellipsis and try to match the path in front of it. */ + while (ells--) { + for (cp1 = ellipsis - 2; cp1 >= template; cp1--) + if (*(cp1) == '.' && *(cp1+1) == '.' && + *(cp1+2) == '.' && *(cp1+3) == '/' ) break; + if (cp1 < template) break; /* template started with an ellipsis */ + if (cp1 + 4 == ellipsis) { /* Consecutive ellipses */ + ellipsis = cp1; continue; + } + wilddsc.dsc$w_length = resdsc.dsc$w_length = ellipsis - 1 - cp1; + nextell = cp1; + for (segdirs = 0, cp2 = tpl; + cp1 <= ellipsis - 1 && cp2 <= tpl + sizeof tpl; + cp1++, cp2++) { + if (*cp1 == '?') *cp2 = '%'; /* Substitute VMS' wildcard for Unix' */ + else *cp2 = _tolower(*cp1); /* else lowercase for match */ + if (*cp2 == '/') segdirs++; + } + if (cp1 != ellipsis - 1) return 0; /* Path too long */ + /* Back up at least as many dirs as in template before matching */ + for (cp1 = lcfront - 1; segdirs && cp1 >= lcres; cp1--) + if (*cp1 == '/' && !segdirs--) { cp1++; break; } + for (match = 0; cp1 > lcres;) { + resdsc.dsc$a_pointer = cp1; + if (str$match_wild(&wilddsc,&resdsc) == STR$_MATCH) { + match++; + if (match == 1) lcfront = cp1; + } + for ( ; cp1 >= lcres; cp1--) if (*cp1 == '/') { cp1++; break; } + } + if (!match) return 0; /* Can't find prefix ??? */ + if (match > 1 && opts & 1) { + /* This ... wildcard could cover more than one set of dirs (i.e. + * a set of similar dir names is repeated). If the template + * contains more than 1 ..., upstream elements could resolve the + * ambiguity, but it's not worth a full backtracking setup here. + * As a quick heuristic, clip off the current default directory + * if it's present to find the trimmed spec, else use the + * shortest string that this ... could cover. + */ + char def[NAM$C_MAXRSS+1], *st; + + if (getcwd(def, sizeof def,0) == NULL) return 0; + for (cp1 = def, cp2 = base; *cp1 && *cp2; cp1++,cp2++) + if (_tolower(*cp1) != _tolower(*cp2)) break; + segdirs = dirs - totells; /* Min # of dirs we must have left */ + for (st = cp2+1; *st; st++) if (*st == '/') segdirs--; + if (*cp1 == '\0' && *cp2 == '/') { + memcpy(fspec,cp2+1,end - cp2); + return 1; + } + /* Nope -- stick with lcfront from above and keep going. */ + } + } + memcpy(fspec,base + (lcfront - lcres), lcend - lcfront + 1); return 1; + ellipsis = nextell; } } /* end of trim_unixpath() */ @@ -2246,9 +2960,8 @@ trim_unixpath(char *fspec, char *wildspec) /* * VMS readdir() routines. * Written by Rich $alz, in August, 1990. - * This code has no copyright. * - * 21-Jul-1994 Charles Bailey bailey@genetics.upenn.edu + * 21-Jul-1994 Charles Bailey bailey@newman.upenn.edu * Minor modifications to original routines. */ @@ -2264,14 +2977,23 @@ opendir(char *name) { DIR *dd; char dir[NAM$C_MAXRSS+1]; - - /* Get memory for the handle, and the pattern. */ - New(7006,dd,1,DIR); + Stat_t sb; + if (do_tovmspath(name,dir,0) == NULL) { - Safefree((char *)dd); - return(NULL); + return NULL; + } + if (flex_stat(dir,&sb) == -1) return NULL; + if (!S_ISDIR(sb.st_mode)) { + set_errno(ENOTDIR); set_vaxc_errno(RMS$_DIR); + return NULL; + } + if (!cando_by_name(S_IRUSR,0,dir)) { + set_errno(EACCES); set_vaxc_errno(RMS$_PRV); + return NULL; } - New(7007,dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); + /* Get memory for the handle, and the pattern. */ + New(1306,dd,1,DIR); + New(1307,dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); /* Fill in the fields; mainly playing with the descriptor. */ (void)sprintf(dd->pattern, "%s*.*",dir); @@ -2330,7 +3052,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); @@ -2401,7 +3123,8 @@ readdir(DIR *dd) dd->count++; /* Force the buffer to end with a NUL, and downcase name to match C convention. */ buff[sizeof buff - 1] = '\0'; - for (p = buff; !isspace(*p); p++) *p = _tolower(*p); + for (p = buff; *p; p++) *p = _tolower(*p); + while (--p >= buff) if (!isspace(*p)) break; /* Do we really need this? */ *p = '\0'; /* Skip any directory component and just copy the name. */ @@ -2478,12 +3201,12 @@ seekdir(DIR *dd, long count) * in 'VMSish fashion' (i.e. not after a call to vfork) The args * are concatenated to form a DCL command string. If the first arg * begins with '$' (i.e. the perl script had "\$ Type" or some such), - * the the command string is hrnded off to DCL directly. Otherwise, + * the the command string is handed off to DCL directly. Otherwise, * the first token of the command is taken as the filespec of an image * to run. The filespec is expanded using a default type of '.EXE' and - * the process defaults for device, directory, etc., and the resultant + * the process defaults for device, directory, etc., and if found, the resultant * filespec is invoked using the DCL verb 'MCR', and passed the rest of - * the command string as parameters. This is perhaps a bit compicated, + * the command string as parameters. This is perhaps a bit complicated, * but I hope it will form a happy medium between what VMS folks expect * from lib$spawn and what Unix folks expect from exec. */ @@ -2504,9 +3227,9 @@ static struct dsc$descriptor_s VMScmd = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,Nullch}; static void vms_execfree() { - if (Cmd) { - Safefree(Cmd); - Cmd = Nullch; + if (PL_Cmd) { + Safefree(PL_Cmd); + PL_Cmd = Nullch; } if (VMScmd.dsc$a_pointer) { Safefree(VMScmd.dsc$a_pointer); @@ -2518,10 +3241,12 @@ 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; register SV **idx; + STRLEN n_a; idx = mark; if (really) { @@ -2538,20 +3263,22 @@ setup_argstr(SV *really, SV **mark, SV **sp) cmdlen += rlen ? rlen + 1 : 0; } } - New(401,Cmd,cmdlen+1,char); + New(401,PL_Cmd,cmdlen+1,char); if (tmps && *tmps) { - strcpy(Cmd,tmps); + strcpy(PL_Cmd,tmps); mark++; } - else *Cmd = '\0'; + else *PL_Cmd = '\0'; while (++mark <= sp) { if (*mark) { - strcat(Cmd," "); - strcat(Cmd,SvPVx(*mark,na)); + char *s = SvPVx(*mark,n_a); + if (!*s) continue; + if (*PL_Cmd) strcat(PL_Cmd," "); + strcat(PL_Cmd,s); } } - return Cmd; + return PL_Cmd; } /* end of setup_argstr() */ @@ -2563,7 +3290,7 @@ setup_cmddsc(char *cmd, int check_img) $DESCRIPTOR(defdsc,".EXE"); $DESCRIPTOR(resdsc,resspec); struct dsc$descriptor_s imgdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; - unsigned long int cxt = 0, flags = 1, retsts; + unsigned long int cxt = 0, flags = 1, retsts = SS$_NORMAL; register char *s, *rest, *cp; register int isdcl = 0; @@ -2581,42 +3308,45 @@ setup_cmddsc(char *cmd, int check_img) } } else isdcl = 1; - if (isdcl) { /* It's a DCL command, just do it. */ - VMScmd.dsc$w_length = strlen(cmd); - if (cmd == Cmd) { - VMScmd.dsc$a_pointer = Cmd; - Cmd = Nullch; /* Don't try to free twice in vms_execfree() */ - } - else VMScmd.dsc$a_pointer = savepvn(cmd,VMScmd.dsc$w_length); - } - else { /* assume first token is an image spec */ + if (!isdcl) { cmd = s; while (*s && !isspace(*s)) s++; rest = *s ? s : 0; imgdsc.dsc$a_pointer = cmd; imgdsc.dsc$w_length = s - cmd; retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,0,&flags); - if (!(retsts & 1)) { - /* just hand off status values likely to be due to user error */ - if (retsts == RMS$_FNF || retsts == RMS$_DNF || - retsts == RMS$_DEV || retsts == RMS$_DIR || retsts == RMS$_SYN || - (retsts & STS$M_CODE) == (SHR$_NOWILD & STS$M_CODE)) return retsts; - else { _ckvmssts(retsts); } - } - else { + if (retsts & 1) { _ckvmssts(lib$find_file_end(&cxt)); s = resspec; while (*s && !isspace(*s)) s++; *s = '\0'; - New(402,VMScmd.dsc$a_pointer,7 + s - resspec + (rest ? strlen(rest) : 0),char); - strcpy(VMScmd.dsc$a_pointer,"$ MCR "); - strcat(VMScmd.dsc$a_pointer,resspec); - if (rest) strcat(VMScmd.dsc$a_pointer,rest); - VMScmd.dsc$w_length = strlen(VMScmd.dsc$a_pointer); + if (cando_by_name(S_IXUSR,0,resspec)) { + New(402,VMScmd.dsc$a_pointer,7 + s - resspec + (rest ? strlen(rest) : 0),char); + strcpy(VMScmd.dsc$a_pointer,"$ MCR "); + strcat(VMScmd.dsc$a_pointer,resspec); + if (rest) strcat(VMScmd.dsc$a_pointer,rest); + VMScmd.dsc$w_length = strlen(VMScmd.dsc$a_pointer); + return retsts; + } + else retsts = RMS$_PRV; } } + /* It's either a DCL command or we couldn't find a suitable image */ + VMScmd.dsc$w_length = strlen(cmd); + if (cmd == PL_Cmd) { + VMScmd.dsc$a_pointer = PL_Cmd; + PL_Cmd = Nullch; /* Don't try to free twice in vms_execfree() */ + } + else VMScmd.dsc$a_pointer = savepvn(cmd,VMScmd.dsc$w_length); + if (!(retsts & 1)) { + /* just hand off status values likely to be due to user error */ + if (retsts == RMS$_FNF || retsts == RMS$_DNF || retsts == RMS$_PRV || + retsts == RMS$_DEV || retsts == RMS$_DIR || retsts == RMS$_SYN || + (retsts & STS$M_CODE) == (SHR$_NOWILD & STS$M_CODE)) return retsts; + else { _ckvmssts(retsts); } + } - return (VMScmd.dsc$w_length > 255 ? CLI$_BUFOVF : SS$_NORMAL); + return (VMScmd.dsc$w_length > 255 ? CLI$_BUFOVF : retsts); } /* end of setup_cmddsc() */ @@ -2625,6 +3355,7 @@ setup_cmddsc(char *cmd, int check_img) bool vms_do_aexec(SV *really,SV **mark,SV **sp) { + dTHR; if (sp > mark) { if (vfork_called) { /* this follows a vfork - act Unixish */ vfork_called--; @@ -2660,13 +3391,32 @@ 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); - set_errno(EVMSERR); + switch (retsts) { + case RMS$_FNF: + set_errno(ENOENT); break; + case RMS$_DNF: case RMS$_DIR: case RMS$_DEV: + set_errno(ENOTDIR); break; + case RMS$_PRV: + set_errno(EACCES); break; + case RMS$_SYN: + set_errno(EINVAL); break; + case CLI$_BUFOVF: + set_errno(E2BIG); break; + case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ + _ckvmssts(retsts); /* fall through */ + default: /* SS$_DUPLNAM, SS$_CLI, resource exhaustion, etc. */ + set_errno(EVMSERR); + } set_vaxc_errno(retsts); - if (dowarn) - warn("Can't exec \"%s\": %s", VMScmd.dsc$a_pointer, Strerror(errno)); + if (ckWARN(WARN_EXEC)) { + warner(WARN_EXEC,"Can't exec \"%*s\": %s", + VMScmd.dsc$w_length, VMScmd.dsc$a_pointer, Strerror(errno)); + } vms_execfree(); } @@ -2677,11 +3427,12 @@ vms_do_exec(char *cmd) unsigned long int do_spawn(char *); -/* {{{ unsigned long int do_aspawn(SV *really,SV **mark,SV **sp) */ +/* {{{ unsigned long int do_aspawn(void *really,void **mark,void **sp) */ unsigned long int -do_aspawn(SV *really,SV **mark,SV **sp) +do_aspawn(void *really,void **mark,void **sp) { - if (sp > mark) return do_spawn(setup_argstr(really,mark,sp)); + dTHR; + if (sp > mark) return do_spawn(setup_argstr((SV *)really,(SV **)mark,(SV **)sp)); return SS$_ABORT; } /* end of do_aspawn() */ @@ -2691,22 +3442,42 @@ do_aspawn(SV *really,SV **mark,SV **sp) unsigned long int do_spawn(char *cmd) { - unsigned long int substs, hadcmd = 1; + unsigned long int sts, 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)); + sts = lib$spawn(0,0,0,0,0,0,&substs,0,0,0,0,0,0); } - else if ((substs = setup_cmddsc(cmd,0)) & 1) { - _ckvmssts(lib$spawn(&VMScmd,0,0,0,0,0,&substs,0,0,0,0,0,0)); + else if ((sts = setup_cmddsc(cmd,0)) & 1) { + sts = lib$spawn(&VMScmd,0,0,0,0,0,&substs,0,0,0,0,0,0); } - if (!(substs&1)) { - set_errno(EVMSERR); - set_vaxc_errno(substs); - if (dowarn) - warn("Can't spawn \"%s\": %s", - hadcmd ? VMScmd.dsc$a_pointer : "", Strerror(errno)); + if (!(sts & 1)) { + switch (sts) { + case RMS$_FNF: + set_errno(ENOENT); break; + case RMS$_DNF: case RMS$_DIR: case RMS$_DEV: + set_errno(ENOTDIR); break; + case RMS$_PRV: + set_errno(EACCES); break; + case RMS$_SYN: + set_errno(EINVAL); break; + case CLI$_BUFOVF: + set_errno(E2BIG); break; + case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ + _ckvmssts(sts); /* fall through */ + default: /* SS$_DUPLNAM, SS$_CLI, resource exhaustion, etc. */ + set_errno(EVMSERR); + } + set_vaxc_errno(sts); + if (ckWARN(WARN_EXEC)) { + warner(WARN_EXEC,"Can't spawn \"%*s\": %s", + hadcmd ? VMScmd.dsc$w_length : 0, + hadcmd ? VMScmd.dsc$a_pointer : "", + Strerror(errno)); + } } vms_execfree(); return substs; @@ -2739,6 +3510,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 + Stat_t 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 @@ -2884,7 +3671,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)) { @@ -2893,17 +3680,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)); @@ -2940,7 +3727,7 @@ struct passwd *my_getpwuid(Uid_t uid) else { uic.uic$l_uic= uid; if (!uic.uic$v_group) - uic.uic$v_group= getgid(); + uic.uic$v_group= PerlProc_getgid(); if (valid_uic(uic)) status = sys$idtoasc(uic.uic$l_uic, &lname, &name_desc, 0, 0, 0); else status = SS$_IVIDENT; @@ -2990,59 +3777,453 @@ void my_endpwent() contxt= 0; } } -/*}}}*/ +/*}}}*/ + +#ifdef HOMEGROWN_POSIX_SIGNALS + /* 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 *) */ +int my_sigemptyset(sigset_t *set) { + if (!set) { SETERRNO(EFAULT,SS$_ACCVIO); return -1; } + *set = 0; return 0; +} +/*}}}*/ + + +/*{{{int my_sigfillset(sigset_t *)*/ +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)*/ +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)*/ +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)*/ +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)*/ +int my_sigprocmask(int how, sigset_t *set, sigset_t *oset) { + sigset_t tempmask; + + /* If set and oset are both null, then things are badly wrong. Bail out. */ + 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; +} +/*}}}*/ +#endif /* HOMEGROWN_POSIX_SIGNALS */ + + +/* Used for UTC calculation in my_gmtime(), my_localtime(), my_time(), + * my_utime(), and flex_stat(), all of which operate on UTC unless + * VMSISH_TIMES is true. + */ +/* method used to handle UTC conversions: + * 1 == CRTL gmtime(); 2 == SYS$TIMEZONE_DIFFERENTIAL; 3 == no correction + */ +static int gmtime_emulation_type; +/* number of secs to add to UTC POSIX-style time to get local time */ +static long int utc_offset_secs; + +/* We #defined 'gmtime', 'localtime', and 'time' as 'my_gmtime' etc. + * in vmsish.h. #undef them here so we can call the CRTL routines + * directly. + */ +#undef gmtime +#undef localtime +#undef time + +#if defined(__VMS_VER) && __VMS_VER >= 70000000 && __DECC_VER >= 50200000 +# define RTL_USES_UTC 1 +#endif + +static time_t toutc_dst(time_t loc) { + struct tm *rsltmp; + + if ((rsltmp = localtime(&loc)) == NULL) return -1; + loc -= utc_offset_secs; + if (rsltmp->tm_isdst) loc -= 3600; + return loc; +} +#define _toutc(secs) ((secs) == -1 ? -1 : \ + ((gmtime_emulation_type || my_time(NULL)), \ + (gmtime_emulation_type == 1 ? toutc_dst(secs) : \ + ((secs) - utc_offset_secs)))) + +static time_t toloc_dst(time_t utc) { + struct tm *rsltmp; + + utc += utc_offset_secs; + if ((rsltmp = localtime(&utc)) == NULL) return -1; + if (rsltmp->tm_isdst) utc += 3600; + return utc; +} +#define _toloc(secs) ((secs) == -1 ? -1 : \ + ((gmtime_emulation_type || my_time(NULL)), \ + (gmtime_emulation_type == 1 ? toloc_dst(secs) : \ + ((secs) + utc_offset_secs)))) -/* my_gmtime - * If the CRTL has a real gmtime(), use it, else look for the logical - * name SYS$TIMEZONE_DIFFERENTIAL used by the native UTC routines on - * VMS >= 6.0. Can be manually defined under earlier versions of VMS - * to translate to the number of seconds which must be added to UTC - * to get to the local time of the system. +/* my_time(), my_localtime(), my_gmtime() + * By default traffic in UTC time values, using CRTL gmtime() or + * SYS$TIMEZONE_DIFFERENTIAL to determine offset from local time zone. + * Note: We need to use these functions even when the CRTL has working + * UTC support, since they also handle C + * * Contributed by Chuck Lane + * Modified by Charles Bailey */ -/*{{{struct tm *my_gmtime(const time_t *time)*/ -/* We #defined 'gmtime' as 'my_gmtime' in vmsish.h. #undef it here - * so we can call the CRTL's routine to see if it works. - */ -#undef gmtime -struct tm * -my_gmtime(const time_t *time) +/*{{{time_t my_time(time_t *timep)*/ +time_t my_time(time_t *timep) { - static int gmtime_emulation_type; - static time_t utc_offset_secs; - char *p; + dTHR; time_t when; + struct tm *tm_p; if (gmtime_emulation_type == 0) { + int dstnow; + time_t base = 15 * 86400; /* 15jan71; to avoid month/year ends between */ + /* results of calls to gmtime() and localtime() */ + /* for same &base */ + gmtime_emulation_type++; - when = 300000000; - if (gmtime(&when) == NULL) { /* CRTL gmtime() is just a stub */ + if ((tm_p = gmtime(&base)) == NULL) { /* CRTL gmtime() is a fake */ + char off[LNM$C_NAMLENGTH+1];; + gmtime_emulation_type++; - if ((p = my_getenv("SYS$TIMEZONE_DIFFERENTIAL")) == NULL) + if (!vmstrnenv("SYS$TIMEZONE_DIFFERENTIAL",off,0,fildev,0)) { gmtime_emulation_type++; - else - utc_offset_secs = (time_t) atol(p); + warn("no UTC offset information; assuming local time is UTC"); + } + else { utc_offset_secs = atol(off); } + } + else { /* We've got a working gmtime() */ + struct tm gmt, local; + + gmt = *tm_p; + tm_p = localtime(&base); + local = *tm_p; + utc_offset_secs = (local.tm_mday - gmt.tm_mday) * 86400; + utc_offset_secs += (local.tm_hour - gmt.tm_hour) * 3600; + utc_offset_secs += (local.tm_min - gmt.tm_min) * 60; + utc_offset_secs += (local.tm_sec - gmt.tm_sec); } } - switch (gmtime_emulation_type) { - case 1: - return gmtime(time); - case 2: - when = *time - utc_offset_secs; - return localtime(&when); - default: - warn("gmtime not supported on this system"); - return NULL; + when = time(NULL); +# ifdef VMSISH_TIME +# ifdef RTL_USES_UTC + if (VMSISH_TIME) when = _toloc(when); +# else + if (!VMSISH_TIME) when = _toutc(when); +# endif +# endif + if (timep != NULL) *timep = when; + return when; + +} /* end of my_time() */ +/*}}}*/ + + +/*{{{struct tm *my_gmtime(const time_t *timep)*/ +struct tm * +my_gmtime(const time_t *timep) +{ + dTHR; + char *p; + time_t when; + struct tm *rsltmp; + + if (timep == NULL) { + set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); + return NULL; } + if (*timep == 0) gmtime_emulation_type = 0; /* possibly reset TZ */ + + when = *timep; +# ifdef VMSISH_TIME + if (VMSISH_TIME) when = _toutc(when); /* Input was local time */ +# endif +# ifdef RTL_USES_UTC /* this implies that the CRTL has a working gmtime() */ + return gmtime(&when); +# else + /* CRTL localtime() wants local time as input, so does no tz correction */ + rsltmp = localtime(&when); + if (rsltmp) rsltmp->tm_isdst = 0; /* We already took DST into account */ + return rsltmp; +#endif } /* end of my_gmtime() */ -/* Reset definition for later calls */ -#define gmtime(t) my_gmtime(t) /*}}}*/ +/*{{{struct tm *my_localtime(const time_t *timep)*/ +struct tm * +my_localtime(const time_t *timep) +{ + dTHR; + time_t when; + struct tm *rsltmp; + + 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; +# ifdef RTL_USES_UTC +# ifdef VMSISH_TIME + if (VMSISH_TIME) when = _toutc(when); +# endif + /* CRTL localtime() wants UTC as input, does tz correction itself */ + return localtime(&when); +# else +# ifdef VMSISH_TIME + if (!VMSISH_TIME) when = _toloc(when); /* Input was UTC */ +# endif +# endif + /* CRTL localtime() wants local time as input, so does no tz correction */ + rsltmp = localtime(&when); + if (rsltmp && gmtime_emulation_type != 1) rsltmp->tm_isdst = -1; + return rsltmp; + +} /* end of my_localtime() */ +/*}}}*/ + +/* Reset definitions for later calls */ +#define gmtime(t) my_gmtime(t) +#define localtime(t) my_localtime(t) +#define time(t) my_time(t) + + +/* my_utime - update modification time of a file + * calling sequence is identical to POSIX utime(), but under + * VMS only the modification time is changed; ODS-2 does not + * maintain access times. Restrictions differ from the POSIX + * definition in that the time can be changed as long as the + * caller has permission to execute the necessary IO$_MODIFY $QIO; + * no separate checks are made to insure that the caller is the + * owner of the file or has special privs enabled. + * Code here is based on Joe Meadows' FILE utility. + */ + +/* Adjustment from Unix epoch (01-JAN-1970 00:00:00.00) + * to VMS epoch (01-JAN-1858 00:00:00.00) + * in 100 ns intervals. + */ +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 */ + unsigned long int chan, iosb[2], retsts; + char vmsspec[NAM$C_MAXRSS+1], rsa[NAM$C_MAXRSS], esa[NAM$C_MAXRSS]; + struct FAB myfab = cc$rms_fab; + struct NAM mynam = cc$rms_nam; +#if defined (__DECC) && defined (__VAX) + /* VAX DEC C atrdef.h has unsigned type for pointer member atr$l_addr, + * at least through VMS V6.1, which causes a type-conversion warning. + */ +# pragma message save +# pragma message disable cvtdiftypes +#endif + struct atrdef myatr[2] = {{sizeof bintime, ATR$C_REVDATE, bintime}, {0,0,0}}; + struct fibdef myfib; +#if defined (__DECC) && defined (__VAX) + /* This should be right after the declaration of myatr, but due + * to a bug in VAX DEC C, this takes effect a statement early. + */ +# pragma message restore +#endif + struct dsc$descriptor fibdsc = {sizeof(myfib), DSC$K_DTYPE_Z, DSC$K_CLASS_S,(char *) &myfib}, + devdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}, + fnmdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}; + + if (file == NULL || *file == '\0') { + set_errno(ENOENT); + set_vaxc_errno(LIB$_INVARG); + return -1; + } + if (do_tovmsspec(file,vmsspec,0) == NULL) return -1; + + if (utimes != NULL) { + /* Convert Unix time (seconds since 01-JAN-1970 00:00:00.00) + * to VMS quadword time (100 nsec intervals since 01-JAN-1858 00:00:00.00). + * Since time_t is unsigned long int, and lib$emul takes a signed long int + * as input, we force the sign bit to be clear by shifting unixtime right + * one bit, then multiplying by an extra factor of 2 in lib$emul(). + */ + lowbit = (utimes->modtime & 1) ? secscale : 0; + unixtime = (long int) utimes->modtime; +# ifdef VMSISH_TIME + /* If input was UTC; convert to local for sys svc */ + if (!VMSISH_TIME) unixtime = _toloc(unixtime); +# endif + unixtime >> 1; secscale << 1; + retsts = lib$emul(&secscale, &unixtime, &lowbit, bintime); + if (!(retsts & 1)) { + set_errno(EVMSERR); + set_vaxc_errno(retsts); + return -1; + } + retsts = lib$addx(bintime,utime_baseadjust,bintime,&len); + if (!(retsts & 1)) { + set_errno(EVMSERR); + set_vaxc_errno(retsts); + return -1; + } + } + else { + /* Just get the current time in VMS format directly */ + retsts = sys$gettim(bintime); + if (!(retsts & 1)) { + set_errno(EVMSERR); + set_vaxc_errno(retsts); + return -1; + } + } + + myfab.fab$l_fna = vmsspec; + myfab.fab$b_fns = (unsigned char) strlen(vmsspec); + myfab.fab$l_nam = &mynam; + mynam.nam$l_esa = esa; + mynam.nam$b_ess = (unsigned char) sizeof esa; + mynam.nam$l_rsa = rsa; + mynam.nam$b_rss = (unsigned char) sizeof rsa; + + /* Look for the file to be affected, letting RMS parse the file + * specification for us as well. I have set errno using only + * values documented in the utime() man page for VMS POSIX. + */ + retsts = sys$parse(&myfab,0,0); + if (!(retsts & 1)) { + set_vaxc_errno(retsts); + if (retsts == RMS$_PRV) set_errno(EACCES); + else if (retsts == RMS$_DIR) set_errno(ENOTDIR); + else set_errno(EVMSERR); + return -1; + } + retsts = sys$search(&myfab,0,0); + if (!(retsts & 1)) { + set_vaxc_errno(retsts); + if (retsts == RMS$_PRV) set_errno(EACCES); + else if (retsts == RMS$_FNF) set_errno(ENOENT); + else set_errno(EVMSERR); + return -1; + } + + devdsc.dsc$w_length = mynam.nam$b_dev; + devdsc.dsc$a_pointer = (char *) mynam.nam$l_dev; + + retsts = sys$assign(&devdsc,&chan,0,0); + if (!(retsts & 1)) { + set_vaxc_errno(retsts); + if (retsts == SS$_IVDEVNAM) set_errno(ENOTDIR); + else if (retsts == SS$_NOPRIV) set_errno(EACCES); + else if (retsts == SS$_NOSUCHDEV) set_errno(ENOTDIR); + else set_errno(EVMSERR); + return -1; + } + + fnmdsc.dsc$a_pointer = mynam.nam$l_name; + fnmdsc.dsc$w_length = mynam.nam$b_name + mynam.nam$b_type + mynam.nam$b_ver; + + memset((void *) &myfib, 0, sizeof myfib); +#ifdef __DECC + for (i=0;i<3;i++) myfib.fib$w_fid[i] = mynam.nam$w_fid[i]; + for (i=0;i<3;i++) myfib.fib$w_did[i] = mynam.nam$w_did[i]; + /* This prevents the revision time of the file being reset to the current + * time as a result of our IO$_MODIFY $QIO. */ + myfib.fib$l_acctl = FIB$M_NORECORD; +#else + for (i=0;i<3;i++) myfib.fib$r_fid_overlay.fib$w_fid[i] = mynam.nam$w_fid[i]; + for (i=0;i<3;i++) myfib.fib$r_did_overlay.fib$w_did[i] = mynam.nam$w_did[i]; + myfib.fib$r_acctl_overlay.fib$l_acctl = FIB$M_NORECORD; +#endif + retsts = sys$qiow(0,chan,IO$_MODIFY,iosb,0,0,&fibdsc,&fnmdsc,0,0,myatr,0); + _ckvmssts(sys$dassgn(chan)); + if (retsts & 1) retsts = iosb[0]; + if (!(retsts & 1)) { + set_vaxc_errno(retsts); + if (retsts == SS$_NOPRIV) set_errno(EACCES); + else set_errno(EVMSERR); + return -1; + } + + return 0; +} /* end of my_utime() */ +/*}}}*/ + /* * flex_stat, flex_fstat * basic stat, but gets it right when asked to stat @@ -3078,11 +4259,11 @@ my_gmtime(const time_t *time) * 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; @@ -3144,16 +4325,16 @@ is_null_device(name) return (*name++ == ':') && (*name != ':'); } -/* Do the permissions allow some operation? Assumes statcache already set. */ +/* Do the permissions allow some operation? Assumes PL_statcache already set. */ /* Do this via $Check_Access on VMS, since the CRTL stat() returns only a * subset of the applicable information. */ /*{{{I32 cando(I32 bit, I32 effective, struct stat *statbufp)*/ I32 -cando(I32 bit, I32 effective, struct stat *statbufp) +cando(I32 bit, I32 effective, Stat_t *statbufp) { - if (statbufp == &statcache) - return cando_by_name(bit,effective,namecache); + dTHR; + if (statbufp == &PL_statcache) return cando_by_name(bit,effective,namecache); else { char fname[NAM$C_MAXRSS+1]; unsigned long int retsts; @@ -3162,13 +4343,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 = ((Stat_t *)statbufp)->st_devnam; + devdsc.dsc$w_length = strlen(((Stat_t *)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,&(((Stat_t *)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); @@ -3249,10 +4430,13 @@ cando_by_name(I32 bit, I32 effective, char *fname) } retsts = sys$check_access(&objtyp,&namdsc,&usrdsc,armlst); - if (retsts == SS$_NOPRIV || retsts == SS$_NOSUCHOBJECT || - retsts == RMS$_FNF || retsts == RMS$_DIR || - retsts == RMS$_DEV) { - set_errno(retsts == SS$_NOPRIV ? EACCES : ENOENT); set_vaxc_errno(retsts); + if (retsts == SS$_NOPRIV || retsts == SS$_NOSUCHOBJECT || + retsts == SS$_INVFILFOROP || retsts == RMS$_FNF || retsts == RMS$_SYN || + retsts == RMS$_DIR || retsts == RMS$_DEV) { + set_vaxc_errno(retsts); + if (retsts == SS$_NOPRIV) set_errno(EACCES); + else if (retsts == SS$_INVFILFOROP) set_errno(EINVAL); + else set_errno(ENOENT); return FALSE; } if (retsts == SS$_NORMAL) { @@ -3268,6 +4452,9 @@ cando_by_name(I32 bit, I32 effective, char *fname) if ((privused & CHP$M_READALL) && !curprv.prv$v_readall) return FALSE; return TRUE; } + if (retsts == SS$_ACCONFLICT) { + return TRUE; + } _ckvmssts(retsts); return FALSE; /* Should never get here */ @@ -3276,13 +4463,33 @@ cando_by_name(I32 bit, I32 effective, char *fname) /*}}}*/ -/*{{{ int flex_fstat(int fd, struct stat *statbuf)*/ -#undef stat +/*{{{ int flex_fstat(int fd, Stat_t *statbuf)*/ int -flex_fstat(int fd, struct mystat *statbufp) +flex_fstat(int fd, Stat_t *statbufp) { + dTHR; if (!fstat(fd,(stat_t *) statbufp)) { + if (statbufp == (Stat_t *) &PL_statcache) *namecache == '\0'; statbufp->st_dev = encode_dev(statbufp->st_devnam); +# ifdef RTL_USES_UTC +# ifdef VMSISH_TIME + if (VMSISH_TIME) { + statbufp->st_mtime = _toloc(statbufp->st_mtime); + statbufp->st_atime = _toloc(statbufp->st_atime); + statbufp->st_ctime = _toloc(statbufp->st_ctime); + } +# endif +# else +# ifdef VMSISH_TIME + if (!VMSISH_TIME) { /* Return UTC instead of local time */ +# else + if (1) { +# endif + statbufp->st_mtime = _toutc(statbufp->st_mtime); + statbufp->st_atime = _toutc(statbufp->st_atime); + statbufp->st_ctime = _toutc(statbufp->st_ctime); + } +#endif return 0; } return -1; @@ -3290,21 +4497,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, Stat_t *statbufp)*/ int -flex_stat(char *fspec, struct mystat *statbufp) +flex_stat(char *fspec, Stat_t *statbufp) { + dTHR; char fileified[NAM$C_MAXRSS+1]; - int retval,myretval; - struct mystat tmpbuf; + int retval = -1; - - if (statbufp == &statcache) do_tovmsspec(fspec,namecache,0); + if (statbufp == (Stat_t *) &PL_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:"); @@ -3316,50 +4518,45 @@ flex_stat(char *fspec, struct mystat *statbufp) return 0; } - if (do_fileify_dirspec(fspec,fileified,0) == NULL) myretval = -1; - else { - myretval = stat(fileified,(stat_t *) &tmpbuf); + /* Try for a directory name first. If fspec contains a filename without + * a type (e.g. sea:[wine.dark]water), and both sea:[wine.dark]water.dir + * and sea:[wine.dark]water. exist, we prefer the directory here. + * Similarly, sea:[wine.dark] returns the result for sea:[wine]dark.dir, + * not sea:[wine.dark]., if the latter exists. If the intended target is + * the file with null type, specify this by calling flex_stat() with + * a '.' at the end of fspec. + */ + if (do_fileify_dirspec(fspec,fileified,0) != NULL) { + retval = stat(fileified,(stat_t *) statbufp); + if (!retval && statbufp == (Stat_t *) &PL_statcache) + strcpy(namecache,fileified); } - retval = stat(fspec,(stat_t *) statbufp); - if (!myretval) { - if (retval == -1) { - *statbufp = tmpbuf; - retval = 0; + if (retval) retval = stat(fspec,(stat_t *) statbufp); + if (!retval) { + statbufp->st_dev = encode_dev(statbufp->st_devnam); +# ifdef RTL_USES_UTC +# ifdef VMSISH_TIME + if (VMSISH_TIME) { + statbufp->st_mtime = _toloc(statbufp->st_mtime); + statbufp->st_atime = _toloc(statbufp->st_atime); + statbufp->st_ctime = _toloc(statbufp->st_ctime); } - else if (!retval) { /* Dir with same name. Substitute it. */ - statbufp->st_mode &= ~S_IFDIR; - statbufp->st_mode |= tmpbuf.st_mode & S_IFDIR; - strcpy(namecache,fileified); +# endif +# else +# ifdef VMSISH_TIME + if (!VMSISH_TIME) { /* Return UTC instead of local time */ +# else + if (1) { +# endif + statbufp->st_mtime = _toutc(statbufp->st_mtime); + statbufp->st_atime = _toutc(statbufp->st_atime); + statbufp->st_ctime = _toutc(statbufp->st_ctime); } +# endif } - if (!retval) statbufp->st_dev = encode_dev(statbufp->st_devnam); 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. */ -/*{{{FILE *my_binmode(FILE *fp, char iotype)*/ -FILE * -my_binmode(FILE *fp, char iotype) -{ - char filespec[NAM$C_MAXRSS], *acmode; - fpos_t pos; - - if (!fgetname(fp,filespec)) return NULL; - if (fgetpos(fp,&pos) == -1) return NULL; - switch (iotype) { - case '<': case 'r': acmode = "rb"; break; - case '>': case 'w': acmode = "wb"; break; - case '+': case '|': case 's': acmode = "rb+"; break; - case 'a': acmode = "ab"; break; - case '-': acmode = fileno(fp) ? "wb" : "rb"; break; - } - if (freopen(filespec,acmode,fp) == NULL) return NULL; - if (fsetpos(fp,&pos) == -1) return NULL; -} /* end of my_binmode() */ /*}}}*/ @@ -3391,7 +4588,7 @@ my_getlogin() * * Returns 1 on success; returns 0 and sets errno and vaxc$errno on failure. * - * Copyright 1996 by Charles Bailey . + * Copyright 1996 by Charles Bailey . * Incorporates, with permission, some code from EZCOPY by Tim Adye * . Permission is given to distribute this code * as part of the Perl standard distribution under the terms of the @@ -3574,71 +4771,18 @@ void rmsexpand_fromperl(CV *cv) { dXSARGS; - char esa[NAM$C_MAXRSS], rsa[NAM$C_MAXRSS], *cp, *out; - struct FAB myfab = cc$rms_fab; - struct NAM mynam = cc$rms_nam; - STRLEN speclen; - unsigned long int retsts, haslower = 0; - - if (items > 2) croak("Usage: VMS::Filespec::rmsexpand(spec[,defspec])"); - - myfab.fab$l_fna = SvPV(ST(0),speclen); - myfab.fab$b_fns = speclen; - myfab.fab$l_nam = &mynam; - - if (items == 2) { - myfab.fab$l_dna = SvPV(ST(1),speclen); - myfab.fab$b_dns = speclen; - } - - mynam.nam$l_esa = esa; - mynam.nam$b_ess = sizeof esa; - mynam.nam$l_rsa = rsa; - mynam.nam$b_rss = sizeof rsa; - - retsts = sys$parse(&myfab,0,0); - if (!(retsts & 1)) { - if (retsts == RMS$_DNF || retsts == RMS$_DIR || - retsts == RMS$_DEV || retsts == RMS$_DEV) { - mynam.nam$b_nop |= NAM$M_SYNCHK; - retsts = sys$parse(&myfab,0,0); - if (retsts & 1) goto expanded; - } - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else if (retsts == RMS$_DEV) set_errno(ENODEV); - else if (retsts == RMS$_DIR) set_errno(ENOTDIR); - else set_errno(EVMSERR); - XSRETURN_UNDEF; - } - retsts = sys$search(&myfab,0,0); - if (!(retsts & 1) && retsts != RMS$_FNF) { - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else set_errno(EVMSERR); - XSRETURN_UNDEF; - } + char *fspec, *defspec = NULL, *rslt; + STRLEN n_a; - /* If the input filespec contained any lowercase characters, - * downcase the result for compatibility with Unix-minded code. */ - expanded: - for (out = myfab.fab$l_fna; *out; out++) - if (islower(*out)) { haslower = 1; break; } - if (mynam.nam$b_rsl) { out = rsa; speclen = mynam.nam$b_rsl; } - else { out = esa; speclen = mynam.nam$b_esl; } - if (!(mynam.nam$l_fnb & NAM$M_EXP_VER) && - (items == 1 || !strchr(myfab.fab$l_dna,';'))) - speclen = mynam.nam$l_ver - out; - /* If we just had a directory spec on input, $PARSE "helpfully" - * adds an empty name and type for us */ - if (mynam.nam$l_name == mynam.nam$l_type && - mynam.nam$l_ver == mynam.nam$l_type + 1 && - !(mynam.nam$l_fnb & NAM$M_EXP_NAME)) - speclen = mynam.nam$l_name - out; - out[speclen] = '\0'; - if (haslower) __mystrtolower(out); + if (!items || items > 2) + croak("Usage: VMS::Filespec::rmsexpand(spec[,defspec])"); + fspec = SvPV(ST(0),n_a); + if (!fspec || !*fspec) XSRETURN_UNDEF; + if (items == 2) defspec = SvPV(ST(1),n_a); - ST(0) = sv_2mortal(newSVpv(out, speclen)); + rslt = do_rmsexpand(fspec,NULL,1,defspec,0); + ST(0) = sv_newmortal(); + if (rslt != NULL) sv_usepvn(ST(0),rslt,strlen(rslt)); XSRETURN(1); } @@ -3647,9 +4791,10 @@ vmsify_fromperl(CV *cv) { dXSARGS; char *vmsified; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::vmsify(spec)"); - vmsified = do_tovmsspec(SvPV(ST(0),na),NULL,1); + vmsified = do_tovmsspec(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (vmsified != NULL) sv_usepvn(ST(0),vmsified,strlen(vmsified)); XSRETURN(1); @@ -3660,9 +4805,10 @@ unixify_fromperl(CV *cv) { dXSARGS; char *unixified; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::unixify(spec)"); - unixified = do_tounixspec(SvPV(ST(0),na),NULL,1); + unixified = do_tounixspec(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (unixified != NULL) sv_usepvn(ST(0),unixified,strlen(unixified)); XSRETURN(1); @@ -3673,9 +4819,10 @@ fileify_fromperl(CV *cv) { dXSARGS; char *fileified; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::fileify(spec)"); - fileified = do_fileify_dirspec(SvPV(ST(0),na),NULL,1); + fileified = do_fileify_dirspec(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (fileified != NULL) sv_usepvn(ST(0),fileified,strlen(fileified)); XSRETURN(1); @@ -3686,9 +4833,10 @@ pathify_fromperl(CV *cv) { dXSARGS; char *pathified; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::pathify(spec)"); - pathified = do_pathify_dirspec(SvPV(ST(0),na),NULL,1); + pathified = do_pathify_dirspec(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (pathified != NULL) sv_usepvn(ST(0),pathified,strlen(pathified)); XSRETURN(1); @@ -3699,9 +4847,10 @@ vmspath_fromperl(CV *cv) { dXSARGS; char *vmspath; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::vmspath(spec)"); - vmspath = do_tovmspath(SvPV(ST(0),na),NULL,1); + vmspath = do_tovmspath(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (vmspath != NULL) sv_usepvn(ST(0),vmspath,strlen(vmspath)); XSRETURN(1); @@ -3712,9 +4861,10 @@ unixpath_fromperl(CV *cv) { dXSARGS; char *unixpath; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::unixpath(spec)"); - unixpath = do_tounixpath(SvPV(ST(0),na),NULL,1); + unixpath = do_tounixpath(SvPV(ST(0),n_a),NULL,1); ST(0) = sv_newmortal(); if (unixpath != NULL) sv_usepvn(ST(0),unixpath,strlen(unixpath)); XSRETURN(1); @@ -3727,27 +4877,28 @@ candelete_fromperl(CV *cv) char fspec[NAM$C_MAXRSS+1], *fsp; SV *mysv; IO *io; + STRLEN n_a; if (items != 1) croak("Usage: VMS::Filespec::candelete(spec)"); mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),fspec)) { + if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),fspec,1)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } fsp = fspec; } else { - if (mysv != ST(0) || !(fsp = SvPV(mysv,na)) || !*fsp) { + if (mysv != ST(0) || !(fsp = SvPV(mysv,n_a)) || !*fsp) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } } - 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); } @@ -3762,45 +4913,46 @@ rmscopy_fromperl(CV *cv) unsigned long int sts; SV *mysv; IO *io; + STRLEN n_a; if (items < 2 || items > 3) croak("Usage: File::Copy::rmscopy(from,to[,date_flag])"); mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),inspec)) { + if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),inspec,1)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } inp = inspec; } else { - if (mysv != ST(0) || !(inp = SvPV(mysv,na)) || !*inp) { + if (mysv != ST(0) || !(inp = SvPV(mysv,n_a)) || !*inp) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } } mysv = SvROK(ST(1)) ? SvRV(ST(1)) : ST(1); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),outspec)) { + if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),outspec,1)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } outp = outspec; } else { - if (mysv != ST(1) || !(outp = SvPV(mysv,na)) || !*outp) { + if (mysv != ST(1) || !(outp = SvPV(mysv,n_a)) || !*outp) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &sv_no; + ST(0) = &PL_sv_no; XSRETURN(1); } } 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); } @@ -3818,6 +4970,7 @@ init_os_extras() newXSproto("VMS::Filespec::unixpath",unixpath_fromperl,file,"$"); newXSproto("VMS::Filespec::candelete",candelete_fromperl,file,"$"); newXS("File::Copy::rmscopy",rmscopy_fromperl,file); + return; }