X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fvms.c;h=1c64f72891f126b118264e0a8c7eaca0be95b402;hb=b311af6269bf99f73d9dd17d28dfefaec9fc7ec4;hp=bd4203e0e919f70905a6d0ac7219855c4dc0ecb3;hpb=ff535f4d571654d23e99d97fbcf00a2b7fb37196;p=p5sagit%2Fp5-mst-13.2.git diff --git a/vms/vms.c b/vms/vms.c index bd4203e..1c64f72 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -3,6 +3,7 @@ * VMS-specific routines for perl5 * Version: 5.7.0 * + * August 2005 Convert VMS status code to UNIX status codes * August 2000 tweaks to vms_image_init, my_flush, my_fwrite, cando_by_name, * and Perl_cando by Craig Berry * 29-Aug-2000 Charles Lane's piping improvements rolled in @@ -29,6 +30,10 @@ #include #include #include +#include +#if __CRTL_VER >= 70301000 && !defined(__VAX) +#include +#endif #include #include #include @@ -40,6 +45,71 @@ #include #include #include +#include +#include + +/* Set the maximum filespec size here as it is larger for EFS file + * specifications. + * Not fully implemented at this time because the larger size + * will likely impact the stack local storage requirements of + * threaded code, and probably cause hard to diagnose failures. + * To implement the larger sizes, all places where filename + * storage is put on the stack need to be changed to use + * New()/SafeFree() instead. + */ +#ifndef __VAX +#ifndef VMS_MAXRSS +#ifdef NAML$C_MAXRSS +#define VMS_MAXRSS (NAML$C_MAXRSS+1) +#ifndef VMS_LONGNAME_SUPPORT +#define VMS_LONGNAME_SUPPORT 1 +#endif /* VMS_LONGNAME_SUPPORT */ +#endif /* NAML$C_MAXRSS */ +#endif /* VMS_MAXRSS */ +#endif + +/* temporary hack until support is complete */ +#ifdef VMS_LONGNAME_SUPPORT +#undef VMS_LONGNAME_SUPPORT +#undef VMS_MAXRSS +#endif +/* end of temporary hack until support is complete */ + +#ifndef VMS_MAXRSS +#define VMS_MAXRSS (NAM$C_MAXRSS + 1) +#endif + +#if __CRTL_VER < 70301000 && __CRTL_VER >= 70300000 +int decc$feature_get_index(const char *name); +char* decc$feature_get_name(int index); +int decc$feature_get_value(int index, int mode); +int decc$feature_set_value(int index, int mode, int value); +#else +#include +#endif + +#if __CRTL_VER >= 70300000 && !defined(__VAX) + +static int set_feature_default(const char *name, int value) +{ + int status; + int index; + + index = decc$feature_get_index(name); + + status = decc$feature_set_value(index, 1, value); + if (index == -1 || (status == -1)) { + return -1; + } + + status = decc$feature_get_value(index, 1); + if (status != value) { + return -1; + } + +return 0; +} +#endif /* Older versions of ssdef.h don't have these */ #ifndef SS$_INVFILFOROP @@ -49,7 +119,10 @@ # define SS$_NOSUCHOBJECT 2696 #endif -/* Don't replace system definitions of vfork, getenv, and stat, +/* We implement I/O here, so we will be mixing PerlIO and stdio calls. */ +#define PERLIO_NOT_STDIO 0 + +/* Don't replace system definitions of vfork, getenv, lstat, and stat, * code below needs to get to the underlying CRTL routines. */ #define DONT_MASK_RTL_CALLS #include "EXTERN.h" @@ -60,6 +133,11 @@ # define WARN_INTERNAL WARN_MISC #endif +#if defined(__VMS_VER) && __VMS_VER >= 70000000 && __DECC_VER >= 50200000 +# define RTL_USES_UTC 1 +#endif + + /* gcc's header files don't #define direct access macros * corresponding to VAXC's variant structs */ #ifdef __GNUC__ @@ -76,23 +154,59 @@ dEXT int h_errno; #endif +#ifdef __DECC +#pragma message disable pragma +#pragma member_alignment save +#pragma nomember_alignment longword +#pragma message save +#pragma message disable misalgndmem +#endif struct itmlst_3 { unsigned short int buflen; unsigned short int itmcode; void *bufadr; unsigned short int *retlen; }; +#ifdef __DECC +#pragma message restore +#pragma member_alignment restore +#endif #define do_fileify_dirspec(a,b,c) mp_do_fileify_dirspec(aTHX_ a,b,c) #define do_pathify_dirspec(a,b,c) mp_do_pathify_dirspec(aTHX_ a,b,c) #define do_tovmsspec(a,b,c) mp_do_tovmsspec(aTHX_ a,b,c) #define do_tovmspath(a,b,c) mp_do_tovmspath(aTHX_ a,b,c) #define do_rmsexpand(a,b,c,d,e) mp_do_rmsexpand(aTHX_ a,b,c,d,e) +#define do_vms_realpath(a,b) mp_do_vms_realpath(aTHX_ a,b) #define do_tounixspec(a,b,c) mp_do_tounixspec(aTHX_ a,b,c) #define do_tounixpath(a,b,c) mp_do_tounixpath(aTHX_ a,b,c) +#define do_vms_case_tolerant(a) mp_do_vms_case_tolerant(a) #define expand_wild_cards(a,b,c,d) mp_expand_wild_cards(aTHX_ a,b,c,d) #define getredirection(a,b) mp_getredirection(aTHX_ a,b) +static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts); +static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts); +static char *mp_do_tounixspec(pTHX_ const char *, char *, int); +static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts); + +/* see system service docs for $TRNLNM -- NOT the same as LNM$_MAX_INDEX */ +#define PERL_LNM_MAX_ALLOWED_INDEX 127 + +/* OpenVMS User's Guide says at least 9 iterative translations will be performed, + * depending on the facility. SHOW LOGICAL does 10, so we'll imitate that for + * the Perl facility. + */ +#define PERL_LNM_MAX_ITER 10 + + /* New values with 7.3-2*/ /* why does max DCL have 4 byte subtracted from it? */ +#if __CRTL_VER >= 70302000 && !defined(__VAX) +#define MAX_DCL_SYMBOL (8192) +#define MAX_DCL_LINE_LENGTH (4096 - 4) +#else +#define MAX_DCL_SYMBOL (1024) +#define MAX_DCL_LINE_LENGTH (1024 - 4) +#endif + static char *__mystrtolower(char *str) { if (str) for (; *str; ++str) *str= tolower(*str); @@ -112,17 +226,101 @@ static bool will_taint = FALSE; /* tainting active, but no PL_curinterp yet */ /* munching */ static int no_translate_barewords; -/* Temp for subprocess commands */ -static struct dsc$descriptor_s VMScmd = {0,DSC$K_DTYPE_T,DSC$K_CLASS_S,Nullch}; +#ifndef RTL_USES_UTC +static int tz_updated = 1; +#endif + +/* DECC Features that may need to affect how Perl interprets + * displays filename information + */ +static int decc_disable_to_vms_logname_translation = 1; +static int decc_disable_posix_root = 1; +int decc_efs_case_preserve = 0; +static int decc_efs_charset = 0; +static int decc_filename_unix_no_version = 0; +static int decc_filename_unix_only = 0; +int decc_filename_unix_report = 0; +int decc_posix_compliant_pathnames = 0; +int decc_readdir_dropdotnotype = 0; +static int vms_process_case_tolerant = 1; + +/* bug workarounds if needed */ +int decc_bug_readdir_efs1 = 0; +int decc_bug_devnull = 0; +int decc_bug_fgetname = 0; +int decc_dir_barename = 0; + +/* Is this a UNIX file specification? + * No longer a simple check with EFS file specs + * For now, not a full check, but need to + * handle POSIX ^UP^ specifications + * Fixing to handle ^/ cases would require + * changes to many other conversion routines. + */ + +static is_unix_filespec(const char *path) +{ +int ret_val; +const char * pch1; + + ret_val = 0; + if (strncmp(path,"\"^UP^",5) != 0) { + pch1 = strchr(path, '/'); + if (pch1 != NULL) + ret_val = 1; + else { + + /* If the user wants UNIX files, "." needs to be treated as in UNIX */ + if (decc_filename_unix_report || decc_filename_unix_only) { + if (strcmp(path,".") == 0) + ret_val = 1; + } + } + } + return ret_val; +} + + +/* my_maxidx + * Routine to retrieve the maximum equivalence index for an input + * logical name. Some calls to this routine have no knowledge if + * the variable is a logical or not. So on error we return a max + * index of zero. + */ +/*{{{int my_maxidx(const char *lnm) */ +static int +my_maxidx(const char *lnm) +{ + int status; + int midx; + int attr = LNM$M_CASE_BLIND; + struct dsc$descriptor lnmdsc; + struct itmlst_3 itlst[2] = {{sizeof(midx), LNM$_MAX_INDEX, &midx, 0}, + {0, 0, 0, 0}}; + + lnmdsc.dsc$w_length = strlen(lnm); + lnmdsc.dsc$b_dtype = DSC$K_DTYPE_T; + lnmdsc.dsc$b_class = DSC$K_CLASS_S; + lnmdsc.dsc$a_pointer = (char *) lnm; /* Cast ok for read only parameter */ + + status = sys$trnlnm(&attr, &fildevdsc, &lnmdsc, 0, itlst); + if ((status & 1) == 0) + midx = 0; + + return (midx); +} +/*}}}*/ /*{{{int vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, struct dsc$descriptor_s **tabvec, unsigned long int flags) */ int -Perl_vmstrnenv(pTHX_ const char *lnm, char *eqv, unsigned long int idx, +Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, struct dsc$descriptor_s **tabvec, unsigned long int flags) { - char uplnm[LNM$C_NAMLENGTH+1], *cp1, *cp2; + const char *cp1; + char uplnm[LNM$C_NAMLENGTH+1], *cp2; unsigned short int eqvlen, curtab, ivlnm = 0, ivsym = 0, ivenv = 0, secure; unsigned long int retsts, attr = LNM$M_CASE_BLIND; + int midx; 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}; @@ -130,23 +328,19 @@ Perl_vmstrnenv(pTHX_ const char *lnm, char *eqv, unsigned long int idx, {LNM$C_NAMLENGTH, LNM$_STRING, eqv, &eqvlen}, {0, 0, 0, 0}}; $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); -#if defined(USE_THREADS) - /* We jump through these hoops because we can be called at */ - /* platform-specific initialization time, which is before anything is */ - /* set up--we can't even do a plain dTHX since that relies on the */ - /* interpreter structure to be initialized */ - struct perl_thread *thr; +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX = NULL; if (PL_curinterp) { - thr = PL_threadnum? THR : (struct perl_thread*)SvPVX(PL_thrsv); + aTHX = PERL_GET_INTERP; } else { - thr = NULL; + aTHX = NULL; } #endif - if (!lnm || !eqv || idx > LNM$_MAX_INDEX) { + if (!lnm || !eqv || ((idx != 0) && ((idx-1) > PERL_LNM_MAX_ALLOWED_INDEX))) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return 0; } - for (cp1 = (char *)lnm, cp2 = uplnm; *cp1; cp1++, cp2++) { + 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); @@ -173,6 +367,7 @@ Perl_vmstrnenv(pTHX_ const char *lnm, char *eqv, unsigned long int idx, retsts = SS$_NOLOGNAM; for (i = 0; environ[i]; i++) { if ((eq = strchr(environ[i],'=')) && + lnmdsc.dsc$w_length == (eq - environ[i]) && !strncmp(environ[i],uplnm,eq - environ[i])) { eq++; for (eqvlen = 0; eq[eqvlen]; eqvlen++) eqv[eqvlen] = eq[eqvlen]; @@ -193,25 +388,16 @@ Perl_vmstrnenv(pTHX_ const char *lnm, char *eqv, unsigned long int idx, _ckvmssts(lib$sget1_dd(&deflen,&eqvdsc)); retsts = lib$get_symbol(&lnmdsc,&eqvdsc,&eqvlen,0); if (retsts & 1) { - if (eqvlen > 1024) { + if (eqvlen > MAX_DCL_SYMBOL) { set_errno(EVMSERR); set_vaxc_errno(LIB$_STRTRU); - eqvlen = 1024; + eqvlen = MAX_DCL_SYMBOL; /* Special hack--we might be called before the interpreter's */ /* fully initialized, in which case either thr or PL_curcop */ /* might be bogus. We have to check, since ckWARN needs them */ /* both to be valid if running threaded */ -#if defined(USE_THREADS) - if (thr && PL_curcop) { -#endif if (ckWARN(WARN_MISC)) { - Perl_warner(aTHX_ WARN_MISC,"Value of CLI symbol \"%s\" too long",lnm); + Perl_warner(aTHX_ packWARN(WARN_MISC),"Value of CLI symbol \"%s\" too long",lnm); } -#if defined(USE_THREADS) - } else { - Perl_warner(aTHX_ WARN_MISC,"Value of CLI symbol \"%s\" too long",lnm); - } -#endif - } strncpy(eqv,eqvdsc.dsc$a_pointer,eqvlen); } @@ -222,22 +408,40 @@ Perl_vmstrnenv(pTHX_ const char *lnm, char *eqv, unsigned long int idx, } } else if (!ivlnm) { - retsts = sys$trnlnm(&attr,tabvec[curtab],&lnmdsc,&acmode,lnmlst); - if (retsts == SS$_IVLOGNAM) { ivlnm = 1; continue; } - if (retsts == SS$_NOLOGNAM) continue; - /* PPFs have a prefix */ - if ( + if ( (idx == 0) && (flags & PERL__TRNENV_JOIN_SEARCHLIST) ) { + midx = my_maxidx(lnm); + for (idx = 0, cp2 = eqv; idx <= midx; idx++) { + lnmlst[1].bufadr = cp2; + eqvlen = 0; + retsts = sys$trnlnm(&attr,tabvec[curtab],&lnmdsc,&acmode,lnmlst); + if (retsts == SS$_IVLOGNAM) { ivlnm = 1; break; } + if (retsts == SS$_NOLOGNAM) break; + /* PPFs have a prefix */ + if ( #if INTSIZE == 4 - *((int *)uplnm) == *((int *)"SYS$") && + *((int *)uplnm) == *((int *)"SYS$") && #endif - eqvlen >= 4 && eqv[0] == 0x1b && eqv[1] == 0x00 && - ( (uplnm[4] == 'O' && !strcmp(uplnm,"SYS$OUTPUT")) || - (uplnm[4] == 'I' && !strcmp(uplnm,"SYS$INPUT")) || - (uplnm[4] == 'E' && !strcmp(uplnm,"SYS$ERROR")) || - (uplnm[4] == 'C' && !strcmp(uplnm,"SYS$COMMAND")) ) ) { - memcpy(eqv,eqv+4,eqvlen-4); - eqvlen -= 4; + eqvlen >= 4 && eqv[0] == 0x1b && eqv[1] == 0x00 && + ( (uplnm[4] == 'O' && !strcmp(uplnm,"SYS$OUTPUT")) || + (uplnm[4] == 'I' && !strcmp(uplnm,"SYS$INPUT")) || + (uplnm[4] == 'E' && !strcmp(uplnm,"SYS$ERROR")) || + (uplnm[4] == 'C' && !strcmp(uplnm,"SYS$COMMAND")) ) ) { + memmove(eqv,eqv+4,eqvlen-4); + eqvlen -= 4; + } + cp2 += eqvlen; + *cp2 = '\0'; + } + if ((retsts == SS$_IVLOGNAM) || + (retsts == SS$_NOLOGNAM)) { continue; } + } + else { + retsts = sys$trnlnm(&attr,tabvec[curtab],&lnmdsc,&acmode,lnmlst); + if (retsts == SS$_IVLOGNAM) { ivlnm = 1; continue; } + if (retsts == SS$_NOLOGNAM) continue; + eqv[eqvlen] = '\0'; } + eqvlen = strlen(eqv); break; } } @@ -278,43 +482,98 @@ int Perl_my_trnlnm(pTHX_ const char *lnm, char *eqv, unsigned long int idx) char * Perl_my_getenv(pTHX_ const char *lnm, bool sys) { - static char __my_getenv_eqv[LNM$C_NAMLENGTH+1]; - char uplnm[LNM$C_NAMLENGTH+1], *cp1, *cp2, *eqv; + const char *cp1; + static char *__my_getenv_eqv = NULL; + char uplnm[LNM$C_NAMLENGTH+1], *cp2, *eqv; unsigned long int idx = 0; - int trnsuccess; + int trnsuccess, success, secure, saverr, savvmserr; + int midx, flags; SV *tmpsv; + midx = my_maxidx(lnm) + 1; + 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)); + tmpsv = sv_2mortal(newSVpv("",(LNM$C_NAMLENGTH*midx)+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); + else { + /* Assume no interpreter ==> single thread */ + if (__my_getenv_eqv != NULL) { + Renew(__my_getenv_eqv,LNM$C_NAMLENGTH*midx+1,char); + } + else { + Newx(__my_getenv_eqv,LNM$C_NAMLENGTH*midx+1,char); + } + eqv = __my_getenv_eqv; + } + + for (cp1 = lnm, cp2 = eqv; *cp1; cp1++,cp2++) *cp2 = _toupper(*cp1); if (cp1 - lnm == 7 && !strncmp(eqv,"DEFAULT",7)) { + int len; getcwd(eqv,LNM$C_NAMLENGTH); + + len = strlen(eqv); + + /* Get rid of "000000/ in rooted filespecs */ + if (len > 7) { + char * zeros; + zeros = strstr(eqv, "/000000/"); + if (zeros != NULL) { + int mlen; + mlen = len - (zeros - eqv) - 7; + memmove(zeros, &zeros[7], mlen); + len = len - 7; + eqv[len] = '\0'; + } + } return eqv; } else { + /* Impose security constraints only if tainting */ + if (sys) { + /* Impose security constraints only if tainting */ + secure = PL_curinterp ? PL_tainting : will_taint; + saverr = errno; savvmserr = vaxc$errno; + } + else { + secure = 0; + } + + flags = +#ifdef SECURE_INTERNAL_GETENV + secure ? PERL__TRNENV_SECURE : 0 +#else + 0 +#endif + ; + + /* For the getenv interface we combine all the equivalence names + * of a search list logical into one value to acquire a maximum + * value length of 255*128 (assuming %ENV is using logicals). + */ + flags |= PERL__TRNENV_JOIN_SEARCHLIST; + + /* If the name contains a semicolon-delimited index, parse it + * off and make sure we only retrieve the equivalence name for + * that index. */ if ((cp2 = strchr(lnm,';')) != NULL) { strcpy(uplnm,lnm); uplnm[cp2-lnm] = '\0'; idx = strtoul(cp2+1,NULL,0); lnm = uplnm; + flags &= ~PERL__TRNENV_JOIN_SEARCHLIST; } - /* Impose security constraints only if tainting */ - if (sys) sys = PL_curinterp ? PL_tainting : will_taint; - 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; + + success = vmstrnenv(lnm,eqv,idx,secure ? fildev : NULL,flags); + + /* Discard NOLOGNAM on internal calls since we're often looking + * for an optional name, and this "error" often shows up as the + * (bogus) exit status for a die() call later on. */ + if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr); + return success ? eqv : Nullch; } } /* end of my_getenv() */ @@ -323,54 +582,110 @@ Perl_my_getenv(pTHX_ const char *lnm, bool sys) /*{{{ SV *my_getenv_len(const char *lnm, bool sys)*/ char * -my_getenv_len(const char *lnm, unsigned long *len, bool sys) +Perl_my_getenv_len(pTHX_ const char *lnm, unsigned long *len, bool sys) { - dTHX; - char *buf, *cp1, *cp2; + const char *cp1; + char *buf, *cp2; unsigned long idx = 0; - static char __my_getenv_len_eqv[LNM$C_NAMLENGTH+1]; + int midx, flags; + static char *__my_getenv_len_eqv = NULL; + int secure, saverr, savvmserr; SV *tmpsv; + midx = my_maxidx(lnm) + 1; + 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)); + tmpsv = sv_2mortal(newSVpv("",(LNM$C_NAMLENGTH*midx)+1)); if (!tmpsv) return NULL; buf = SvPVX(tmpsv); } - else buf = __my_getenv_len_eqv; /* Assume no interpreter ==> single thread */ - for (cp1 = (char *)lnm, cp2 = buf; *cp1; cp1++,cp2++) *cp2 = _toupper(*cp1); + else { + /* Assume no interpreter ==> single thread */ + if (__my_getenv_len_eqv != NULL) { + Renew(__my_getenv_len_eqv,LNM$C_NAMLENGTH*midx+1,char); + } + else { + Newx(__my_getenv_len_eqv,LNM$C_NAMLENGTH*midx+1,char); + } + buf = __my_getenv_len_eqv; + } + + for (cp1 = lnm, cp2 = buf; *cp1; cp1++,cp2++) *cp2 = _toupper(*cp1); if (cp1 - lnm == 7 && !strncmp(buf,"DEFAULT",7)) { + char * zeros; + getcwd(buf,LNM$C_NAMLENGTH); *len = strlen(buf); + + /* Get rid of "000000/ in rooted filespecs */ + if (*len > 7) { + zeros = strstr(buf, "/000000/"); + if (zeros != NULL) { + int mlen; + mlen = *len - (zeros - buf) - 7; + memmove(zeros, &zeros[7], mlen); + *len = *len - 7; + buf[*len] = '\0'; + } + } return buf; } else { + if (sys) { + /* Impose security constraints only if tainting */ + secure = PL_curinterp ? PL_tainting : will_taint; + saverr = errno; savvmserr = vaxc$errno; + } + else { + secure = 0; + } + + flags = +#ifdef SECURE_INTERNAL_GETENV + secure ? PERL__TRNENV_SECURE : 0 +#else + 0 +#endif + ; + + flags |= PERL__TRNENV_JOIN_SEARCHLIST; + if ((cp2 = strchr(lnm,';')) != NULL) { strcpy(buf,lnm); buf[cp2-lnm] = '\0'; idx = strtoul(cp2+1,NULL,0); lnm = buf; + flags &= ~PERL__TRNENV_JOIN_SEARCHLIST; } - /* Impose security constraints only if tainting */ - if (sys) sys = PL_curinterp ? PL_tainting : will_taint; - if ((*len = vmstrnenv(lnm,buf,idx, - sys ? fildev : NULL, -#ifdef SECURE_INTERNAL_GETENV - sys ? PERL__TRNENV_SECURE : 0 -#else - 0 -#endif - ))) - return buf; - else - return Nullch; + + *len = vmstrnenv(lnm,buf,idx,secure ? fildev : NULL,flags); + + /* Get rid of "000000/ in rooted filespecs */ + if (*len > 7) { + char * zeros; + zeros = strstr(buf, "/000000/"); + if (zeros != NULL) { + int mlen; + mlen = *len - (zeros - buf) - 7; + memmove(zeros, &zeros[7], mlen); + *len = *len - 7; + buf[*len] = '\0'; + } + } + + /* Discard NOLOGNAM on internal calls since we're often looking + * for an optional name, and this "error" often shows up as the + * (bogus) exit status for a die() call later on. */ + if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr); + return *len ? buf : Nullch; } } /* end of my_getenv_len() */ /*}}}*/ -static void create_mbx(unsigned short int *, struct dsc$descriptor_s *); +static void create_mbx(pTHX_ unsigned short int *, struct dsc$descriptor_s *); static void riseandshine(unsigned long int dummy) { sys$wake(0,0); } @@ -381,9 +696,9 @@ prime_env_iter(void) * find, in preparation for iterating over it. */ { - dTHX; static int primed = 0; HV *seenhv = NULL, *envhv; + SV *sv = NULL; char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = Nullch; unsigned short int chan; #ifndef CLI$M_TRUSTED @@ -398,11 +713,26 @@ prime_env_iter(void) $DESCRIPTOR(clidsc,"DCL"); $DESCRIPTOR(clitabdsc,"DCLTABLES"); $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); $DESCRIPTOR(local,"_LOCAL"); $DESCRIPTOR(mbxdsc,mbxnam); -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX; +#endif +#if defined(USE_ITHREADS) static perl_mutex primenv_mutex; MUTEX_INIT(&primenv_mutex); #endif +#if defined(PERL_IMPLICIT_CONTEXT) + /* We jump through these hoops because we can be called at */ + /* platform-specific initialization time, which is before anything is */ + /* set up--we can't even do a plain dTHX since that relies on the */ + /* interpreter structure to be initialized */ + if (PL_curinterp) { + aTHX = PERL_GET_INTERP; + } else { + aTHX = NULL; + } +#endif + if (primed || !PL_envgv) return; MUTEX_LOCK(&primenv_mutex); if (primed) { MUTEX_UNLOCK(&primenv_mutex); return; } @@ -430,12 +760,13 @@ prime_env_iter(void) for (j = 0; environ[j]; j++) { if (!(start = strchr(environ[j],'='))) { if (ckWARN(WARN_INTERNAL)) - Perl_warner(aTHX_ WARN_INTERNAL,"Ill-formed CRTL environ value \"%s\"\n",environ[j]); + Perl_warner(aTHX_ packWARN(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); + sv = newSVpv(start,0); + SvTAINTED_on(sv); + (void) hv_store(envhv,environ[j],start - environ[j] - 1,sv,0); } } continue; @@ -471,7 +802,7 @@ prime_env_iter(void) defflags &= ~CLI$M_TRUSTED; } while (retsts == LIB$_INVARG && (flags | CLI$M_TRUSTED)); _ckvmssts(retsts); - if (!buf) New(1322,buf,mbxbufsiz + 1,char); + if (!buf) Newx(buf,mbxbufsiz + 1,char); if (seenhv) SvREFCNT_dec(seenhv); seenhv = newHV(); while (1) { @@ -499,7 +830,7 @@ prime_env_iter(void) continue; } if (sts == SS$_BUFFEROVF && ckWARN(WARN_INTERNAL)) - Perl_warner(aTHX_ WARN_INTERNAL,"Buffer overflow in prime_env_iter: %s",buf); + Perl_warner(aTHX_ packWARN(WARN_INTERNAL),"Buffer overflow in prime_env_iter: %s",buf); for (cp1 = buf; *cp1 && isspace(*cp1); cp1++) ; if (*cp1 == '(' || /* Logical name table name */ @@ -520,21 +851,39 @@ prime_env_iter(void) cp1--; /* stop on last non-space char */ } if ((!keylen || (cp1 - cp2 < -1)) && ckWARN(WARN_INTERNAL)) { - Perl_warner(aTHX_ WARN_INTERNAL,"Ill-formed message in prime_env_iter: |%s|",buf); + Perl_warner(aTHX_ packWARN(WARN_INTERNAL),"Ill-formed message in prime_env_iter: |%s|",buf); continue; } PERL_HASH(hash,key,keylen); - hv_store(envhv,key,keylen,newSVpvn(cp2,cp1 - cp2 + 1),hash); + + if (cp1 == cp2 && *cp2 == '.') { + /* A single dot usually means an unprintable character, such as a null + * to indicate a zero-length value. Get the actual value to make sure. + */ + char lnm[LNM$C_NAMLENGTH+1]; + char eqv[MAX_DCL_SYMBOL+1]; + strncpy(lnm, key, keylen); + int trnlen = vmstrnenv(lnm, eqv, 0, fildev, 0); + sv = newSVpvn(eqv, strlen(eqv)); + } + else { + sv = newSVpvn(cp2,cp1 - cp2 + 1); + } + + SvTAINTED_on(sv); + hv_store(envhv,key,keylen,sv,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}; + const 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); + sv = newSVpv(eqv,trnlen); + SvTAINTED_on(sv); + hv_store(envhv,ppfs[i],strlen(ppfs[i]),sv,0); } } } @@ -549,7 +898,7 @@ prime_env_iter(void) /*}}}*/ -/*{{{ int vmssetenv(char *lnm, char *eqv)*/ +/*{{{ int vmssetenv(const char *lnm, const 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 @@ -557,17 +906,24 @@ prime_env_iter(void) * Like setenv() returns 0 for success, non-zero on error. */ int -vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) +Perl_vmssetenv(pTHX_ const char *lnm, const char *eqv, struct dsc$descriptor_s **tabvec) { - char uplnm[LNM$C_NAMLENGTH], *cp1, *cp2; + const char *cp1; + char uplnm[LNM$C_NAMLENGTH], *cp2, *c; unsigned short int curtab, ivlnm = 0, ivsym = 0, ivenv = 0; + int nseg = 0, j; unsigned long int retsts, usermode = PSL$C_USER; + struct itmlst_3 *ile, *ilist; 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}, tmpdsc = {6,DSC$K_DTYPE_T,DSC$K_CLASS_S,0}; $DESCRIPTOR(crtlenv,"CRTL_ENV"); $DESCRIPTOR(clisym,"CLISYM"); $DESCRIPTOR(local,"_LOCAL"); - dTHX; + + if (!lnm) { + set_errno(EINVAL); set_vaxc_errno(SS$_IVLOGNAM); + return SS$_IVLOGNAM; + } for (cp1 = lnm, cp2 = uplnm; *cp1; cp1++, cp2++) { *cp2 = _toupper(*cp1); @@ -583,17 +939,18 @@ vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) 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 */ + for (i = 0; environ[i]; i++) { /* If it's an environ elt, reset */ if ((cp1 = strchr(environ[i],'=')) && + lnmdsc.dsc$w_length == (cp1 - environ[i]) && !strncmp(environ[i],lnm,cp1 - environ[i])) { #ifdef HAS_SETENV - return setenv(lnm,eqv,1) ? vaxc$errno : 0; + return setenv(lnm,"",1) ? vaxc$errno : 0; } } ivenv = 1; retsts = SS$_NOLOGNAM; #else if (ckWARN(WARN_INTERNAL)) - Perl_warner(aTHX_ WARN_INTERNAL,"This Perl can't reset CRTL environ elements (%s)",lnm); + Perl_warner(aTHX_ packWARN(WARN_INTERNAL),"This Perl can't reset CRTL environ elements (%s)",lnm); ivenv = 1; retsts = SS$_NOSUCHPGM; break; } @@ -628,12 +985,12 @@ vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) return setenv(lnm,eqv,1) ? vaxc$errno : 0; #else if (ckWARN(WARN_INTERNAL)) - Perl_warner(aTHX_ WARN_INTERNAL,"This Perl can't set CRTL environ elements (%s=%s)",lnm,eqv); + Perl_warner(aTHX_ packWARN(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$a_pointer = (char *) eqv; /* cast ok to readonly parameter */ eqvdsc.dsc$w_length = strlen(eqv); if ((tmpdsc.dsc$a_pointer = tabvec[0]->dsc$a_pointer) && !str$case_blind_compare(&tmpdsc,&clisym)) { @@ -648,12 +1005,42 @@ vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) else { if (!*eqv) eqvdsc.dsc$w_length = 1; if (eqvdsc.dsc$w_length > LNM$C_NAMLENGTH) { - eqvdsc.dsc$w_length = LNM$C_NAMLENGTH; - if (ckWARN(WARN_MISC)) { - Perl_warner(aTHX_ WARN_MISC,"Value of logical \"%s\" too long. Truncating to %i bytes",lnm, LNM$C_NAMLENGTH); + + nseg = (eqvdsc.dsc$w_length + LNM$C_NAMLENGTH - 1) / LNM$C_NAMLENGTH; + if (nseg > PERL_LNM_MAX_ALLOWED_INDEX + 1) { + Perl_warner(aTHX_ packWARN(WARN_MISC),"Value of logical \"%s\" too long. Truncating to %i bytes", + lnm, LNM$C_NAMLENGTH * (PERL_LNM_MAX_ALLOWED_INDEX+1)); + eqvdsc.dsc$w_length = LNM$C_NAMLENGTH * (PERL_LNM_MAX_ALLOWED_INDEX+1); + nseg = PERL_LNM_MAX_ALLOWED_INDEX + 1; } + + Newx(ilist,nseg+1,struct itmlst_3); + ile = ilist; + if (!ile) { + set_errno(ENOMEM); set_vaxc_errno(SS$_INSFMEM); + return SS$_INSFMEM; + } + memset(ilist, 0, (sizeof(struct itmlst_3) * (nseg+1))); + + for (j = 0, c = eqvdsc.dsc$a_pointer; j < nseg; j++, ile++, c += LNM$C_NAMLENGTH) { + ile->itmcode = LNM$_STRING; + ile->bufadr = c; + if ((j+1) == nseg) { + ile->buflen = strlen(c); + /* in case we are truncating one that's too long */ + if (ile->buflen > LNM$C_NAMLENGTH) ile->buflen = LNM$C_NAMLENGTH; + } + else { + ile->buflen = LNM$C_NAMLENGTH; + } + } + + retsts = lib$set_logical(&lnmdsc,0,tabvec[0],0,ilist); + Safefree (ilist); + } + else { + retsts = lib$set_logical(&lnmdsc,&eqvdsc,tabvec[0],0,0); } - retsts = lib$set_logical(&lnmdsc,&eqvdsc,tabvec[0],0,0); } } } @@ -690,24 +1077,61 @@ vmssetenv(char *lnm, char *eqv, struct dsc$descriptor_s **tabvec) } /* end of vmssetenv() */ /*}}}*/ -/*{{{ void my_setenv(char *lnm, char *eqv)*/ +/*{{{ void my_setenv(const char *lnm, const char *eqv)*/ /* This has to be a function since there's a prototype for it in proto.h */ void -Perl_my_setenv(pTHX_ char *lnm,char *eqv) +Perl_my_setenv(pTHX_ const char *lnm, const 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; + if (lnm && *lnm) { + int len = strlen(lnm); + if (len == 7) { + char uplnm[8]; + int i; + for (i = 0; lnm[i]; i++) uplnm[i] = _toupper(lnm[i]); + if (!strcmp(uplnm,"DEFAULT")) { + if (eqv && *eqv) my_chdir(eqv); + return; + } + } +#ifndef RTL_USES_UTC + if (len == 6 || len == 2) { + char uplnm[7]; + int i; + for (i = 0; lnm[i]; i++) uplnm[i] = _toupper(lnm[i]); + uplnm[len] = '\0'; + if (!strcmp(uplnm,"UCX$TZ")) tz_updated = 1; + if (!strcmp(uplnm,"TZ")) tz_updated = 1; } +#endif } (void) vmssetenv(lnm,eqv,NULL); } /*}}}*/ +/*{{{static void vmssetuserlnm(char *name, char *eqv); */ +/* vmssetuserlnm + * sets a user-mode logical in the process logical name table + * used for redirection of sys$error + */ +void +Perl_vmssetuserlnm(pTHX_ const char *name, const char *eqv) +{ + $DESCRIPTOR(d_tab, "LNM$PROCESS"); + struct dsc$descriptor_d d_name = {0,DSC$K_DTYPE_T,DSC$K_CLASS_D,0}; + unsigned long int iss, attr = LNM$M_CONFINE; + unsigned char acmode = PSL$C_USER; + struct itmlst_3 lnmlst[2] = {{0, LNM$_STRING, 0, 0}, + {0, 0, 0, 0}}; + d_name.dsc$a_pointer = (char *)name; /* Cast OK for read only parameter */ + d_name.dsc$w_length = strlen(name); + + lnmlst[0].buflen = strlen(eqv); + lnmlst[0].bufadr = (char *)eqv; /* Cast OK for read only parameter */ + + iss = sys$crelnm(&attr,&d_tab,&d_name,&acmode,lnmlst); + if (!(iss&1)) lib$signal(iss); +} +/*}}}*/ /*{{{ char *my_crypt(const char *textpasswd, const char *usrname)*/ @@ -719,9 +1143,11 @@ Perl_my_setenv(pTHX_ char *lnm,char *eqv) * the case of its string arguments; in order to match the behavior * of LOGINOUT et al., alphabetic characters in both arguments must * be upcased by the caller. + * + * - fix me to call ACM services when available */ char * -my_crypt(const char *textpasswd, const char *usrname) +Perl_my_crypt(pTHX_ const char *textpasswd, const char *usrname) { # ifndef UAI$C_PREFERRED_ALGORITHM # define UAI$C_PREFERRED_ALGORITHM 127 @@ -771,27 +1197,28 @@ my_crypt(const char *textpasswd, const char *usrname) /*}}}*/ -static char *mp_do_rmsexpand(pTHX_ char *, char *, int, char *, unsigned); -static char *mp_do_fileify_dirspec(pTHX_ char *, char *, int); -static char *mp_do_tovmsspec(pTHX_ char *, char *, int); +static char *mp_do_rmsexpand(pTHX_ const char *, char *, int, const char *, unsigned); +static char *mp_do_fileify_dirspec(pTHX_ const char *, char *, int); +static char *mp_do_tovmsspec(pTHX_ const char *, char *, int); -/*{{{int do_rmdir(char *name)*/ -int -Perl_do_rmdir(pTHX_ char *name) +/* fixup barenames that are directories for internal use. + * There have been problems with the consistent handling of UNIX + * style directory names when routines are presented with a name that + * has no directory delimitors at all. So this routine will eventually + * fix the issue. + */ +static char * fixup_bare_dirnames(const char * name) { - char dirfile[NAM$C_MAXRSS+1]; - int retval; - 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; - else retval = kill_file(dirfile); - return retval; - -} /* end of do_rmdir */ -/*}}}*/ + if (decc_disable_to_vms_logname_translation) { +/* fix me */ + } + return NULL; +} -/* kill_file +/* mp_do_kill_file + * A little hack to get around a bug in some implemenation of remove() + * that do not know how to delete a directory + * * Delete any file to which user has control access, regardless of whether * delete access is explicitly allowed. * Limitations: User must have write access to parent directory. @@ -799,14 +1226,14 @@ Perl_do_rmdir(pTHX_ char *name) * may leave file with an altered ACL. * HANDLE WITH CARE! */ -/*{{{int kill_file(char *name)*/ -int -kill_file(char *name) +/*{{{int mp_do_kill_file(const char *name, int dirflag)*/ +static int +mp_do_kill_file(pTHX_ const char *name, int dirflag) { - char vmsname[NAM$C_MAXRSS+1], rspec[NAM$C_MAXRSS+1]; + char *vmsname, *rspec; + char *remove_name; unsigned long int jpicode = JPI$_UIC, type = ACL$C_FILE; unsigned long int cxt = 0, aclsts, fndsts, rmsts = -1; - dTHX; struct dsc$descriptor_s fildsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; struct myacedef { unsigned char myace$b_length; @@ -824,15 +1251,63 @@ kill_file(char *name) dellst[2] = {{sizeof newace, ACL$C_DELACLENT, &newace, 0},{0,0,0,0}}, 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}}; - + /* 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? */ + Newx(vmsname, NAM$C_MAXRSS+1, char); + if (do_tovmsspec(name,vmsname,0) == NULL) { + Safefree(vmsname); + return -1; + } + + if (decc_posix_compliant_pathnames) { + /* In POSIX mode, we prefer to remove the UNIX name */ + rspec = vmsname; + remove_name = (char *)name; + } + else { + Newx(rspec, NAM$C_MAXRSS+1, char); + if (do_rmsexpand(vmsname, rspec, 1, NULL, PERL_RMSEXPAND_M_VMS) == NULL) { + Safefree(rspec); + Safefree(vmsname); + return -1; + } + Safefree(vmsname); + remove_name = rspec; + } + +#if defined(__CRTL_VER) && __CRTL_VER >= 70000000 + if (dirflag != 0) { + if (decc_dir_barename && decc_posix_compliant_pathnames) { + Newx(remove_name, NAM$C_MAXRSS+1, char); + do_pathify_dirspec(name, remove_name, 0); + if (!rmdir(remove_name)) { + + Safefree(remove_name); + Safefree(rspec); + return 0; /* Can we just get rid of it? */ + } + } + else { + if (!rmdir(remove_name)) { + Safefree(rspec); + return 0; /* Can we just get rid of it? */ + } + } + } + else +#endif + if (!remove(remove_name)) { + Safefree(rspec); + return 0; /* Can we just get rid of it? */ + } + /* If not, can changing protections help? */ - if (vaxc$errno != RMS$_PRV) return -1; + if (vaxc$errno != RMS$_PRV) { + Safefree(rspec); + return -1; + } /* No, so we get our own UIC to use as a rights identifier, * and the insert an ACE at the head of the ACL which allows us @@ -859,6 +1334,7 @@ kill_file(char *name) _ckvmssts(aclsts); } set_vaxc_errno(aclsts); + Safefree(rspec); return -1; } /* Grab any existing ACEs with this identifier in case we fail */ @@ -868,7 +1344,22 @@ kill_file(char *name) /* Add the new ACE . . . */ if (!((aclsts = sys$change_acl(0,&type,&fildsc,addlst,0,0,0)) & 1)) goto yourroom; - if ((rmsts = remove(name))) { + +#if defined(__CRTL_VER) && __CRTL_VER >= 70000000 + if (dirflag != 0) + if (decc_dir_barename && decc_posix_compliant_pathnames) { + Newx(remove_name, NAM$C_MAXRSS+1, char); + do_pathify_dirspec(name, remove_name, 0); + rmsts = rmdir(remove_name); + Safefree(remove_name); + } + else { + rmsts = rmdir(remove_name); + } + else +#endif + rmsts = remove(remove_name); + if (rmsts) { /* We blew it - dir with files in it, no write priv for * parent directory, etc. Put things back the way they were. */ if (!((aclsts = sys$change_acl(0,&type,&fildsc,dellst,0,0,0)) & 1)) @@ -892,55 +1383,193 @@ kill_file(char *name) if (!(aclsts & 1)) { set_errno(EVMSERR); set_vaxc_errno(aclsts); + Safefree(rspec); return -1; } + Safefree(rspec); return rmsts; } /* end of kill_file() */ /*}}}*/ -/*{{{int my_mkdir(char *,Mode_t)*/ +/*{{{int do_rmdir(char *name)*/ int -my_mkdir(char *dir, Mode_t mode) +Perl_do_rmdir(pTHX_ const char *name) { - STRLEN dirlen = strlen(dir); - dTHX; + char dirfile[NAM$C_MAXRSS+1]; + int retval; + Stat_t st; - /* zero length string sometimes gives ACCVIO */ - if (dirlen == 0) return -1; + if (do_fileify_dirspec(name,dirfile,0) == NULL) return -1; + if (flex_stat(dirfile,&st) || !S_ISDIR(st.st_mode)) retval = -1; + else retval = mp_do_kill_file(aTHX_ dirfile, 1); + return retval; - /* CRTL mkdir() doesn't tolerate trailing /, since that implies - * null file name/type. However, it's commonplace under Unix, - * so we'll allow it for a gain in portability. - */ - if (dir[dirlen-1] == '/') { - char *newdir = savepvn(dir,dirlen-1); - int ret = mkdir(newdir,mode); - Safefree(newdir); - return ret; - } - else return mkdir(dir,mode); -} /* end of my_mkdir */ +} /* end of do_rmdir */ /*}}}*/ -/*{{{int my_chdir(char *)*/ -int -my_chdir(char *dir) -{ - STRLEN dirlen = strlen(dir); - dTHX; +/* kill_file + * Delete any file to which user has control access, regardless of whether + * delete access is explicitly allowed. + * Limitations: User must have write access to parent directory. + * Does not block signals or ASTs; if interrupted in midstream + * may leave file with an altered ACL. + * HANDLE WITH CARE! + */ +/*{{{int kill_file(char *name)*/ +int +Perl_kill_file(pTHX_ const char *name) +{ + 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}; + struct myacedef { + unsigned char myace$b_length; + unsigned char myace$b_type; + unsigned short int myace$w_flags; + unsigned long int myace$l_access; + unsigned long int myace$l_ident; + } newace = { sizeof(struct myacedef), ACE$C_KEYID, 0, + ACE$M_READ | ACE$M_WRITE | ACE$M_DELETE | ACE$M_CONTROL, 0}, + oldace = { sizeof(struct myacedef), ACE$C_KEYID, 0, 0, 0}; + struct itmlst_3 + findlst[3] = {{sizeof oldace, ACL$C_FNDACLENT, &oldace, 0}, + {sizeof oldace, ACL$C_READACE, &oldace, 0},{0,0,0,0}}, + addlst[2] = {{sizeof newace, ACL$C_ADDACLENT, &newace, 0},{0,0,0,0}}, + dellst[2] = {{sizeof newace, ACL$C_DELACLENT, &newace, 0},{0,0,0,0}}, + 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}}; + + /* 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; + + /* No, so we get our own UIC to use as a rights identifier, + * and the insert an ACE at the head of the ACL which allows us + * to delete the file. + */ + _ckvmssts(lib$getjpi(&jpicode,0,0,&(oldace.myace$l_ident),0,0)); + 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)) { + switch (aclsts) { + case RMS$_FNF: case RMS$_DNF: case SS$_NOSUCHOBJECT: + set_errno(ENOENT); break; + case RMS$_DIR: + set_errno(ENOTDIR); break; + case RMS$_DEV: + set_errno(ENODEV); break; + case RMS$_SYN: case SS$_INVFILFOROP: + set_errno(EINVAL); break; + case RMS$_PRV: + set_errno(EACCES); break; + default: + _ckvmssts(aclsts); + } + set_vaxc_errno(aclsts); + return -1; + } + /* Grab any existing ACEs with this identifier in case we fail */ + aclsts = fndsts = sys$change_acl(0,&type,&fildsc,findlst,0,0,&cxt); + if ( fndsts & 1 || fndsts == SS$_ACLEMPTY || fndsts == SS$_NOENTRY + || fndsts == SS$_NOMOREACE ) { + /* Add the new ACE . . . */ + if (!((aclsts = sys$change_acl(0,&type,&fildsc,addlst,0,0,0)) & 1)) + goto yourroom; + if ((rmsts = remove(name))) { + /* We blew it - dir with files in it, no write priv for + * parent directory, etc. Put things back the way they were. */ + if (!((aclsts = sys$change_acl(0,&type,&fildsc,dellst,0,0,0)) & 1)) + goto yourroom; + if (fndsts & 1) { + addlst[0].bufadr = &oldace; + if (!((aclsts = sys$change_acl(0,&type,&fildsc,addlst,0,0,&cxt)) & 1)) + goto yourroom; + } + } + } + + yourroom: + fndsts = sys$change_acl(0,&type,&fildsc,ulklst,0,0,0); + /* We just deleted it, so of course it's not there. Some versions of + * VMS seem to return success on the unlock operation anyhow (after all + * the unlock is successful), but others don't. + */ + if (fndsts == RMS$_FNF || fndsts == SS$_NOSUCHOBJECT) fndsts = SS$_NORMAL; + if (aclsts & 1) aclsts = fndsts; + if (!(aclsts & 1)) { + set_errno(EVMSERR); + set_vaxc_errno(aclsts); + return -1; + } + + return rmsts; + +} /* end of kill_file() */ +/*}}}*/ + + +/*{{{int my_mkdir(char *,Mode_t)*/ +int +Perl_my_mkdir(pTHX_ const char *dir, Mode_t mode) +{ + STRLEN dirlen = strlen(dir); + + /* zero length string sometimes gives ACCVIO */ + if (dirlen == 0) return -1; + + /* CRTL mkdir() doesn't tolerate trailing /, since that implies + * null file name/type. However, it's commonplace under Unix, + * so we'll allow it for a gain in portability. + */ + if (dir[dirlen-1] == '/') { + char *newdir = savepvn(dir,dirlen-1); + int ret = mkdir(newdir,mode); + Safefree(newdir); + return ret; + } + else return mkdir(dir,mode); +} /* end of my_mkdir */ +/*}}}*/ + +/*{{{int my_chdir(char *)*/ +int +Perl_my_chdir(pTHX_ const char *dir) +{ + STRLEN dirlen = strlen(dir); /* zero length string sometimes gives ACCVIO */ if (dirlen == 0) return -1; + const char *dir1; + + /* Perl is passing the output of the DCL SHOW DEFAULT with leading spaces. + * This does not work if DECC$EFS_CHARSET is active. Hack it here + * so that existing scripts do not need to be changed. + */ + dir1 = dir; + while ((dirlen > 0) && (*dir1 == ' ')) { + dir1++; + dirlen--; + } /* some versions of CRTL chdir() 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. + * + * - Preview- '/' will be valid soon on VMS */ - if (dir[dirlen-1] == '/') { + if ((dirlen > 1) && (dir1[dirlen-1] == '/')) { char *newdir = savepvn(dir,dirlen-1); int ret = chdir(newdir); Safefree(newdir); @@ -957,12 +1586,14 @@ my_tmpfile(void) { FILE *fp; char *cp; - dTHX; if ((fp = tmpfile())) return fp; - New(1323,cp,L_tmpnam+24,char); - strcpy(cp,"Sys$Scratch:"); + Newx(cp,L_tmpnam+24,char); + if (decc_filename_unix_only == 0) + strcpy(cp,"Sys$Scratch:"); + else + strcpy(cp,"/tmp/"); tmpnam(cp+strlen(cp)); strcat(cp,".Perltmp"); fp = fopen(cp,"w+","fop=dlt"); @@ -971,19 +1602,523 @@ my_tmpfile(void) } /*}}}*/ + +#ifndef HOMEGROWN_POSIX_SIGNALS +/* + * The C RTL's sigaction fails to check for invalid signal numbers so we + * help it out a bit. The docs are correct, but the actual routine doesn't + * do what the docs say it will. + */ +/*{{{int Perl_my_sigaction (pTHX_ int, const struct sigaction*, struct sigaction*);*/ +int +Perl_my_sigaction (pTHX_ int sig, const struct sigaction* act, + struct sigaction* oact) +{ + if (sig == SIGKILL || sig == SIGSTOP || sig == SIGCONT) { + SETERRNO(EINVAL, SS$_INVARG); + return -1; + } + return sigaction(sig, act, oact); +} +/*}}}*/ +#endif + +#ifdef KILL_BY_SIGPRC +#include + +/* We implement our own kill() using the undocumented system service + sys$sigprc for one of two reasons: + + 1.) If the kill() in an older CRTL uses sys$forcex, causing the + target process to do a sys$exit, which usually can't be handled + gracefully...certainly not by Perl and the %SIG{} mechanism. + + 2.) If the kill() in the CRTL can't be called from a signal + handler without disappearing into the ether, i.e., the signal + it purportedly sends is never trapped. Still true as of VMS 7.3. + + sys$sigprc has the same parameters as sys$forcex, but throws an exception + in the target process rather than calling sys$exit. + + Note that distinguishing SIGSEGV from SIGBUS requires an extra arg + on the ACCVIO condition, which sys$sigprc (and sys$forcex) don't + provide. On VMS 7.0+ this is taken care of by doing sys$sigprc + with condition codes C$_SIG0+nsig*8, catching the exception on the + target process and resignaling with appropriate arguments. + + But we don't have that VMS 7.0+ exception handler, so if you + Perl_my_kill(.., SIGSEGV) it will show up as a SIGBUS. Oh well. + + Also note that SIGTERM is listed in the docs as being "unimplemented", + yet always seems to be signaled with a VMS condition code of 4 (and + correctly handled for that code). So we hardwire it in. + + Unlike the VMS 7.0+ CRTL kill() function, we actually check the signal + number to see if it's valid. So Perl_my_kill(pid,0) returns -1 rather + than signalling with an unrecognized (and unhandled by CRTL) code. +*/ + +#define _MY_SIG_MAX 17 + +unsigned int +Perl_sig_to_vmscondition(int sig) +{ + static unsigned int sig_code[_MY_SIG_MAX+1] = + { + 0, /* 0 ZERO */ + SS$_HANGUP, /* 1 SIGHUP */ + SS$_CONTROLC, /* 2 SIGINT */ + SS$_CONTROLY, /* 3 SIGQUIT */ + SS$_RADRMOD, /* 4 SIGILL */ + SS$_BREAK, /* 5 SIGTRAP */ + SS$_OPCCUS, /* 6 SIGABRT */ + SS$_COMPAT, /* 7 SIGEMT */ +#ifdef __VAX + SS$_FLTOVF, /* 8 SIGFPE VAX */ +#else + SS$_HPARITH, /* 8 SIGFPE AXP */ +#endif + SS$_ABORT, /* 9 SIGKILL */ + SS$_ACCVIO, /* 10 SIGBUS */ + SS$_ACCVIO, /* 11 SIGSEGV */ + SS$_BADPARAM, /* 12 SIGSYS */ + SS$_NOMBX, /* 13 SIGPIPE */ + SS$_ASTFLT, /* 14 SIGALRM */ + 4, /* 15 SIGTERM */ + 0, /* 16 SIGUSR1 */ + 0 /* 17 SIGUSR2 */ + }; + +#if __VMS_VER >= 60200000 + static int initted = 0; + if (!initted) { + initted = 1; + sig_code[16] = C$_SIGUSR1; + sig_code[17] = C$_SIGUSR2; + } +#endif + + if (sig < _SIG_MIN) return 0; + if (sig > _MY_SIG_MAX) return 0; + return sig_code[sig]; +} + +int +Perl_my_kill(int pid, int sig) +{ + dTHX; + int iss; + unsigned int code; + int sys$sigprc(unsigned int *pidadr, + struct dsc$descriptor_s *prcname, + unsigned int code); + + /* sig 0 means validate the PID */ + /*------------------------------*/ + if (sig == 0) { + const unsigned long int jpicode = JPI$_PID; + pid_t ret_pid; + int status; + status = lib$getjpi(&jpicode, &pid, NULL, &ret_pid, NULL, NULL); + if ($VMS_STATUS_SUCCESS(status)) + return 0; + switch (status) { + case SS$_NOSUCHNODE: + case SS$_UNREACHABLE: + case SS$_NONEXPR: + errno = ESRCH; + break; + case SS$_NOPRIV: + errno = EPERM; + break; + default: + errno = EVMSERR; + } + vaxc$errno=status; + return -1; + } + + code = Perl_sig_to_vmscondition(sig); + + if (!code) { + SETERRNO(EINVAL, SS$_BADPARAM); + return -1; + } + + /* Fixme: Per official UNIX specification: If pid = 0, or negative then + * signals are to be sent to multiple processes. + * pid = 0 - all processes in group except ones that the system exempts + * pid = -1 - all processes except ones that the system exempts + * pid = -n - all processes in group (abs(n)) except ... + * For now, just report as not supported. + */ + + if (pid <= 0) { + SETERRNO(ENOTSUP, SS$_UNSUPPORTED); + return -1; + } + + iss = sys$sigprc((unsigned int *)&pid,0,code); + if (iss&1) return 0; + + switch (iss) { + case SS$_NOPRIV: + set_errno(EPERM); break; + case SS$_NONEXPR: + case SS$_NOSUCHNODE: + case SS$_UNREACHABLE: + set_errno(ESRCH); break; + case SS$_INSFMEM: + set_errno(ENOMEM); break; + default: + _ckvmssts(iss); + set_errno(EVMSERR); + } + set_vaxc_errno(iss); + + return -1; +} +#endif + +/* Routine to convert a VMS status code to a UNIX status code. +** More tricky than it appears because of conflicting conventions with +** existing code. +** +** VMS status codes are a bit mask, with the least significant bit set for +** success. +** +** Special UNIX status of EVMSERR indicates that no translation is currently +** available, and programs should check the VMS status code. +** +** Programs compiled with _POSIX_EXIT have a special encoding that requires +** decoding. +*/ + +#ifndef C_FACILITY_NO +#define C_FACILITY_NO 0x350000 +#endif +#ifndef DCL_IVVERB +#define DCL_IVVERB 0x38090 +#endif + +int Perl_vms_status_to_unix(int vms_status, int child_flag) +{ +int facility; +int fac_sp; +int msg_no; +int msg_status; +int unix_status; + + /* Assume the best or the worst */ + if (vms_status & STS$M_SUCCESS) + unix_status = 0; + else + unix_status = EVMSERR; + + msg_status = vms_status & ~STS$M_CONTROL; + + facility = vms_status & STS$M_FAC_NO; + fac_sp = vms_status & STS$M_FAC_SP; + msg_no = vms_status & (STS$M_MSG_NO | STS$M_SEVERITY); + + if (((facility == 0) || (fac_sp == 0)) && (child_flag == 0)) { + switch(msg_no) { + case SS$_NORMAL: + unix_status = 0; + break; + case SS$_ACCVIO: + unix_status = EFAULT; + break; + case SS$_DEVOFFLINE: + unix_status = EBUSY; + break; + case SS$_CLEARED: + unix_status = ENOTCONN; + break; + case SS$_IVCHAN: + case SS$_IVLOGNAM: + case SS$_BADPARAM: + case SS$_IVLOGTAB: + case SS$_NOLOGNAM: + case SS$_NOLOGTAB: + case SS$_INVFILFOROP: + case SS$_INVARG: + case SS$_NOSUCHID: + case SS$_IVIDENT: + unix_status = EINVAL; + break; + case SS$_UNSUPPORTED: + unix_status = ENOTSUP; + break; + case SS$_FILACCERR: + case SS$_NOGRPPRV: + case SS$_NOSYSPRV: + unix_status = EACCES; + break; + case SS$_DEVICEFULL: + unix_status = ENOSPC; + break; + case SS$_NOSUCHDEV: + unix_status = ENODEV; + break; + case SS$_NOSUCHFILE: + case SS$_NOSUCHOBJECT: + unix_status = ENOENT; + break; + case SS$_ABORT: /* Fatal case */ + case ((SS$_ABORT & STS$M_COND_ID) | STS$K_ERROR): /* Error case */ + case ((SS$_ABORT & STS$M_COND_ID) | STS$K_WARNING): /* Warning case */ + unix_status = EINTR; + break; + case SS$_BUFFEROVF: + unix_status = E2BIG; + break; + case SS$_INSFMEM: + unix_status = ENOMEM; + break; + case SS$_NOPRIV: + unix_status = EPERM; + break; + case SS$_NOSUCHNODE: + case SS$_UNREACHABLE: + unix_status = ESRCH; + break; + case SS$_NONEXPR: + unix_status = ECHILD; + break; + default: + if ((facility == 0) && (msg_no < 8)) { + /* These are not real VMS status codes so assume that they are + ** already UNIX status codes + */ + unix_status = msg_no; + break; + } + } + } + else { + /* Translate a POSIX exit code to a UNIX exit code */ + if ((facility == C_FACILITY_NO) && ((msg_no & 0xA000) == 0xA000)) { + unix_status = (msg_no & 0x07F8) >> 3; + } + else { + + /* Documented traditional behavior for handling VMS child exits */ + /*--------------------------------------------------------------*/ + if (child_flag != 0) { + + /* Success / Informational return 0 */ + /*----------------------------------*/ + if (msg_no & STS$K_SUCCESS) + return 0; + + /* Warning returns 1 */ + /*-------------------*/ + if ((msg_no & (STS$K_ERROR | STS$K_SEVERE)) == 0) + return 1; + + /* Everything else pass through the severity bits */ + /*------------------------------------------------*/ + return (msg_no & STS$M_SEVERITY); + } + + /* Normal VMS status to ERRNO mapping attempt */ + /*--------------------------------------------*/ + switch(msg_status) { + /* case RMS$_EOF: */ /* End of File */ + case RMS$_FNF: /* File Not Found */ + case RMS$_DNF: /* Dir Not Found */ + unix_status = ENOENT; + break; + case RMS$_RNF: /* Record Not Found */ + unix_status = ESRCH; + break; + case RMS$_DIR: + unix_status = ENOTDIR; + break; + case RMS$_DEV: + unix_status = ENODEV; + break; + case RMS$_IFI: + case RMS$_FAC: + case RMS$_ISI: + unix_status = EBADF; + break; + case RMS$_FEX: + unix_status = EEXIST; + break; + case RMS$_SYN: + case RMS$_FNM: + case LIB$_INVSTRDES: + case LIB$_INVARG: + case LIB$_NOSUCHSYM: + case LIB$_INVSYMNAM: + case DCL_IVVERB: + unix_status = EINVAL; + break; + case CLI$_BUFOVF: + case RMS$_RTB: + case CLI$_TKNOVF: + case CLI$_RSLOVF: + unix_status = E2BIG; + break; + case RMS$_PRV: /* No privilege */ + case RMS$_ACC: /* ACP file access failed */ + case RMS$_WLK: /* Device write locked */ + unix_status = EACCES; + break; + /* case RMS$_NMF: */ /* No more files */ + } + } + } + + return unix_status; +} + +/* Try to guess at what VMS error status should go with a UNIX errno + * value. This is hard to do as there could be many possible VMS + * error statuses that caused the errno value to be set. + */ + +int Perl_unix_status_to_vms(int unix_status) +{ +int test_unix_status; + + /* Trivial cases first */ + /*---------------------*/ + if (unix_status == EVMSERR) + return vaxc$errno; + + /* Is vaxc$errno sane? */ + /*---------------------*/ + test_unix_status = Perl_vms_status_to_unix(vaxc$errno, 0); + if (test_unix_status == unix_status) + return vaxc$errno; + + /* If way out of range, must be VMS code already */ + /*-----------------------------------------------*/ + if (unix_status > EVMSERR) + return unix_status; + + /* If out of range, punt */ + /*-----------------------*/ + if (unix_status > __ERRNO_MAX) + return SS$_ABORT; + + + /* Ok, now we have to do it the hard way. */ + /*----------------------------------------*/ + switch(unix_status) { + case 0: return SS$_NORMAL; + case EPERM: return SS$_NOPRIV; + case ENOENT: return SS$_NOSUCHOBJECT; + case ESRCH: return SS$_UNREACHABLE; + case EINTR: return SS$_ABORT; + /* case EIO: */ + /* case ENXIO: */ + case E2BIG: return SS$_BUFFEROVF; + /* case ENOEXEC */ + case EBADF: return RMS$_IFI; + case ECHILD: return SS$_NONEXPR; + /* case EAGAIN */ + case ENOMEM: return SS$_INSFMEM; + case EACCES: return SS$_FILACCERR; + case EFAULT: return SS$_ACCVIO; + /* case ENOTBLK */ + case EBUSY: return SS$_DEVOFFLINE; + case EEXIST: return RMS$_FEX; + /* case EXDEV */ + case ENODEV: return SS$_NOSUCHDEV; + case ENOTDIR: return RMS$_DIR; + /* case EISDIR */ + case EINVAL: return SS$_INVARG; + /* case ENFILE */ + /* case EMFILE */ + /* case ENOTTY */ + /* case ETXTBSY */ + /* case EFBIG */ + case ENOSPC: return SS$_DEVICEFULL; + case ESPIPE: return LIB$_INVARG; + /* case EROFS: */ + /* case EMLINK: */ + /* case EPIPE: */ + /* case EDOM */ + case ERANGE: return LIB$_INVARG; + /* case EWOULDBLOCK */ + /* case EINPROGRESS */ + /* case EALREADY */ + /* case ENOTSOCK */ + /* case EDESTADDRREQ */ + /* case EMSGSIZE */ + /* case EPROTOTYPE */ + /* case ENOPROTOOPT */ + /* case EPROTONOSUPPORT */ + /* case ESOCKTNOSUPPORT */ + /* case EOPNOTSUPP */ + /* case EPFNOSUPPORT */ + /* case EAFNOSUPPORT */ + /* case EADDRINUSE */ + /* case EADDRNOTAVAIL */ + /* case ENETDOWN */ + /* case ENETUNREACH */ + /* case ENETRESET */ + /* case ECONNABORTED */ + /* case ECONNRESET */ + /* case ENOBUFS */ + /* case EISCONN */ + case ENOTCONN: return SS$_CLEARED; + /* case ESHUTDOWN */ + /* case ETOOMANYREFS */ + /* case ETIMEDOUT */ + /* case ECONNREFUSED */ + /* case ELOOP */ + /* case ENAMETOOLONG */ + /* case EHOSTDOWN */ + /* case EHOSTUNREACH */ + /* case ENOTEMPTY */ + /* case EPROCLIM */ + /* case EUSERS */ + /* case EDQUOT */ + /* case ENOMSG */ + /* case EIDRM */ + /* case EALIGN */ + /* case ESTALE */ + /* case EREMOTE */ + /* case ENOLCK */ + /* case ENOSYS */ + /* case EFTYPE */ + /* case ECANCELED */ + /* case EFAIL */ + /* case EINPROG */ + case ENOTSUP: + return SS$_UNSUPPORTED; + /* case EDEADLK */ + /* case ENWAIT */ + /* case EILSEQ */ + /* case EBADCAT */ + /* case EBADMSG */ + /* case EABANDONED */ + default: + return SS$_ABORT; /* punt */ + } + + return SS$_ABORT; /* Should not get here */ +} + + /* default piping mailbox size */ -#define PERL_BUFSIZ 256 +#define PERL_BUFSIZ 512 static void -create_mbx(unsigned short int *chan, struct dsc$descriptor_s *namdsc) +create_mbx(pTHX_ unsigned short int *chan, struct dsc$descriptor_s *namdsc) { unsigned long int mbxbufsiz; static unsigned long int syssize = 0; unsigned long int dviitm = DVI$_DEVNAM; - dTHX; char csize[LNM$C_NAMLENGTH+1]; - + int sts; + if (!syssize) { unsigned long syiitm = SYI$_MAXBUF; /* @@ -1005,9 +2140,9 @@ create_mbx(unsigned short int *chan, struct dsc$descriptor_s *namdsc) if (mbxbufsiz < 128) mbxbufsiz = 128; if (mbxbufsiz > syssize) mbxbufsiz = syssize; - _ckvmssts(sys$crembx(0,chan,mbxbufsiz,mbxbufsiz,0,0,0)); + _ckvmssts(sts = sys$crembx(0,chan,mbxbufsiz,mbxbufsiz,0,0,0)); - _ckvmssts(lib$getdvi(&dviitm, chan, NULL, NULL, namdsc, &namdsc->dsc$w_length)); + _ckvmssts(sts = lib$getdvi(&dviitm, chan, NULL, NULL, namdsc, &namdsc->dsc$w_length)); namdsc->dsc$a_pointer[namdsc->dsc$w_length] = '\0'; } /* end of create_mbx() */ @@ -1066,16 +2201,22 @@ struct _pipe { pInfo info; pCBuf curr; pCBuf curr2; +#if defined(PERL_IMPLICIT_CONTEXT) + void *thx; /* Either a thread or an interpreter */ + /* pointer, depending on how we're built */ +#endif }; struct pipe_details { pInfo next; - PerlIO *fp; /* stdio file pointer to pipe mailbox */ + PerlIO *fp; /* file pointer to pipe mailbox */ + int useFILE; /* using stdio, not perlio */ int pid; /* PID of subprocess */ int mode; /* == 'r' if pipe open for reading */ int done; /* subprocess has completed */ + int waiting; /* waiting for completion/closure */ int closing; /* my_pclose is closing this pipe */ unsigned long completion; /* termination status of subprocess */ pPipe in; /* pipe in to sub */ @@ -1095,6 +2236,18 @@ struct exit_control_block unsigned long int exit_status; }; +typedef struct _closed_pipes Xpipe; +typedef struct _closed_pipes* pXpipe; + +struct _closed_pipes { + int pid; /* PID of subprocess */ + unsigned long completion; /* termination status of subprocess */ +}; +#define NKEEPCLOSED 50 +static Xpipe closed_list[NKEEPCLOSED]; +static int closed_index = 0; +static int closed_num = 0; + #define RETRY_DELAY "0 ::0.20" #define MAX_RETRY 50 @@ -1105,17 +2258,33 @@ static unsigned long delaytime[2]; static pInfo open_pipes = NULL; static $DESCRIPTOR(nl_desc, "NL:"); +#define PIPE_COMPLETION_WAIT 30 /* seconds, for EOF/FORCEX wait */ + + static unsigned long int -pipe_exit_routine() +pipe_exit_routine(pTHX) { pInfo info; unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT; - int sts, did_stuff, need_eof; - dTHX; + int sts, did_stuff, need_eof, j; + + /* + flush any pending i/o + */ + info = open_pipes; + while (info) { + if (info->fp) { + if (!info->useFILE) + PerlIO_flush(info->fp); /* first, flush data */ + else + fflush((FILE *)info->fp); + } + info = info->next; + } /* - first we try sending an EOF...ignore if doesn't work, make sure we + next we try sending an EOF...ignore if doesn't work, make sure we don't hang */ did_stuff = 0; @@ -1127,12 +2296,30 @@ pipe_exit_routine() if (info->in && !info->in->shut_on_empty) { _ckvmssts(sys$qio(0,info->in->chan_in,IO$_WRITEOF,0,0,0, 0, 0, 0, 0, 0, 0)); + info->waiting = 1; did_stuff = 1; } _ckvmssts(sys$setast(1)); info = info->next; } - if (did_stuff) sleep(1); /* wait for EOF to have an effect */ + + /* wait for EOF to have effect, up to ~ 30 sec [default] */ + + for (j = 0; did_stuff && j < PIPE_COMPLETION_WAIT; j++) { + int nwait = 0; + + info = open_pipes; + while (info) { + _ckvmssts(sys$setast(0)); + if (info->waiting && info->done) + info->waiting = 0; + nwait += info->waiting; + _ckvmssts(sys$setast(1)); + info = info->next; + } + if (!nwait) break; + sleep(1); + } did_stuff = 0; info = open_pipes; @@ -1146,7 +2333,24 @@ pipe_exit_routine() _ckvmssts(sys$setast(1)); info = info->next; } - if (did_stuff) sleep(1); /* wait for them to respond */ + + /* again, wait for effect */ + + for (j = 0; did_stuff && j < PIPE_COMPLETION_WAIT; j++) { + int nwait = 0; + + info = open_pipes; + while (info) { + _ckvmssts(sys$setast(0)); + if (info->waiting && info->done) + info->waiting = 0; + nwait += info->waiting; + _ckvmssts(sys$setast(1)); + info = info->next; + } + if (!nwait) break; + sleep(1); + } info = open_pipes; while (info) { @@ -1177,9 +2381,18 @@ static void pipe_tochild2_ast(pPipe p); static void popen_completion_ast(pInfo info) { - dTHX; pInfo i = open_pipes; int iss; + int sts; + pXpipe x; + + info->completion &= 0x0FFFFFFF; /* strip off "control" field */ + closed_list[closed_index].pid = info->pid; + closed_list[closed_index].completion = info->completion; + closed_index++; + if (closed_index == NKEEPCLOSED) + closed_index = 0; + closed_num++; while (i) { if (i == info) break; @@ -1187,7 +2400,6 @@ popen_completion_ast(pInfo info) } if (!i) return; /* unlinked, probably freed too */ - info->completion &= 0x0FFFFFFF; /* strip off "control" field */ info->done = TRUE; /* @@ -1209,9 +2421,9 @@ popen_completion_ast(pInfo info) if (info->in && !info->in_done) { /* only for mode=w */ if (info->in->shut_on_empty && info->in->need_wake) { info->in->need_wake = FALSE; - _ckvmssts(sys$dclast(pipe_tochild2_ast,info->in,0)); + _ckvmssts_noperl(sys$dclast(pipe_tochild2_ast,info->in,0)); } else { - _ckvmssts(sys$cancel(info->in->chan_out)); + _ckvmssts_noperl(sys$cancel(info->in->chan_out)); } } @@ -1219,21 +2431,21 @@ popen_completion_ast(pInfo info) info->out->shut_on_empty = TRUE; iss = sys$qio(0,info->out->chan_in,IO$_WRITEOF|IO$M_NORSWAIT, 0, 0, 0, 0, 0, 0, 0, 0, 0); if (iss == SS$_MBFULL) iss = SS$_NORMAL; - _ckvmssts(iss); + _ckvmssts_noperl(iss); } if (info->err && !info->err_done) { /* we were piping stderr */ info->err->shut_on_empty = TRUE; iss = sys$qio(0,info->err->chan_in,IO$_WRITEOF|IO$M_NORSWAIT, 0, 0, 0, 0, 0, 0, 0, 0, 0); if (iss == SS$_MBFULL) iss = SS$_NORMAL; - _ckvmssts(iss); + _ckvmssts_noperl(iss); } - _ckvmssts(sys$setef(pipe_ef)); + _ckvmssts_noperl(sys$setef(pipe_ef)); } -static unsigned long int setup_cmddsc(char *cmd, int check_img); -static void vms_execfree(pTHX); +static unsigned long int setup_cmddsc(pTHX_ const char *cmd, int check_img, int *suggest_quote, struct dsc$descriptor_s **pvmscmd); +static void vms_execfree(struct dsc$descriptor_s *vmscmd); /* we actually differ from vmstrnenv since we use this to @@ -1242,7 +2454,7 @@ static void vms_execfree(pTHX); */ static unsigned short -popen_translate(char *logical, char *result) +popen_translate(pTHX_ char *logical, char *result) { int iss; $DESCRIPTOR(d_table,"LNM$PROCESS_TABLE"); @@ -1281,13 +2493,12 @@ popen_translate(char *logical, char *result) */ ifi = 0; if (result[0] == 0x1b && result[1] == 0x00) { - memcpy(&ifi,result+2,2); + memmove(&ifi,result+2,2); strcpy(result,result+4); } return ifi; /* this is the RMS internal file id */ } -#define MAX_DCL_SYMBOL 255 static void pipe_infromchild_ast(pPipe p); /* @@ -1302,9 +2513,8 @@ static void pipe_infromchild_ast(pPipe p); #define INITIAL_TOCHILDQUEUE 2 static pPipe -pipe_tochild_setup(char *rmbx, char *wmbx) +pipe_tochild_setup(pTHX_ char *rmbx, char *wmbx) { - dTHX; pPipe p; pCBuf b; char mbx1[64], mbx2[64]; @@ -1315,10 +2525,10 @@ pipe_tochild_setup(char *rmbx, char *wmbx) unsigned int dviitm = DVI$_DEVBUFSIZ; int j, n; - New(1368, p, 1, Pipe); + Newx(p, 1, Pipe); - create_mbx(&p->chan_in , &d_mbx1); - create_mbx(&p->chan_out, &d_mbx2); + create_mbx(aTHX_ &p->chan_in , &d_mbx1); + create_mbx(aTHX_ &p->chan_out, &d_mbx2); _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); p->buf = 0; @@ -1333,6 +2543,9 @@ pipe_tochild_setup(char *rmbx, char *wmbx) p->curr = 0; p->curr2 = 0; p->info = 0; +#ifdef PERL_IMPLICIT_CONTEXT + p->thx = aTHX; +#endif n = sizeof(CBuf) + p->bufsize; @@ -1354,10 +2567,13 @@ pipe_tochild_setup(char *rmbx, char *wmbx) static void pipe_tochild1_ast(pPipe p) { - dTHX; pCBuf b = p->curr; int iss = p->iosb.status; int eof = (iss == SS$_ENDOFFILE); + int sts; +#ifdef PERL_IMPLICIT_CONTEXT + pTHX = p->thx; +#endif if (p->retry) { if (eof) { @@ -1370,7 +2586,7 @@ pipe_tochild1_ast(pPipe p) b->eof = eof; b->size = p->iosb.count; - _ckvmssts(lib$insqhi(b, &p->wait)); + _ckvmssts(sts = lib$insqhi(b, &p->wait)); if (p->need_wake) { p->need_wake = FALSE; _ckvmssts(sys$dclast(pipe_tochild2_ast,p,0)); @@ -1414,12 +2630,14 @@ pipe_tochild1_ast(pPipe p) static void pipe_tochild2_ast(pPipe p) { - dTHX; pCBuf b = p->curr2; int iss = p->iosb2.status; int n = sizeof(CBuf) + p->bufsize; int done = (p->info && p->info->done) || iss == SS$_CANCEL || iss == SS$_ABORT; +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX = p->thx; +#endif do { if (p->type) { /* type=1 has old buffer, dispose */ @@ -1467,9 +2685,8 @@ pipe_tochild2_ast(pPipe p) static pPipe -pipe_infromchild_setup(char *rmbx, char *wmbx) +pipe_infromchild_setup(pTHX_ char *rmbx, char *wmbx) { - dTHX; pPipe p; char mbx1[64], mbx2[64]; struct dsc$descriptor_s d_mbx1 = {sizeof mbx1, DSC$K_DTYPE_T, @@ -1478,16 +2695,19 @@ pipe_infromchild_setup(char *rmbx, char *wmbx) DSC$K_CLASS_S, mbx2}; unsigned int dviitm = DVI$_DEVBUFSIZ; - New(1367, p, 1, Pipe); - create_mbx(&p->chan_in , &d_mbx1); - create_mbx(&p->chan_out, &d_mbx2); + Newx(p, 1, Pipe); + create_mbx(aTHX_ &p->chan_in , &d_mbx1); + create_mbx(aTHX_ &p->chan_out, &d_mbx2); _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); - New(1367, p->buf, p->bufsize, char); + Newx(p->buf, p->bufsize, char); p->shut_on_empty = FALSE; p->info = 0; p->type = 0; p->iosb.status = SS$_NORMAL; +#if defined(PERL_IMPLICIT_CONTEXT) + p->thx = aTHX; +#endif pipe_infromchild_ast(p); strcpy(wmbx, mbx1); @@ -1498,11 +2718,13 @@ pipe_infromchild_setup(char *rmbx, char *wmbx) static void pipe_infromchild_ast(pPipe p) { - dTHX; int iss = p->iosb.status; int eof = (iss == SS$_ENDOFFILE); int myeof = (eof && (p->iosb.dvispec == mypid || p->iosb.dvispec == 0)); int kideof = (eof && (p->iosb.dvispec == p->info->pid)); +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX = p->thx; +#endif if (p->info && p->info->closing && p->chan_out) { /* output shutdown */ _ckvmssts(sys$dassgn(p->chan_out)); @@ -1574,9 +2796,8 @@ pipe_infromchild_ast(pPipe p) } static pPipe -pipe_mbxtofd_setup(int fd, char *out) +pipe_mbxtofd_setup(pTHX_ int fd, char *out) { - dTHX; pPipe p; char mbx[64]; unsigned long dviitm = DVI$_DEVBUFSIZ; @@ -1597,11 +2818,11 @@ pipe_mbxtofd_setup(int fd, char *out) } } - New(1366, p, 1, Pipe); + Newx(p, 1, Pipe); p->fd_out = dup(fd); - create_mbx(&p->chan_in, &d_mbx); + create_mbx(aTHX_ &p->chan_in, &d_mbx); _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); - New(1366, p->buf, p->bufsize+1, char); + Newx(p->buf, p->bufsize+1, char); p->shut_on_empty = FALSE; p->retry = 0; p->info = 0; @@ -1617,14 +2838,15 @@ pipe_mbxtofd_setup(int fd, char *out) static void pipe_mbxtofd_ast(pPipe p) { - dTHX; int iss = p->iosb.status; int done = p->info->done; int iss2; int eof = (iss == SS$_ENDOFFILE); int myeof = eof && ((p->iosb.dvispec == mypid)||(p->iosb.dvispec == 0)); int err = !(iss&1) && !eof; - +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX = p->thx; +#endif if (done && myeof) { /* end piping */ close(p->fd_out); @@ -1667,13 +2889,27 @@ struct _pipeloc { }; static pPLOC head_PLOC = 0; +void +free_pipelocs(pTHX_ void *head) +{ + pPLOC p, pnext; + pPLOC *pHead = (pPLOC *)head; + + p = *pHead; + while (p) { + pnext = p->next; + Safefree(p); + p = pnext; + } + *pHead = 0; +} static void -store_pipelocs() +store_pipelocs(pTHX) { int i; pPLOC p; - AV *av = GvAVn(PL_incgv); + AV *av = 0; SV *dirsv; GV *gv; char *dir, *x; @@ -1681,22 +2917,42 @@ store_pipelocs() char temp[NAM$C_MAXRSS+1]; STRLEN n_a; + if (head_PLOC) + free_pipelocs(aTHX_ &head_PLOC); + /* the . directory from @INC comes last */ - New(1370,p,1,PLOC); + Newx(p,1,PLOC); p->next = head_PLOC; head_PLOC = p; strcpy(p->dir,"./"); /* get the directory from $^X */ +#ifdef PERL_IMPLICIT_CONTEXT + if (aTHX && PL_origargv && PL_origargv[0]) { /* maybe nul if embedded Perl */ +#else if (PL_origargv && PL_origargv[0]) { /* maybe nul if embedded Perl */ +#endif strcpy(temp, PL_origargv[0]); x = strrchr(temp,']'); - if (x) x[1] = '\0'; + if (x == NULL) { + x = strrchr(temp,'>'); + if (x == NULL) { + /* It could be a UNIX path */ + x = strrchr(temp,'/'); + } + } + if (x) + x[1] = '\0'; + else { + /* Got a bare name, so use default directory */ + temp[0] = '.'; + temp[1] = '\0'; + } if ((unixdir = tounixpath(temp, Nullch)) != Nullch) { - New(1370,p,1,PLOC); + Newx(p,1,PLOC); p->next = head_PLOC; head_PLOC = p; strncpy(p->dir,unixdir,sizeof(p->dir)-1); @@ -1706,7 +2962,12 @@ store_pipelocs() /* reverse order of @INC entries, skip "." since entered above */ - for (i = 0; i <= AvFILL(av); i++) { +#ifdef PERL_IMPLICIT_CONTEXT + if (aTHX) +#endif + if (PL_incgv) av = GvAVn(PL_incgv); + + for (i = 0; av && i <= AvFILL(av); i++) { dirsv = *av_fetch(av,i,TRUE); if (SvROK(dirsv)) continue; @@ -1715,7 +2976,7 @@ store_pipelocs() if ((unixdir = tounixpath(dir, Nullch)) == Nullch) continue; - New(1370,p,1,PLOC); + Newx(p,1,PLOC); p->next = head_PLOC; head_PLOC = p; strncpy(p->dir,unixdir,sizeof(p->dir)-1); @@ -1726,19 +2987,18 @@ store_pipelocs() #ifdef ARCHLIB_EXP if ((unixdir = tounixpath(ARCHLIB_EXP, Nullch)) != Nullch) { - New(1370,p,1,PLOC); + Newx(p,1,PLOC); p->next = head_PLOC; head_PLOC = p; strncpy(p->dir,unixdir,sizeof(p->dir)-1); p->dir[NAM$C_MAXRSS] = '\0'; } #endif - } static char * -find_vmspipe(void) +find_vmspipe(pTHX) { static int vmspipe_file_status = 0; static char vmspipe_file[NAM$C_MAXRSS+1]; @@ -1780,12 +3040,13 @@ find_vmspipe(void) } static FILE * -vmspipe_tempfile(void) +vmspipe_tempfile(pTHX) { char file[NAM$C_MAXRSS+1]; FILE *fp; static int index = 0; - stat_t s0, s1; + Stat_t s0, s1; + int cmp_result; /* create a tempfile */ @@ -1800,19 +3061,33 @@ vmspipe_tempfile(void) */ index++; - sprintf(file,"sys$scratch:perlpipe_%08.8x_%d.com",mypid,index); - fp = fopen(file,"w"); - if (!fp) { + if (!decc_filename_unix_only) { + sprintf(file,"sys$scratch:perlpipe_%08.8x_%d.com",mypid,index); + fp = fopen(file,"w"); + if (!fp) { sprintf(file,"sys$login:perlpipe_%08.8x_%d.com",mypid,index); fp = fopen(file,"w"); if (!fp) { sprintf(file,"sys$disk:[]perlpipe_%08.8x_%d.com",mypid,index); fp = fopen(file,"w"); - } + } + } + } + else { + sprintf(file,"/tmp/perlpipe_%08.8x_%d.com",mypid,index); + fp = fopen(file,"w"); + if (!fp) { + sprintf(file,"/sys$login/perlpipe_%08.8x_%d.com",mypid,index); + fp = fopen(file,"w"); + if (!fp) { + sprintf(file,"./perlpipe_%08.8x_%d.com",mypid,index); + fp = fopen(file,"w"); + } + } } if (!fp) return 0; /* we're hosed */ - fprintf(fp,"$! 'f$verify(0)\n"); + fprintf(fp,"$! 'f$verify(0)'\n"); fprintf(fp,"$! --- protect against nonstandard definitions ---\n"); fprintf(fp,"$ perl_cfile = f$environment(\"procedure\")\n"); fprintf(fp,"$ perl_define = \"define/nolog\"\n"); @@ -1821,32 +3096,38 @@ vmspipe_tempfile(void) fprintf(fp,"$ perl_del = \"delete\"\n"); fprintf(fp,"$ pif = \"if\"\n"); fprintf(fp,"$! --- define i/o redirection (sys$output set by lib$spawn)\n"); - fprintf(fp,"$ pif perl_popen_in .nes. \"\" then perl_define sys$input 'perl_popen_in'\n"); - fprintf(fp,"$ pif perl_popen_err .nes. \"\" then perl_define sys$error 'perl_popen_err'\n"); - fprintf(fp,"$ cmd = perl_popen_cmd\n"); - fprintf(fp,"$! --- get rid of global symbols\n"); - fprintf(fp,"$ perl_del/symbol/global perl_popen_in\n"); - fprintf(fp,"$ perl_del/symbol/global perl_popen_err\n"); - fprintf(fp,"$ perl_del/symbol/global perl_popen_cmd\n"); + fprintf(fp,"$ pif perl_popen_in .nes. \"\" then perl_define/user/name_attributes=confine sys$input 'perl_popen_in'\n"); + fprintf(fp,"$ pif perl_popen_err .nes. \"\" then perl_define/user/name_attributes=confine sys$error 'perl_popen_err'\n"); + fprintf(fp,"$ pif perl_popen_out .nes. \"\" then perl_define sys$output 'perl_popen_out'\n"); + fprintf(fp,"$! --- build command line to get max possible length\n"); + fprintf(fp,"$c=perl_popen_cmd0\n"); + fprintf(fp,"$c=c+perl_popen_cmd1\n"); + fprintf(fp,"$c=c+perl_popen_cmd2\n"); + fprintf(fp,"$x=perl_popen_cmd3\n"); + fprintf(fp,"$c=c+x\n"); fprintf(fp,"$ perl_on\n"); - fprintf(fp,"$ 'cmd\n"); + fprintf(fp,"$ 'c'\n"); fprintf(fp,"$ perl_status = $STATUS\n"); - fprintf(fp,"$ perl_del 'perl_cfile'\n"); + fprintf(fp,"$ perl_del 'perl_cfile'\n"); fprintf(fp,"$ perl_exit 'perl_status'\n"); fsync(fileno(fp)); fgetname(fp, file, 1); - fstat(fileno(fp), &s0); + fstat(fileno(fp), (struct stat *)&s0); fclose(fp); + if (decc_filename_unix_only) + do_tounixspec(file, file, 0); fp = fopen(file,"r","shr=get"); if (!fp) return 0; - fstat(fileno(fp), &s1); - - if (s0.st_ino[0] != s1.st_ino[0] || - s0.st_ino[1] != s1.st_ino[1] || - s0.st_ino[2] != s1.st_ino[2] || - s0.st_ctime != s1.st_ctime ) { + fstat(fileno(fp), (struct stat *)&s1); + + #if defined(_USE_STD_STAT) + cmp_result = s0.crtl_stat.st_ino != s1.crtl_stat.st_ino; + #else + cmp_result = memcmp(s0.crtl_stat.st_ino, s1.crtl_stat.st_ino, 6); + #endif + if ((cmp_result != 0) && (s0.st_ctime != s1.st_ctime)) { fclose(fp); return 0; } @@ -1857,27 +3138,35 @@ vmspipe_tempfile(void) static PerlIO * -safe_popen(char *cmd, char *mode) +safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) { - dTHX; static int handler_set_up = FALSE; - unsigned long int sts, flags=1; /* nowait - gnu c doesn't allow &1 */ - unsigned int table = LIB$K_CLI_GLOBAL_SYM; - char *p, symbol[MAX_DCL_SYMBOL+1], *vmspipe; + unsigned long int sts, flags = CLI$M_NOWAIT; + /* The use of a GLOBAL table (as was done previously) rendered + * Perl's qx() or `` unusable from a C<$ SET SYMBOL/SCOPE=NOGLOBAL> DCL + * environment. Hence we've switched to LOCAL symbol table. + */ + unsigned int table = LIB$K_CLI_LOCAL_SYM; + int j, wait = 0; + char *p, mode[10], symbol[MAX_DCL_SYMBOL+1], *vmspipe; char in[512], out[512], err[512], mbx[512]; FILE *tpipe = 0; char tfilebuf[NAM$C_MAXRSS+1]; pInfo info; + char cmd_sym_name[20]; struct dsc$descriptor_s d_symbol= {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, symbol}; - struct dsc$descriptor_s d_out = {0, DSC$K_DTYPE_T, - DSC$K_CLASS_S, out}; struct dsc$descriptor_s vmspipedsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; - $DESCRIPTOR(d_sym_cmd,"PERL_POPEN_CMD"); + struct dsc$descriptor_s d_sym_cmd = {0, DSC$K_DTYPE_T, + DSC$K_CLASS_S, cmd_sym_name}; + struct dsc$descriptor_s *vmscmd; $DESCRIPTOR(d_sym_in ,"PERL_POPEN_IN"); + $DESCRIPTOR(d_sym_out,"PERL_POPEN_OUT"); $DESCRIPTOR(d_sym_err,"PERL_POPEN_ERR"); + if (!head_PLOC) store_pipelocs(aTHX); /* at least TRY to use a static vmspipe file */ + /* once-per-program initialization... note that the SETAST calls and the dual test of pipe_ef makes sure that only the FIRST thread through here does @@ -1907,25 +3196,52 @@ safe_popen(char *cmd, char *mode) /* see if we can find a VMSPIPE.COM */ tfilebuf[0] = '@'; - vmspipe = find_vmspipe(); + vmspipe = find_vmspipe(aTHX); if (vmspipe) { strcpy(tfilebuf+1,vmspipe); } else { /* uh, oh...we're in tempfile hell */ - tpipe = vmspipe_tempfile(); + tpipe = vmspipe_tempfile(aTHX); if (!tpipe) { /* a fish popular in Boston */ if (ckWARN(WARN_PIPE)) { - Perl_warner(aTHX_ WARN_PIPE,"unable to find VMSPIPE.COM for i/o piping"); + Perl_warner(aTHX_ packWARN(WARN_PIPE),"unable to find VMSPIPE.COM for i/o piping"); } return Nullfp; } fgetname(tpipe,tfilebuf+1,1); } - vmspipedsc.dsc$a_pointer = tfilebuf; - vmspipedsc.dsc$w_length = strlen(tfilebuf); - - if (!(setup_cmddsc(cmd,0) & 1)) { set_errno(EINVAL); return Nullfp; } - New(1301,info,1,Info); + vmspipedsc.dsc$a_pointer = tfilebuf; + vmspipedsc.dsc$w_length = strlen(tfilebuf); + + sts = setup_cmddsc(aTHX_ cmd,0,0,&vmscmd); + if (!(sts & 1)) { + switch (sts) { + case RMS$_FNF: case RMS$_DNF: + set_errno(ENOENT); break; + case RMS$_DIR: + set_errno(ENOTDIR); break; + case RMS$_DEV: + set_errno(ENODEV); break; + case RMS$_PRV: + set_errno(EACCES); break; + case RMS$_SYN: + set_errno(EINVAL); break; + case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: + 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 (*mode != 'n' && ckWARN(WARN_PIPE)) { + Perl_warner(aTHX_ packWARN(WARN_PIPE),"Can't pipe \"%*s\": %s", strlen(cmd), cmd, Strerror(errno)); + } + *psts = sts; + return Nullfp; + } + Newx(info,1,Info); + strcpy(mode,in_mode); info->mode = *mode; info->done = FALSE; info->completion = 0; @@ -1933,20 +3249,38 @@ safe_popen(char *cmd, char *mode) info->in = 0; info->out = 0; info->err = 0; + info->fp = Nullfp; + info->useFILE = 0; + info->waiting = 0; info->in_done = TRUE; info->out_done = TRUE; info->err_done = TRUE; + in[0] = out[0] = err[0] = '\0'; + + if ((p = strchr(mode,'F')) != NULL) { /* F -> use FILE* */ + info->useFILE = 1; + strcpy(p,p+1); + } + if ((p = strchr(mode,'W')) != NULL) { /* W -> wait for completion */ + wait = 1; + strcpy(p,p+1); + } if (*mode == 'r') { /* piping from subroutine */ - in[0] = '\0'; - info->out = pipe_infromchild_setup(mbx,out); + info->out = pipe_infromchild_setup(aTHX_ mbx,out); if (info->out) { info->out->pipe_done = &info->out_done; info->out_done = FALSE; info->out->info = info; } + if (!info->useFILE) { info->fp = PerlIO_open(mbx, mode); + } else { + info->fp = (PerlIO *) freopen(mbx, mode, stdin); + Perl_vmssetuserlnm(aTHX_ "SYS$INPUT",mbx); + } + if (!info->fp && info->out) { sys$cancel(info->out->chan_out); @@ -1957,26 +3291,46 @@ safe_popen(char *cmd, char *mode) if (!done) _ckvmssts(sys$clref(pipe_ef)); _ckvmssts(sys$setast(1)); if (!done) _ckvmssts(sys$waitfr(pipe_ef)); - } + } if (info->out->buf) Safefree(info->out->buf); Safefree(info->out); Safefree(info); + *psts = RMS$_FNF; return Nullfp; - } + } - info->err = pipe_mbxtofd_setup(fileno(stderr), err); + info->err = pipe_mbxtofd_setup(aTHX_ fileno(stderr), err); if (info->err) { info->err->pipe_done = &info->err_done; info->err_done = FALSE; info->err->info = info; } - } else { /* piping to subroutine , mode=w*/ - int melded; + } else if (*mode == 'w') { /* piping to subroutine */ + + info->out = pipe_mbxtofd_setup(aTHX_ fileno(stdout), out); + if (info->out) { + info->out->pipe_done = &info->out_done; + info->out_done = FALSE; + info->out->info = info; + } + + info->err = pipe_mbxtofd_setup(aTHX_ fileno(stderr), err); + if (info->err) { + info->err->pipe_done = &info->err_done; + info->err_done = FALSE; + info->err->info = info; + } - info->in = pipe_tochild_setup(in,mbx); + info->in = pipe_tochild_setup(aTHX_ in,mbx); + if (!info->useFILE) { info->fp = PerlIO_open(mbx, mode); + } else { + info->fp = (PerlIO *) freopen(mbx, mode, stdout); + Perl_vmssetuserlnm(aTHX_ "SYS$OUTPUT",mbx); + } + if (info->in) { info->in->pipe_done = &info->in_done; info->in_done = FALSE; @@ -2001,40 +3355,26 @@ safe_popen(char *cmd, char *mode) if (info->in->buf) Safefree(info->in->buf); Safefree(info->in); Safefree(info); - return Nullfp; + *psts = RMS$_FNF; + return Nullfp; } - /* if SYS$ERROR == SYS$OUTPUT, use only one mbx */ - - melded = FALSE; - fgetname(stderr, err); - if (strncmp(err,"SYS$ERROR:",10) == 0) { - fgetname(stdout, out); - if (strncmp(out,"SYS$OUTPUT:",11) == 0) { - if (popen_translate("SYS$OUTPUT",out) == popen_translate("SYS$ERROR",err)) { - melded = TRUE; - } - } - } - info->out = pipe_mbxtofd_setup(fileno(stdout), out); + } else if (*mode == 'n') { /* separate subprocess, no Perl i/o */ + info->out = pipe_mbxtofd_setup(aTHX_ fileno(stdout), out); if (info->out) { info->out->pipe_done = &info->out_done; info->out_done = FALSE; info->out->info = info; } - if (!melded) { - info->err = pipe_mbxtofd_setup(fileno(stderr), err); - if (info->err) { - info->err->pipe_done = &info->err_done; - info->err_done = FALSE; - info->err->info = info; - } - } else { - err[0] = '\0'; - } + + info->err = pipe_mbxtofd_setup(aTHX_ fileno(stderr), err); + if (info->err) { + info->err->pipe_done = &info->err_done; + info->err_done = FALSE; + info->err->info = info; + } } - d_out.dsc$w_length = strlen(out); /* lib$spawn sets SYS$OUTPUT so can meld*/ symbol[MAX_DCL_SYMBOL] = '\0'; @@ -2046,23 +3386,41 @@ safe_popen(char *cmd, char *mode) d_symbol.dsc$w_length = strlen(symbol); _ckvmssts(lib$set_symbol(&d_sym_err, &d_symbol, &table)); + strncpy(symbol, out, MAX_DCL_SYMBOL); + d_symbol.dsc$w_length = strlen(symbol); + _ckvmssts(lib$set_symbol(&d_sym_out, &d_symbol, &table)); - p = VMScmd.dsc$a_pointer; + p = vmscmd->dsc$a_pointer; while (*p && *p != '\n') p++; *p = '\0'; /* truncate on \n */ - p = VMScmd.dsc$a_pointer; + p = vmscmd->dsc$a_pointer; while (*p == ' ' || *p == '\t') p++; /* remove leading whitespace */ if (*p == '$') p++; /* remove leading $ */ while (*p == ' ' || *p == '\t') p++; + + for (j = 0; j < 4; j++) { + sprintf(cmd_sym_name,"PERL_POPEN_CMD%d",j); + d_sym_cmd.dsc$w_length = strlen(cmd_sym_name); + strncpy(symbol, p, MAX_DCL_SYMBOL); d_symbol.dsc$w_length = strlen(symbol); _ckvmssts(lib$set_symbol(&d_sym_cmd, &d_symbol, &table)); + if (strlen(p) > MAX_DCL_SYMBOL) { + p += MAX_DCL_SYMBOL; + } else { + p += strlen(p); + } + } _ckvmssts(sys$setast(0)); info->next=open_pipes; /* prepend to list */ open_pipes=info; _ckvmssts(sys$setast(1)); - _ckvmssts(lib$spawn(&vmspipedsc, &nl_desc, &d_out, &flags, + /* Omit arg 2 (input file) so the child will get the parent's SYS$INPUT + * and SYS$COMMAND. vmspipe.com will redefine SYS$INPUT, but we'll still + * have SYS$COMMAND if we need it. + */ + _ckvmssts(lib$spawn(&vmspipedsc, 0, &nl_desc, &flags, 0, &info->pid, &info->completion, 0, popen_completion_ast,info,0,0,0)); @@ -2070,36 +3428,60 @@ safe_popen(char *cmd, char *mode) if (tpipe) fclose(tpipe); - /* once the subprocess is spawned, its copied the symbols and + /* once the subprocess is spawned, it has copied the symbols and we can get rid of ours */ + for (j = 0; j < 4; j++) { + sprintf(cmd_sym_name,"PERL_POPEN_CMD%d",j); + d_sym_cmd.dsc$w_length = strlen(cmd_sym_name); _ckvmssts(lib$delete_symbol(&d_sym_cmd, &table)); + } _ckvmssts(lib$delete_symbol(&d_sym_in, &table)); _ckvmssts(lib$delete_symbol(&d_sym_err, &table)); - - vms_execfree(aTHX); + _ckvmssts(lib$delete_symbol(&d_sym_out, &table)); + vms_execfree(vmscmd); +#ifdef PERL_IMPLICIT_CONTEXT + if (aTHX) +#endif PL_forkprocess = info->pid; + + if (wait) { + int done = 0; + while (!done) { + _ckvmssts(sys$setast(0)); + done = info->done; + if (!done) _ckvmssts(sys$clref(pipe_ef)); + _ckvmssts(sys$setast(1)); + if (!done) _ckvmssts(sys$waitfr(pipe_ef)); + } + *psts = info->completion; +/* Caller thinks it is open and tries to close it. */ +/* This causes some problems, as it changes the error status */ +/* my_pclose(info->fp); */ + } else { + *psts = SS$_NORMAL; + } return info->fp; } /* end of safe_popen */ -/*{{{ FILE *my_popen(char *cmd, char *mode)*/ -FILE * -Perl_my_popen(pTHX_ char *cmd, char *mode) +/*{{{ PerlIO *my_popen(char *cmd, char *mode)*/ +PerlIO * +Perl_my_popen(pTHX_ const char *cmd, const char *mode) { + int sts; TAINT_ENV(); TAINT_PROPER("popen"); PERL_FLUSHALL_FOR_CHILD; - return safe_popen(cmd,mode); + return safe_popen(aTHX_ cmd,mode,&sts); } /*}}}*/ -/*{{{ I32 my_pclose(FILE *fp)*/ -I32 Perl_my_pclose(pTHX_ FILE *fp) +/*{{{ I32 my_pclose(PerlIO *fp)*/ +I32 Perl_my_pclose(pTHX_ PerlIO *fp) { - dTHX; pInfo info, last = NULL; unsigned long int retsts; int done, iss; @@ -2120,8 +3502,12 @@ I32 Perl_my_pclose(pTHX_ FILE *fp) * well, at least sometimes it *does*, so we have to watch out for * the first EOF closing the pipe (and DASSGN'ing the channel)... */ - - fsync(fileno(info->fp)); /* first, flush data */ + if (info->fp) { + if (!info->useFILE) + PerlIO_flush(info->fp); /* first, flush data */ + else + fflush((FILE *)info->fp); + } _ckvmssts(sys$setast(0)); info->closing = TRUE; @@ -2139,8 +3525,12 @@ I32 Perl_my_pclose(pTHX_ FILE *fp) _ckvmssts(sys$qio(0,info->in->chan_in,IO$_WRITEOF,0,0,0, 0, 0, 0, 0, 0, 0)); _ckvmssts(sys$setast(1)); + if (info->fp) { + if (!info->useFILE) PerlIO_close(info->fp); - + else + fclose((FILE *)info->fp); + } /* we have to wait until subprocess completes, but ALSO wait until all the i/o completes...otherwise we'll be freeing the "info" structure @@ -2182,14 +3572,27 @@ I32 Perl_my_pclose(pTHX_ FILE *fp) } /* end of my_pclose() */ -/* sort-of waitpid; use only with popen() */ +#if defined(__CRTL_VER) && __CRTL_VER >= 70200000 + /* Roll our own prototype because we want this regardless of whether + * _VMS_WAIT is defined. + */ + __pid_t __vms_waitpid( __pid_t __pid, int *__stat_loc, int __options ); +#endif +/* sort-of waitpid; special handling of pipe clean-up for subprocesses + created with popen(); otherwise partially emulate waitpid() unless + we have a suitable one from the CRTL that came with VMS 7.2 and later. + Also check processes not considered by the CRTL waitpid(). + */ /*{{{Pid_t my_waitpid(Pid_t pid, int *statusp, int flags)*/ Pid_t -my_waitpid(Pid_t pid, int *statusp, int flags) +Perl_my_waitpid(pTHX_ Pid_t pid, int *statusp, int flags) { pInfo info; int done; - dTHX; + int sts; + int j; + + if (statusp) *statusp = 0; for (info = open_pipes; info != NULL; info = info->next) if (info->pid == pid) break; @@ -2203,38 +3606,104 @@ my_waitpid(Pid_t pid, int *statusp, int flags) if (!done) _ckvmssts(sys$waitfr(pipe_ef)); } - *statusp = info->completion; + if (statusp) *statusp = info->completion; return pid; } - else { /* we haven't heard of this child */ + + /* child that already terminated? */ + + for (j = 0; j < NKEEPCLOSED && j < closed_num; j++) { + if (closed_list[j].pid == pid) { + if (statusp) *statusp = closed_list[j].completion; + return pid; + } + } + + /* fall through if this child is not one of our own pipe children */ + +#if defined(__CRTL_VER) && __CRTL_VER >= 70200000 + + /* waitpid() became available in the CRTL as of VMS 7.0, but only + * in 7.2 did we get a version that fills in the VMS completion + * status as Perl has always tried to do. + */ + + sts = __vms_waitpid( pid, statusp, flags ); + + if ( sts == 0 || !(sts == -1 && errno == ECHILD) ) + return sts; + + /* If the real waitpid tells us the child does not exist, we + * fall through here to implement waiting for a child that + * was created by some means other than exec() (say, spawned + * from DCL) or to wait for a process that is not a subprocess + * of the current process. + */ + +#endif /* defined(__CRTL_VER) && __CRTL_VER >= 70200000 */ + + { $DESCRIPTOR(intdsc,"0 00:00:01"); - unsigned long int ownercode = JPI$_OWNER, ownerpid, mypid; - unsigned long int interval[2],sts; + unsigned long int ownercode = JPI$_OWNER, ownerpid; + unsigned long int pidcode = JPI$_PID, mypid; + unsigned long int interval[2]; + unsigned int jpi_iosb[2]; + struct itmlst_3 jpilist[2] = { + {sizeof(ownerpid), JPI$_OWNER, &ownerpid, 0}, + { 0, 0, 0, 0} + }; + + if (pid <= 0) { + /* Sorry folks, we don't presently implement rooting around for + the first child we can find, and we definitely don't want to + pass a pid of -1 to $getjpi, where it is a wildcard operation. + */ + set_errno(ENOTSUP); + return -1; + } + + /* Get the owner of the child so I can warn if it's not mine. If the + * process doesn't exist or I don't have the privs to look at it, + * I can go home early. + */ + sts = sys$getjpiw(0,&pid,NULL,&jpilist,&jpi_iosb,NULL,NULL); + if (sts & 1) sts = jpi_iosb[0]; + if (!(sts & 1)) { + switch (sts) { + case SS$_NONEXPR: + set_errno(ECHILD); + break; + case SS$_NOPRIV: + set_errno(EACCES); + break; + default: + _ckvmssts(sts); + } + set_vaxc_errno(sts); + return -1; + } if (ckWARN(WARN_EXEC)) { - _ckvmssts(lib$getjpi(&ownercode,&pid,0,&ownerpid,0,0)); - _ckvmssts(lib$getjpi(&ownercode,0,0,&mypid,0,0)); + /* remind folks they are asking for non-standard waitpid behavior */ + _ckvmssts(lib$getjpi(&pidcode,0,0,&mypid,0,0)); if (ownerpid != mypid) - Perl_warner(aTHX_ WARN_EXEC,"pid %x not a child",pid); + Perl_warner(aTHX_ packWARN(WARN_EXEC), + "waitpid: process %x is not a child of process %x", + pid,mypid); } + /* simply check on it once a second until it's not there anymore. */ + _ckvmssts(sys$bintim(&intdsc,interval)); while ((sts=lib$getjpi(&ownercode,&pid,0,&ownerpid,0,0)) & 1) { - _ckvmssts(sys$schdwk(0,0,interval,0)); - _ckvmssts(sys$hiber()); + _ckvmssts(sys$schdwk(0,0,interval,0)); + _ckvmssts(sys$hiber()); } if (sts == SS$_NONEXPR) sts = SS$_NORMAL; - _ckvmssts(sts); - /* There's no easy way to find the termination status a child we're - * not aware of beforehand. If we're really interested in the future, - * we can go looking for a termination mailbox, or chase after the - * accounting record for the process. - */ - *statusp = 0; + _ckvmssts(sts); return pid; } - } /* end of waitpid() */ /*}}}*/ /*}}}*/ @@ -2280,11 +3749,16 @@ my_gconvert(double val, int ndig, int trail, char *buf) * specification string. The fourth argument is unused at present. * rmesexpand() returns the address of the resultant string if * successful, and NULL on error. + * + * New functionality for previously unused opts value: + * PERL_RMSEXPAND_M_VMS - Force output file specification to VMS format. */ -static char *mp_do_tounixspec(pTHX_ char *, char *, int); +static char *mp_do_tounixspec(pTHX_ const char *, char *, int); +#if defined(__VAX) || !defined(NAML$C_MAXRSS) +/* ODS-2 only version */ static char * -mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsigned opts) +mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts) { static char __rmsexpand_retbuf[NAM$C_MAXRSS+1]; char vmsfspec[NAM$C_MAXRSS+1], tmpfspec[NAM$C_MAXRSS+1]; @@ -2293,30 +3767,40 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig struct NAM mynam = cc$rms_nam; STRLEN speclen; unsigned long int retsts, trimver, trimtype, haslower = 0, isunix = 0; + int sts; 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); + if (ts) out = Newx(outbuf,NAM$C_MAXRSS+1,char); else outbuf = __rmsexpand_retbuf; } - if ((isunix = (strchr(filespec,'/') != NULL))) { - if (do_tovmsspec(filespec,vmsfspec,0) == NULL) return NULL; + isunix = is_unix_filespec(filespec); + if (isunix) { + if (do_tovmsspec(filespec,vmsfspec,0) == NULL) { + if (out) + Safefree(out); + return NULL; + } filespec = vmsfspec; } - myfab.fab$l_fna = filespec; + myfab.fab$l_fna = (char *)filespec; /* cast ok for read only pointer */ 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; + if (do_tovmsspec(defspec,tmpfspec,0) == NULL) { + if (out) + Safefree(out); + return NULL; + } defspec = tmpfspec; } - myfab.fab$l_dna = defspec; + myfab.fab$l_dna = (char *)defspec; /* cast ok for read only pointer */ myfab.fab$b_dns = strlen(defspec); } @@ -2325,6 +3809,11 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig mynam.nam$l_rsa = outbuf; mynam.nam$b_rss = NAM$C_MAXRSS; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif + retsts = sys$parse(&myfab,0,0); if (!(retsts & 1)) { mynam.nam$b_nop |= NAM$M_SYNCHK; @@ -2333,7 +3822,7 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig if (retsts & 1) goto expanded; } mynam.nam$l_rlf = NULL; myfab.fab$b_dns = 0; - (void) sys$parse(&myfab,0,0); /* Free search context */ + sts = sys$parse(&myfab,0,0); /* Free search context */ if (out) Safefree(out); set_vaxc_errno(retsts); if (retsts == RMS$_PRV) set_errno(EACCES); @@ -2345,7 +3834,7 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig 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 */ + myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */ if (out) Safefree(out); set_vaxc_errno(retsts); if (retsts == RMS$_PRV) set_errno(EACCES); @@ -2356,8 +3845,10 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig /* 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 (!decc_efs_case_preserve) { + 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 @@ -2374,19 +3865,27 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig struct NAM defnam = cc$rms_nam; deffab.fab$l_nam = &defnam; - deffab.fab$l_fna = defspec; deffab.fab$b_fns = myfab.fab$b_dns; + /* cast below ok for read only pointer */ + deffab.fab$l_fna = (char *)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; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + defnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif 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 (trimver) { + if (*mynam.nam$l_ver != '\"') + 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, + memmove(mynam.nam$l_type, mynam.nam$l_ver, speclen - (mynam.nam$l_ver - out)); speclen -= mynam.nam$l_ver - mynam.nam$l_type; } @@ -2397,11 +3896,23 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig mynam.nam$l_ver == mynam.nam$l_type + 1 && !(mynam.nam$l_fnb & NAM$M_EXP_NAME)) speclen = mynam.nam$l_name - out; + + /* Posix format specifications must have matching quotes */ + if (decc_posix_compliant_pathnames && (out[0] == '\"')) { + if ((speclen > 1) && (out[speclen-1] != '\"')) { + out[speclen] = '\"'; + speclen++; + } + } + out[speclen] = '\0'; - if (haslower) __mystrtolower(out); + if (haslower && !decc_efs_case_preserve) __mystrtolower(out); /* Have we been working with an expanded, but not resultant, spec? */ /* Also, convert back to Unix syntax if necessary. */ + if ((opts & PERL_RMSEXPAND_M_VMS) != 0) + isunix = 0; + if (!mynam.nam$b_rsl) { if (isunix) { if (do_tounixspec(esa,outbuf,0) == NULL) return NULL; @@ -2413,15 +3924,348 @@ mp_do_rmsexpand(pTHX_ char *filespec, char *outbuf, int ts, char *defspec, unsig 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 */ + mynam.nam$l_rsa = NULL; + mynam.nam$b_rss = 0; + myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */ + return outbuf; +} +#else +/* ODS-5 supporting routine */ +static char * +mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts) +{ + static char __rmsexpand_retbuf[NAML$C_MAXRSS+1]; + char * vmsfspec, *tmpfspec; + char * esa, *cp, *out = NULL; + char * esal; + char * outbufl; + struct FAB myfab = cc$rms_fab; + struct NAML mynam = cc$rms_naml; + STRLEN speclen; + unsigned long int retsts, trimver, trimtype, haslower = 0, isunix = 0; + int sts; + + if (!filespec || !*filespec) { + set_vaxc_errno(LIB$_INVARG); set_errno(EINVAL); + return NULL; + } + if (!outbuf) { + if (ts) out = Newx(outbuf,VMS_MAXRSS,char); + else outbuf = __rmsexpand_retbuf; + } + + vmsfspec = NULL; + tmpfspec = NULL; + outbufl = NULL; + isunix = is_unix_filespec(filespec); + if (isunix) { + Newx(vmsfspec, VMS_MAXRSS, char); + if (do_tovmsspec(filespec,vmsfspec,0) == NULL) { + Safefree(vmsfspec); + if (out) + Safefree(out); + return NULL; + } + filespec = vmsfspec; + + /* Unless we are forcing to VMS format, a UNIX input means + * UNIX output, and that requires long names to be used + */ + if ((opts & PERL_RMSEXPAND_M_VMS) == 0) + opts |= PERL_RMSEXPAND_M_LONG; + else { + isunix = 0; + } + } + + myfab.fab$l_fna = (char *)-1; /* cast ok */ + myfab.fab$b_fns = 0; + mynam.naml$l_long_filename = (char *)filespec; /* cast ok */ + mynam.naml$l_long_filename_size = strlen(filespec); + myfab.fab$l_naml = &mynam; + + if (defspec && *defspec) { + int t_isunix; + t_isunix = is_unix_filespec(defspec); + if (t_isunix) { + Newx(tmpfspec, VMS_MAXRSS, char); + if (do_tovmsspec(defspec,tmpfspec,0) == NULL) { + Safefree(tmpfspec); + if (vmsfspec != NULL) + Safefree(vmsfspec); + if (out) + Safefree(out); + return NULL; + } + defspec = tmpfspec; + } + myfab.fab$l_dna = (char *) -1; /* cast ok */ + myfab.fab$b_dns = 0; + mynam.naml$l_long_defname = (char *)defspec; /* cast ok */ + mynam.naml$l_long_defname_size = strlen(defspec); + } + + Newx(esa, NAM$C_MAXRSS + 1, char); + Newx(esal, NAML$C_MAXRSS + 1, char); + mynam.naml$l_esa = esa; + mynam.naml$b_ess = NAM$C_MAXRSS; + mynam.naml$l_long_expand = esal; + mynam.naml$l_long_expand_alloc = NAML$C_MAXRSS; + + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + mynam.naml$l_rsa = NULL; + mynam.naml$b_rss = 0; + mynam.naml$l_long_result = outbuf; + mynam.naml$l_long_result_alloc = VMS_MAXRSS - 1; + } + else { + mynam.naml$l_rsa = outbuf; + mynam.naml$b_rss = NAM$C_MAXRSS; + Newx(outbufl, VMS_MAXRSS, char); + mynam.naml$l_long_result = outbufl; + mynam.naml$l_long_result_alloc = VMS_MAXRSS - 1; + } + +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + mynam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif + + /* First attempt to parse as an existing file */ + retsts = sys$parse(&myfab,0,0); + if (!(retsts & STS$K_SUCCESS)) { + + /* Could not find the file, try as syntax only if error is not fatal */ + mynam.naml$b_nop |= NAM$M_SYNCHK; + if (retsts == RMS$_DNF || retsts == RMS$_DIR || retsts == RMS$_DEV) { + retsts = sys$parse(&myfab,0,0); + if (retsts & STS$K_SUCCESS) goto expanded; + } + + /* Still could not parse the file specification */ + /*----------------------------------------------*/ + mynam.naml$l_rlf = NULL; + myfab.fab$b_dns = 0; + mynam.naml$l_long_defname_size = 0; + sts = sys$parse(&myfab,0,0); /* Free search context */ + if (out) Safefree(out); + if (tmpfspec != NULL) + Safefree(tmpfspec); + if (vmsfspec != NULL) + Safefree(vmsfspec); + Safefree(esa); + Safefree(esal); + 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 & STS$K_SUCCESS) && retsts != RMS$_FNF) { + mynam.naml$b_nop |= NAM$M_SYNCHK; + mynam.naml$l_rlf = NULL; + myfab.fab$b_dns = 0; + mynam.naml$l_long_defname_size = 0; + sts = sys$parse(&myfab,0,0); /* Free search context */ + if (out) Safefree(out); + if (tmpfspec != NULL) + Safefree(tmpfspec); + if (vmsfspec != NULL) + Safefree(vmsfspec); + Safefree(esa); + Safefree(esal); + 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: + if (!decc_efs_case_preserve) { + for (out = mynam.naml$l_long_filename; *out; out++) + if (islower(*out)) { haslower = 1; break; } + } + + /* Is a long or a short name expected */ + /*------------------------------------*/ + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + if (mynam.naml$l_long_result_size) { + out = outbuf; + speclen = mynam.naml$l_long_result_size; + } + else { + out = esal; /* Not esa */ + speclen = mynam.naml$l_long_expand_size; + } + } + else { + if (mynam.naml$b_rsl) { + out = outbuf; + speclen = mynam.naml$b_rsl; + } + else { + out = esa; /* Not esal */ + speclen = mynam.naml$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.naml$l_fnb & NAM$M_EXP_VER); + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + trimtype = !(mynam.naml$l_fnb & NAM$M_EXP_TYPE) && + (mynam.naml$l_long_ver - mynam.naml$l_long_type == 1); + } + else { + trimtype = !(mynam.naml$l_fnb & NAM$M_EXP_TYPE) && + (mynam.naml$l_ver - mynam.naml$l_type == 1); + } + if (trimver || trimtype) { + if (defspec && *defspec) { + char *defesal = NULL; + Newx(defesal, NAML$C_MAXRSS + 1, char); + if (defesal != NULL) { + struct FAB deffab = cc$rms_fab; + struct NAML defnam = cc$rms_naml; + + deffab.fab$l_naml = &defnam; + + deffab.fab$l_fna = (char *) - 1; /* Cast ok */ + deffab.fab$b_fns = 0; + defnam.naml$l_long_filename = (char *)defspec; /* Cast ok */ + defnam.naml$l_long_filename_size = mynam.naml$l_long_defname_size; + defnam.naml$l_esa = NULL; + defnam.naml$b_ess = 0; + defnam.naml$l_long_expand = defesal; + defnam.naml$l_long_expand_alloc = VMS_MAXRSS - 1; + defnam.naml$b_nop = NAM$M_SYNCHK; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + defnam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif + if (sys$parse(&deffab,0,0) & STS$K_SUCCESS) { + if (trimver) { + trimver = !(defnam.naml$l_fnb & NAM$M_EXP_VER); + } + if (trimtype) { + trimtype = !(defnam.naml$l_fnb & NAM$M_EXP_TYPE); + } + } + Safefree(defesal); + } + } + if (trimver) { + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + if (*mynam.naml$l_long_ver != '\"') + speclen = mynam.naml$l_long_ver - out; + } + else { + if (*mynam.naml$l_ver != '\"') + speclen = mynam.naml$l_ver - out; + } + } + if (trimtype) { + /* If we didn't already trim version, copy down */ + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + if (speclen > mynam.naml$l_long_ver - out) + memmove + (mynam.naml$l_long_type, + mynam.naml$l_long_ver, + speclen - (mynam.naml$l_long_ver - out)); + speclen -= mynam.naml$l_long_ver - mynam.naml$l_long_type; + } + else { + if (speclen > mynam.naml$l_ver - out) + memmove + (mynam.naml$l_type, + mynam.naml$l_ver, + speclen - (mynam.naml$l_ver - out)); + speclen -= mynam.naml$l_ver - mynam.naml$l_type; + } + } + } + + /* Done with these copies of the input files */ + /*-------------------------------------------*/ + if (vmsfspec != NULL) + Safefree(vmsfspec); + if (tmpfspec != NULL) + Safefree(tmpfspec); + + /* If we just had a directory spec on input, $PARSE "helpfully" + * adds an empty name and type for us */ + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + if (mynam.naml$l_long_name == mynam.naml$l_long_type && + mynam.naml$l_long_ver == mynam.naml$l_long_type + 1 && + !(mynam.naml$l_fnb & NAM$M_EXP_NAME)) + speclen = mynam.naml$l_long_name - out; + } + else { + if (mynam.naml$l_name == mynam.naml$l_type && + mynam.naml$l_ver == mynam.naml$l_type + 1 && + !(mynam.naml$l_fnb & NAM$M_EXP_NAME)) + speclen = mynam.naml$l_name - out; + } + + /* Posix format specifications must have matching quotes */ + if (decc_posix_compliant_pathnames && (out[0] == '\"')) { + if ((speclen > 1) && (out[speclen-1] != '\"')) { + out[speclen] = '\"'; + speclen++; + } + } + out[speclen] = '\0'; + if (haslower && !decc_efs_case_preserve) __mystrtolower(out); + + /* Have we been working with an expanded, but not resultant, spec? */ + /* Also, convert back to Unix syntax if necessary. */ + + if (!mynam.naml$l_long_result_size) { + if (isunix) { + if (do_tounixspec(esa,outbuf,0) == NULL) { + Safefree(esal); + Safefree(esa); + return NULL; + } + } + else strcpy(outbuf,esa); + } + else if (isunix) { + Newx(tmpfspec, VMS_MAXRSS, char); + if (do_tounixspec(outbuf,tmpfspec,0) == NULL) { + Safefree(esa); + Safefree(esal); + Safefree(tmpfspec); + return NULL; + } + strcpy(outbuf,tmpfspec); + Safefree(tmpfspec); + } + + mynam.naml$b_nop |= NAM$M_SYNCHK; + mynam.naml$l_rlf = NULL; + mynam.naml$l_rsa = NULL; + mynam.naml$b_rss = 0; + mynam.naml$l_long_result = NULL; + mynam.naml$l_long_result_size = 0; + myfab.fab$b_dns = 0; + mynam.naml$l_long_defname_size = 0; + sts = sys$parse(&myfab,0,0); /* Free search context */ + Safefree(esa); + Safefree(esal); return outbuf; } +#endif /*}}}*/ /* External entry points */ -char *Perl_rmsexpand(pTHX_ char *spec, char *buf, char *def, unsigned opt) +char *Perl_rmsexpand(pTHX_ const char *spec, char *buf, const char *def, unsigned opt) { return do_rmsexpand(spec,buf,0,def,opt); } -char *Perl_rmsexpand_ts(pTHX_ char *spec, char *buf, char *def, unsigned opt) +char *Perl_rmsexpand_ts(pTHX_ const char *spec, char *buf, const char *def, unsigned opt) { return do_rmsexpand(spec,buf,1,def,opt); } @@ -2460,12 +4304,14 @@ char *Perl_rmsexpand_ts(pTHX_ char *spec, char *buf, char *def, unsigned opt) */ /*{{{ char *fileify_dirspec[_ts](char *path, char *buf)*/ -static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) +static char *mp_do_fileify_dirspec(pTHX_ const 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+2], vmsdir[NAM$C_MAXRSS+1]; + unsigned short int trnlnm_iter_count; + int sts; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; @@ -2473,72 +4319,90 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) dirlen = strlen(dir); while (dirlen && dir[dirlen-1] == '/') --dirlen; if (!dirlen) { /* We had Unixish '/' -- substitute top of current tree */ - strcpy(trndir,"/sys$disk/000000"); - dir = trndir; - dirlen = 16; + if (!decc_posix_compliant_pathnames && decc_disable_posix_root) { + dir = "/sys$disk"; + dirlen = 9; + } + else + dirlen = 1; } if (dirlen > NAM$C_MAXRSS) { set_errno(ENAMETOOLONG); set_vaxc_errno(RMS$_SYN); return NULL; } - if (!strpbrk(dir+1,"/]>:")) { + if (!strpbrk(dir+1,"/]>:") && + (!decc_posix_compliant_pathnames && decc_disable_posix_root)) { strcpy(trndir,*dir == '/' ? dir + 1: dir); - while (!strpbrk(trndir,"/]>:>") && my_trnlnm(trndir,trndir,0)) ; - dir = trndir; - dirlen = strlen(dir); + trnlnm_iter_count = 0; + while (!strpbrk(trndir,"/]>:>") && my_trnlnm(trndir,trndir,0)) { + trnlnm_iter_count++; + if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; + } + dirlen = strlen(trndir); } else { strncpy(trndir,dir,dirlen); trndir[dirlen] = '\0'; - dir = trndir; } + + /* At this point we are done with *dir and use *trndir which is a + * copy that can be modified. *dir must not be modified. + */ + /* If we were handed a rooted logical name or spec, treat it like a * simple directory, so that * $ Define myroot dev:[dir.] * ... do_fileify_dirspec("myroot",buf,1) ... * does something useful. */ - if (dirlen >= 2 && !strcmp(dir+dirlen-2,".]")) { - dir[--dirlen] = '\0'; - dir[dirlen-1] = ']'; + if (dirlen >= 2 && !strcmp(trndir+dirlen-2,".]")) { + trndir[--dirlen] = '\0'; + trndir[dirlen-1] = ']'; + } + if (dirlen >= 2 && !strcmp(trndir+dirlen-2,".>")) { + trndir[--dirlen] = '\0'; + trndir[dirlen-1] = '>'; } - if ((cp1 = strrchr(dir,']')) != NULL || (cp1 = strrchr(dir,'>')) != NULL) { + if ((cp1 = strrchr(trndir,']')) != NULL || (cp1 = strrchr(trndir,'>')) != NULL) { /* If we've got an explicit filename, we can just shuffle the string. */ if (*(cp1+1)) hasfilename = 1; /* Similarly, we can just back up a level if we've got multiple levels of explicit directories in a VMS spec which ends with directories. */ else { - for (cp2 = cp1; cp2 > dir; cp2--) { - if (*cp2 == '.') { - *cp2 = *cp1; *cp1 = '\0'; - hasfilename = 1; - break; + for (cp2 = cp1; cp2 > trndir; cp2--) { + if (*cp2 == '.') { + if ((cp2 - 1 > trndir) && (*(cp2 - 1) != '^')) { + *cp2 = *cp1; *cp1 = '\0'; + hasfilename = 1; + break; + } } if (*cp2 == '[' || *cp2 == '<') break; } } } - if (hasfilename || !strpbrk(dir,"]:>")) { /* Unix-style path or filename */ - if (dir[0] == '.') { - if (dir[1] == '\0' || (dir[1] == '/' && dir[2] == '\0')) + cp1 = strpbrk(trndir,"]:>"); /* Prepare for future change */ + if (hasfilename || !cp1) { /* Unix-style path or filename */ + if (trndir[0] == '.') { + if (trndir[1] == '\0' || (trndir[1] == '/' && trndir[2] == '\0')) return do_fileify_dirspec("[]",buf,ts); - else if (dir[1] == '.' && - (dir[2] == '\0' || (dir[2] == '/' && dir[3] == '\0'))) + else if (trndir[1] == '.' && + (trndir[2] == '\0' || (trndir[2] == '/' && trndir[3] == '\0'))) return do_fileify_dirspec("[-]",buf,ts); } - if (dirlen && dir[dirlen-1] == '/') { /* path ends with '/'; just add .dir;1 */ + if (dirlen && trndir[dirlen-1] == '/') { /* path ends with '/'; just add .dir;1 */ dirlen -= 1; /* to last element */ - lastdir = strrchr(dir,'/'); + lastdir = strrchr(trndir,'/'); } - else if ((cp1 = strstr(dir,"/.")) != NULL) { + else if ((cp1 = strstr(trndir,"/.")) != NULL) { /* If we have "/." or "/..", VMSify it and let the VMS code * below expand it, rather than repeating the code to handle * relative components of a filespec here */ do { if (*(cp1+2) == '.') cp1++; if (*(cp1+2) == '/' || *(cp1+2) == '\0') { - if (do_tovmsspec(dir,vmsdir,0) == NULL) return NULL; + if (do_tovmsspec(trndir,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 @@ -2552,63 +4416,76 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) } cp1++; } while ((cp1 = strstr(cp1,"/.")) != NULL); - lastdir = strrchr(dir,'/'); + lastdir = strrchr(trndir,'/'); } - else if (dirlen >= 7 && !strcmp(&dir[dirlen-7],"/000000")) { + else if (dirlen >= 7 && !strcmp(&trndir[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; + + /* This should not happen any more. Allowing the fake /000000 + * in a UNIX pathname causes all sorts of problems when trying + * to run in UNIX emulation. So the VMS to UNIX conversions + * now remove the fake /000000 directories. + */ + + trndir[dirlen] = '/'; trndir[dirlen+1] = '\0'; + if (do_tovmsspec(trndir,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,'/')) && - !(lastdir = cp1 = strrchr(dir,']')) && - !(lastdir = cp1 = strrchr(dir,'>'))) cp1 = dir; + + if ( !(lastdir = cp1 = strrchr(trndir,'/')) && + !(lastdir = cp1 = strrchr(trndir,']')) && + !(lastdir = cp1 = strrchr(trndir,'>'))) cp1 = trndir; if ((cp2 = strchr(cp1,'.'))) { /* look for explicit type */ int ver; char *cp3; - if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ - !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + + /* For EFS or ODS-5 look for the last dot */ + if (decc_efs_charset) { + cp2 = strrchr(cp1,'.'); + } + if (vms_process_case_tolerant) { + if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ + !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ + !*(cp2+3) || toupper(*(cp2+3)) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + (ver || *cp3)))))) { + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } + else { + if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ + !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ + !*(cp2+3) || *(cp2+3) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && (ver || *cp3)))))) { - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - dirlen = cp2 - dir; - } - } - /* If we lead off with a device or rooted logical, add the MFD - if we're specifying a top-level directory. */ - if (lastdir && *dir == '/') { - addmfd = 1; - for (cp1 = lastdir - 1; cp1 > dir; cp1--) { - if (*cp1 == '/') { - addmfd = 0; - break; + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } } + dirlen = cp2 - trndir; } } - retlen = dirlen + (addmfd ? 13 : 6); + + retlen = dirlen + 6; if (buf) retspec = buf; - else if (ts) New(1309,retspec,retlen+1,char); + else if (ts) Newx(retspec,retlen+1,char); else retspec = __fileify_retbuf; - if (addmfd) { - dirlen = lastdir - dir; - memcpy(retspec,dir,dirlen); - strcpy(&retspec[dirlen],"/000000"); - strcpy(&retspec[dirlen+7],lastdir); - } - else { - memcpy(retspec,dir,dirlen); - retspec[dirlen] = '\0'; - } + memcpy(retspec,trndir,dirlen); + retspec[dirlen] = '\0'; + /* We've picked up everything up to the directory file name. Now just add the type and version, and we're set. */ - strcat(retspec,".dir;1"); + if ((!decc_efs_case_preserve) && vms_process_case_tolerant) + strcat(retspec,".dir;1"); + else + strcat(retspec,".DIR;1"); return retspec; } else { /* VMS-style directory spec */ @@ -2617,18 +4494,22 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) struct FAB dirfab = cc$rms_fab; struct NAM savnam, dirnam = cc$rms_nam; - dirfab.fab$b_fns = strlen(dir); - dirfab.fab$l_fna = dir; + dirfab.fab$b_fns = strlen(trndir); + dirfab.fab$l_fna = trndir; dirfab.fab$l_nam = &dirnam; dirfab.fab$l_dna = ".DIR;1"; dirfab.fab$b_dns = 6; dirnam.nam$b_ess = NAM$C_MAXRSS; dirnam.nam$l_esa = esa; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif - for (cp = dir; *cp; cp++) + for (cp = trndir; *cp; cp++) if (islower(*cp)) { haslower = 1; break; } if (!((sts = sys$parse(&dirfab))&1)) { - if (dirfab.fab$l_sts == RMS$_DIR) { + if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) { dirnam.nam$b_nop |= NAM$M_SYNCHK; sts = sys$parse(&dirfab) & 1; } @@ -2649,7 +4530,7 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) else { set_errno(EVMSERR); set_vaxc_errno(dirfab.fab$l_sts); dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); return NULL; } } @@ -2659,7 +4540,7 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) if (!cp1) cp1 = strchr(esa,'>'); if (cp1) { /* Should always be true */ dirnam.nam$b_esl -= cp1 - esa - 1; - memcpy(esa,cp1 + 1,dirnam.nam$b_esl); + memmove(esa,cp1 + 1,dirnam.nam$b_esl); } } if (dirnam.nam$l_fnb & NAM$M_EXP_TYPE) { /* Was type specified? */ @@ -2668,7 +4549,7 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) if (strncmp(dirnam.nam$l_type,".DIR;1",cmplen)) { /* Something other than .DIR[;1]. Bzzt. */ dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); set_errno(ENOTDIR); set_vaxc_errno(RMS$_DIR); return NULL; @@ -2678,11 +4559,11 @@ static char *mp_do_fileify_dirspec(pTHX_ 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(1311,retspec,dirnam.nam$b_esl+1,char); + else if (ts) Newx(retspec,dirnam.nam$b_esl+1,char); else retspec = __fileify_retbuf; strcpy(retspec,esa); dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); return retspec; } if ((cp1 = strstr(esa,".][000000]")) != NULL) { @@ -2693,17 +4574,31 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) if ((cp1 = strrchr(esa,']')) == NULL) cp1 = strrchr(esa,'>'); if (cp1 == NULL) { /* should never happen */ dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); return NULL; } term = *cp1; *cp1 = '\0'; retlen = strlen(esa); - if ((cp1 = strrchr(esa,'.')) != NULL) { + cp1 = strrchr(esa,'.'); + /* ODS-5 directory specifications can have extra "." in them. */ + while (cp1 != NULL) { + if ((cp1-1 == esa) || (*(cp1-1) != '^')) + break; + else { + cp1--; + while ((cp1 > esa) && (*cp1 != '.')) + cp1--; + } + if (cp1 == esa) + cp1 = NULL; + } + + if ((cp1) != NULL) { /* There's more than one directory in the path. Just roll back. */ *cp1 = term; if (buf) retspec = buf; - else if (ts) New(1311,retspec,retlen+7,char); + else if (ts) Newx(retspec,retlen+7,char); else retspec = __fileify_retbuf; strcpy(retspec,esa); } @@ -2711,44 +4606,68 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) if (dirnam.nam$l_fnb & NAM$M_ROOT_DIR) { /* Go back and expand rooted logical name */ dirnam.nam$b_nop = NAM$M_SYNCHK | NAM$M_NOCONCEAL; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif if (!(sys$parse(&dirfab) & 1)) { dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); set_errno(EVMSERR); set_vaxc_errno(dirfab.fab$l_sts); return NULL; } retlen = dirnam.nam$b_esl - 9; /* esa - '][' - '].DIR;1' */ if (buf) retspec = buf; - else if (ts) New(1312,retspec,retlen+16,char); + else if (ts) Newx(retspec,retlen+16,char); else retspec = __fileify_retbuf; cp1 = strstr(esa,"]["); + if (!cp1) cp1 = strstr(esa,"]<"); dirlen = cp1 - esa; memcpy(retspec,esa,dirlen); if (!strncmp(cp1+2,"000000]",7)) { retspec[dirlen-1] = '\0'; - for (cp1 = retspec+dirlen-1; *cp1 != '.' && *cp1 != '['; cp1--) ; + /* Not full ODS-5, just extra dots in directories for now */ + cp1 = retspec + dirlen - 1; + while (cp1 > retspec) + { + if (*cp1 == '[') + break; + if (*cp1 == '.') { + if (*(cp1-1) != '^') + break; + } + cp1--; + } if (*cp1 == '.') *cp1 = ']'; else { memmove(cp1+8,cp1+1,retspec+dirlen-cp1); - memcpy(cp1+1,"000000]",7); + memmove(cp1+1,"000000]",7); } } else { - memcpy(retspec+dirlen,cp1+2,retlen-dirlen); + memmove(retspec+dirlen,cp1+2,retlen-dirlen); retspec[retlen] = '\0'; /* Convert last '.' to ']' */ - for (cp1 = retspec+retlen-1; *cp1 != '.' && *cp1 != '['; cp1--) ; + cp1 = retspec+retlen-1; + while (*cp != '[') { + cp1--; + if (*cp1 == '.') { + /* Do not trip on extra dots in ODS-5 directories */ + if ((cp1 == retspec) || (*(cp1-1) != '^')) + break; + } + } if (*cp1 == '.') *cp1 = ']'; else { memmove(cp1+8,cp1+1,retspec+dirlen-cp1); - memcpy(cp1+1,"000000]",7); + memmove(cp1+1,"000000]",7); } } } else { /* This is a top-level dir. Add the MFD to the path. */ if (buf) retspec = buf; - else if (ts) New(1312,retspec,retlen+16,char); + else if (ts) Newx(retspec,retlen+16,char); else retspec = __fileify_retbuf; cp1 = esa; cp2 = retspec; @@ -2759,30 +4678,33 @@ static char *mp_do_fileify_dirspec(pTHX_ char *dir,char *buf,int ts) } } dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); /* We've set up the string up through the filename. Add the type and version, and we're done. */ strcat(retspec,".DIR;1"); /* $PARSE may have upcased filespec, so convert output to lower * case if input contained any lowercase characters. */ - if (haslower) __mystrtolower(retspec); + if (haslower && !decc_efs_case_preserve) __mystrtolower(retspec); return retspec; } } /* end of do_fileify_dirspec() */ /*}}}*/ /* External entry points */ -char *Perl_fileify_dirspec(pTHX_ char *dir, char *buf) +char *Perl_fileify_dirspec(pTHX_ const char *dir, char *buf) { return do_fileify_dirspec(dir,buf,0); } -char *Perl_fileify_dirspec_ts(pTHX_ char *dir, char *buf) +char *Perl_fileify_dirspec_ts(pTHX_ const char *dir, char *buf) { return do_fileify_dirspec(dir,buf,1); } /*{{{ char *pathify_dirspec[_ts](char *path, char *buf)*/ -static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) +static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts) { static char __pathify_retbuf[NAM$C_MAXRSS+1]; unsigned long int retlen; char *retpath, *cp1, *cp2, trndir[NAM$C_MAXRSS+1]; + unsigned short int trnlnm_iter_count; + STRLEN trnlen; + int sts; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; @@ -2791,56 +4713,81 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) if (*dir) strcpy(trndir,dir); else getcwd(trndir,sizeof trndir - 1); + trnlnm_iter_count = 0; while (!strpbrk(trndir,"/]:>") && !no_translate_barewords && my_trnlnm(trndir,trndir,0)) { - STRLEN trnlen = strlen(trndir); + trnlnm_iter_count++; + if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; + trnlen = strlen(trndir); /* Trap simple rooted lnms, and return lnm:[000000] */ if (!strcmp(trndir+trnlen-2,".]")) { if (buf) retpath = buf; - else if (ts) New(1318,retpath,strlen(dir)+10,char); + else if (ts) Newx(retpath,strlen(dir)+10,char); else retpath = __pathify_retbuf; strcpy(retpath,dir); strcat(retpath,":[000000]"); return retpath; } } - dir = trndir; - if (!strpbrk(dir,"]:>")) { /* Unix-style path or plain name */ - if (*dir == '.' && (*(dir+1) == '\0' || - (*(dir+1) == '.' && *(dir+2) == '\0'))) - retlen = 2 + (*(dir+1) != '\0'); + /* At this point we do not work with *dir, but the copy in + * *trndir that is modifiable. + */ + + if (!strpbrk(trndir,"]:>")) { /* Unix-style path or plain name */ + if (*trndir == '.' && (*(trndir+1) == '\0' || + (*(trndir+1) == '.' && *(trndir+2) == '\0'))) + retlen = 2 + (*(trndir+1) != '\0'); else { - if ( !(cp1 = strrchr(dir,'/')) && - !(cp1 = strrchr(dir,']')) && - !(cp1 = strrchr(dir,'>')) ) cp1 = dir; + if ( !(cp1 = strrchr(trndir,'/')) && + !(cp1 = strrchr(trndir,']')) && + !(cp1 = strrchr(trndir,'>')) ) cp1 = trndir; 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. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + + /* For EFS or ODS-5 look for the last dot */ + if (decc_efs_charset) { + cp2 = strrchr(cp1,'.'); + } + if (vms_process_case_tolerant) { + if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ + !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ + !*(cp2+3) || toupper(*(cp2+3)) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && (ver || *cp3)))))) { - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - retlen = cp2 - dir + 1; + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } + else { + if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ + !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ + !*(cp2+3) || *(cp2+3) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + (ver || *cp3)))))) { + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } + retlen = cp2 - trndir + 1; } else { /* No file type present. Treat the filename as a directory. */ - retlen = strlen(dir) + 1; + retlen = strlen(trndir) + 1; } } if (buf) retpath = buf; - else if (ts) New(1313,retpath,retlen+1,char); + else if (ts) Newx(retpath,retlen+1,char); else retpath = __pathify_retbuf; - strncpy(retpath,dir,retlen-1); + strncpy(retpath, trndir, retlen-1); if (retpath[retlen-2] != '/') { /* If the path doesn't already end */ retpath[retlen-1] = '/'; /* with '/', add it. */ retpath[retlen] = '\0'; @@ -2854,20 +4801,34 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) struct NAM savnam, dirnam = cc$rms_nam; /* If we've got an explicit filename, we can just shuffle the string. */ - if ( ( (cp1 = strrchr(dir,']')) != NULL || - (cp1 = strrchr(dir,'>')) != NULL ) && *(cp1+1)) { + if ( ( (cp1 = strrchr(trndir,']')) != NULL || + (cp1 = strrchr(trndir,'>')) != NULL ) && *(cp1+1)) { if ((cp2 = strchr(cp1,'.')) != NULL) { int ver; char *cp3; - if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ - !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + if (vms_process_case_tolerant) { + if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ + !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ + !*(cp2+3) || toupper(*(cp2+3)) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && (ver || *cp3)))))) { - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } + else { + if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ + !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ + !*(cp2+3) || *(cp2+3) != 'R' || + (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || + (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && + (ver || *cp3)))))) { + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } } else { /* No file type, so just draw name into directory part */ for (cp2 = cp1; *cp2; cp2++) ; @@ -2877,15 +4838,15 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) *cp1 = '.'; /* We've now got a VMS 'path'; fall through */ } - dirfab.fab$b_fns = strlen(dir); - dirfab.fab$l_fna = dir; - if (dir[dirfab.fab$b_fns-1] == ']' || - dir[dirfab.fab$b_fns-1] == '>' || - dir[dirfab.fab$b_fns-1] == ':') { /* It's already a VMS 'path' */ + dirfab.fab$b_fns = strlen(trndir); + dirfab.fab$l_fna = trndir; + if (trndir[dirfab.fab$b_fns-1] == ']' || + trndir[dirfab.fab$b_fns-1] == '>' || + trndir[dirfab.fab$b_fns-1] == ':') { /* It's already a VMS 'path' */ if (buf) retpath = buf; - else if (ts) New(1314,retpath,strlen(dir)+1,char); + else if (ts) Newx(retpath,strlen(trndir)+1,char); else retpath = __pathify_retbuf; - strcpy(retpath,dir); + strcpy(retpath,trndir); return retpath; } dirfab.fab$l_dna = ".DIR;1"; @@ -2893,12 +4854,16 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) dirfab.fab$l_nam = &dirnam; dirnam.nam$b_ess = (unsigned char) sizeof esa - 1; dirnam.nam$l_esa = esa; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif - for (cp = dir; *cp; cp++) + for (cp = trndir; *cp; cp++) if (islower(*cp)) { haslower = 1; break; } if (!(sts = (sys$parse(&dirfab)&1))) { - if (dirfab.fab$l_sts == RMS$_DIR) { + if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) { dirnam.nam$b_nop |= NAM$M_SYNCHK; sts = sys$parse(&dirfab) & 1; } @@ -2912,8 +4877,10 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) savnam = dirnam; if (!(sys$search(&dirfab)&1)) { /* Does the file really exist? */ if (dirfab.fab$l_sts != RMS$_FNF) { + int sts1; dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; + sts1 = sys$parse(&dirfab,0,0); set_errno(EVMSERR); set_vaxc_errno(dirfab.fab$l_sts); return NULL; @@ -2925,9 +4892,11 @@ static char *mp_do_pathify_dirspec(pTHX_ char *dir,char *buf, int ts) /* Yep; check version while we're at it, if it's there. */ cmplen = (dirnam.nam$l_fnb & NAM$M_EXP_VER) ? 6 : 4; if (strncmp(dirnam.nam$l_type,".DIR;1",cmplen)) { + int sts2; /* Something other than .DIR[;1]. Bzzt. */ dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; + sts2 = sys$parse(&dirfab,0,0); set_errno(ENOTDIR); set_vaxc_errno(RMS$_DIR); return NULL; @@ -2944,31 +4913,35 @@ static char *mp_do_pathify_dirspec(pTHX_ 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(1314,retpath,retlen,char); + else if (ts) Newx(retpath,retlen,char); else retpath = __pathify_retbuf; strcpy(retpath,esa); dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL; - dirfab.fab$b_dns = 0; (void) sys$parse(&dirfab,0,0); + dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0); /* $PARSE may have upcased filespec, so convert output to lower * case if input contained any lowercase characters. */ - if (haslower) __mystrtolower(retpath); + if (haslower && !decc_efs_case_preserve) __mystrtolower(retpath); } return retpath; } /* end of do_pathify_dirspec() */ /*}}}*/ /* External entry points */ -char *Perl_pathify_dirspec(pTHX_ char *dir, char *buf) +char *Perl_pathify_dirspec(pTHX_ const char *dir, char *buf) { return do_pathify_dirspec(dir,buf,0); } -char *Perl_pathify_dirspec_ts(pTHX_ char *dir, char *buf) +char *Perl_pathify_dirspec_ts(pTHX_ const char *dir, char *buf) { return do_pathify_dirspec(dir,buf,1); } -/*{{{ char *tounixspec[_ts](char *path, char *buf)*/ -static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) +/*{{{ char *tounixspec[_ts](char *spec, char *buf)*/ +static char *mp_do_tounixspec(pTHX_ const 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, expand = 0; + char *dirend, *rslt, *cp1, *cp3, tmp[NAM$C_MAXRSS+1]; + const char *cp2; + int devlen, dirlen, retlen = NAM$C_MAXRSS+1; + int expand = 1; /* guarantee room for leading and trailing slashes */ + unsigned short int trnlnm_iter_count; + int cmp_rslt; if (spec == NULL) return NULL; if (strlen(spec) > NAM$C_MAXRSS) return NULL; @@ -2984,10 +4957,80 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) { expand++; cp1 +=2; } /* VMS '...' ==> Unix '/.../' */ } } - New(1315,rslt,retlen+2+2*expand,char); + Newx(rslt,retlen+2+2*expand,char); } else rslt = __tounixspec_retbuf; - if (strchr(spec,'/') != NULL) { + + /* New VMS specific format needs translation + * glob passes filenames with trailing '\n' and expects this preserved. + */ + if (decc_posix_compliant_pathnames) { + if (strncmp(spec, "\"^UP^", 5) == 0) { + char * uspec; + char *tunix; + int tunix_len; + int nl_flag; + + Newx(tunix, VMS_MAXRSS + 1,char); + strcpy(tunix, spec); + tunix_len = strlen(tunix); + nl_flag = 0; + if (tunix[tunix_len - 1] == '\n') { + tunix[tunix_len - 1] = '\"'; + tunix[tunix_len] = '\0'; + tunix_len--; + nl_flag = 1; + } + uspec = decc$translate_vms(tunix); + Safefree(tunix); + if ((int)uspec > 0) { + strcpy(rslt,uspec); + if (nl_flag) { + strcat(rslt,"\n"); + } + else { + /* If we can not translate it, makemaker wants as-is */ + strcpy(rslt, spec); + } + return rslt; + } + } + } + + cmp_rslt = 0; /* Presume VMS */ + cp1 = strchr(spec, '/'); + if (cp1 == NULL) + cmp_rslt = 0; + + /* Look for EFS ^/ */ + if (decc_efs_charset) { + while (cp1 != NULL) { + cp2 = cp1 - 1; + if (*cp2 != '^') { + /* Found illegal VMS, assume UNIX */ + cmp_rslt = 1; + break; + } + cp1++; + cp1 = strchr(cp1, '/'); + } + } + + /* Look for "." and ".." */ + if (decc_filename_unix_report) { + if (spec[0] == '.') { + if ((spec[1] == '\0') || (spec[1] == '\n')) { + cmp_rslt = 1; + } + else { + if ((spec[1] == '.') && ((spec[2] == '\0') || (spec[2] == '\n'))) { + cmp_rslt = 1; + } + } + } + } + /* This is already UNIX or at least nothing VMS understands */ + if (cmp_rslt) { strcpy(rslt,spec); return rslt; } @@ -3001,6 +5044,61 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) strcpy(rslt,spec); return rslt; } + + /* Special case 1 - sys$posix_root = / */ +#if __CRTL_VER >= 70000000 + if (!decc_disable_posix_root) { + if (strncasecmp(spec, "SYS$POSIX_ROOT:", 15) == 0) { + *cp1 = '/'; + cp1++; + cp2 = cp2 + 15; + } + } +#endif + + /* Special case 2 - Convert NLA0: to /dev/null */ +#if __CRTL_VER < 70000000 + cmp_rslt = strncmp(spec,"NLA0:", 5); + if (cmp_rslt != 0) + cmp_rslt = strncmp(spec,"nla0:", 5); +#else + cmp_rslt = strncasecmp(spec,"NLA0:", 5); +#endif + if (cmp_rslt == 0) { + strcpy(rslt, "/dev/null"); + cp1 = cp1 + 9; + cp2 = cp2 + 5; + if (spec[6] != '\0') { + cp1[9] == '/'; + cp1++; + cp2++; + } + } + + /* Also handle special case "SYS$SCRATCH:" */ +#if __CRTL_VER < 70000000 + cmp_rslt = strncmp(spec,"SYS$SCRATCH:", 12); + if (cmp_rslt != 0) + cmp_rslt = strncmp(spec,"sys$scratch:", 12); +#else + cmp_rslt = strncasecmp(spec,"SYS$SCRATCH:", 12); +#endif + if (cmp_rslt == 0) { + int islnm; + + islnm = my_trnlnm(tmp, "TMP", 0); + if (!islnm) { + strcpy(rslt, "/tmp"); + cp1 = cp1 + 4; + cp2 = cp2 + 12; + if (spec[12] != '\0') { + cp1[4] == '/'; + cp1++; + cp2++; + } + } + } + if (*cp2 != '[' && *cp2 != '<') { *(cp1++) = '/'; } @@ -3010,16 +5108,19 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) *(cp1++) = '.'; *(cp1++) = '/'; *(cp1++) = '\0'; return rslt; } - else if ( *cp2 != '.' && *cp2 != '-') { /* add the implied device */ + else if ( *cp2 != '^' && *cp2 != '.' && *cp2 != '-') { /* add the implied device */ if (getcwd(tmp,sizeof tmp,1) == NULL) { if (ts) Safefree(rslt); return NULL; } + trnlnm_iter_count = 0; do { cp3 = tmp; while (*cp3 != ':' && *cp3) cp3++; *(cp3++) = '\0'; if (strchr(cp3,']') != NULL) break; + trnlnm_iter_count++; + if (trnlnm_iter_count >= PERL_LNM_MAX_ITER+1) break; } while (vmstrnenv(tmp,tmp,0,fildev,0)); if (ts && !buf && ((devlen = strlen(tmp)) + (dirlen = strlen(cp2)) + 1 > retlen)) { @@ -3035,6 +5136,11 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) } *(cp1++) = '/'; } + if ((*cp2 == '^')) { + /* EFS file escape, pass the next character as is */ + /* Fix me: HEX encoding for UNICODE not implemented */ + cp2++; + } else if ( *cp2 == '.') { if (*(cp2+1) == '.' && *(cp2+2) == '.') { *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '/'; @@ -3044,6 +5150,12 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) } } for (; cp2 <= dirend; cp2++) { + if ((*cp2 == '^')) { + /* EFS file escape, pass the next character as is */ + /* Fix me: HEX encoding for UNICODE not implemented */ + cp2++; + *(cp1++) = *cp2; + } if (*cp2 == ':') { *(cp1++) = '/'; if (*(cp2+1) == '[') cp2++; @@ -3051,7 +5163,7 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) else if (*cp2 == ']' || *cp2 == '>') { if (*(cp1-1) != '/') *(cp1++) = '/'; /* Don't double after ellipsis */ } - else if (*cp2 == '.') { + else if ((*cp2 == '.') && (*cp2-1 != '^')) { *(cp1++) = '/'; if (*(cp2+1) == ']' || *(cp2+1) == '>') { while (*(cp2+1) == ']' || *(cp2+1) == '>' || @@ -3083,24 +5195,687 @@ static char *mp_do_tounixspec(pTHX_ char *spec, char *buf, int ts) while (*cp2) *(cp1++) = *(cp2++); *cp1 = '\0'; + /* This still leaves /000000/ when working with a + * VMS device root or concealed root. + */ + { + int ulen; + char * zeros; + + ulen = strlen(rslt); + + /* Get rid of "000000/ in rooted filespecs */ + if (ulen > 7) { + zeros = strstr(rslt, "/000000/"); + if (zeros != NULL) { + int mlen; + mlen = ulen - (zeros - rslt) - 7; + memmove(zeros, &zeros[7], mlen); + ulen = ulen - 7; + rslt[ulen] = '\0'; + } + } + } + return rslt; } /* end of do_tounixspec() */ /*}}}*/ /* External entry points */ -char *Perl_tounixspec(pTHX_ char *spec, char *buf) { return do_tounixspec(spec,buf,0); } -char *Perl_tounixspec_ts(pTHX_ char *spec, char *buf) { return do_tounixspec(spec,buf,1); } +char *Perl_tounixspec(pTHX_ const char *spec, char *buf) { return do_tounixspec(spec,buf,0); } +char *Perl_tounixspec_ts(pTHX_ const char *spec, char *buf) { return do_tounixspec(spec,buf,1); } + +#if __CRTL_VER >= 80200000 && !defined(__VAX) + +static int posix_to_vmsspec + (char *vmspath, int vmspath_len, const char *unixpath) { +int sts; +struct FAB myfab = cc$rms_fab; +struct NAML mynam = cc$rms_naml; +struct dsc$descriptor_s dvidsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + struct dsc$descriptor_s specdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; +char *esa; +char *vms_delim; +int dir_flag; +int unixlen; + + /* If not a posix spec already, convert it */ + dir_flag = 0; + unixlen = strlen(unixpath); + if (unixlen == 0) { + vmspath[0] = '\0'; + return SS$_NORMAL; + } + if (strncmp(unixpath,"\"^UP^",5) != 0) { + sprintf(vmspath,"\"^UP^%s\"",unixpath); + } + else { + /* This is already a VMS specification, no conversion */ + unixlen--; + strncpy(vmspath,unixpath, vmspath_len); + } + vmspath[vmspath_len] = 0; + if (unixpath[unixlen - 1] == '/') + dir_flag = 1; + Newx(esa, VMS_MAXRSS+1, char); + myfab.fab$l_fna = vmspath; + myfab.fab$b_fns = strlen(vmspath); + myfab.fab$l_naml = &mynam; + mynam.naml$l_esa = NULL; + mynam.naml$b_ess = 0; + mynam.naml$l_long_expand = esa; + mynam.naml$l_long_expand_alloc = (unsigned char) VMS_MAXRSS; + mynam.naml$l_rsa = NULL; + mynam.naml$b_rss = 0; + if (decc_efs_case_preserve) + mynam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE; + mynam.naml$l_input_flags |= NAML$M_OPEN_SPECIAL; + + /* Set up the remaining naml fields */ + sts = sys$parse(&myfab); + + /* It failed! Try again as a UNIX filespec */ + if (!(sts & 1)) { + Safefree(esa); + return sts; + } + + /* get the Device ID and the FID */ + sts = sys$search(&myfab); + /* on any failure, returned the POSIX ^UP^ filespec */ + if (!(sts & 1)) { + Safefree(esa); + return sts; + } + specdsc.dsc$a_pointer = vmspath; + specdsc.dsc$w_length = vmspath_len; + + dvidsc.dsc$a_pointer = &mynam.naml$t_dvi[1]; + dvidsc.dsc$w_length = mynam.naml$t_dvi[0]; + sts = lib$fid_to_name + (&dvidsc, mynam.naml$w_fid, &specdsc, &specdsc.dsc$w_length); + + /* on any failure, returned the POSIX ^UP^ filespec */ + if (!(sts & 1)) { + /* This can happen if user does not have permission to read directories */ + if (strncmp(unixpath,"\"^UP^",5) != 0) + sprintf(vmspath,"\"^UP^%s\"",unixpath); + else + strcpy(vmspath, unixpath); + } + else { + vmspath[specdsc.dsc$w_length] = 0; + + /* Are we expecting a directory? */ + if (dir_flag != 0) { + int i; + char *eptr; + + eptr = NULL; + + i = specdsc.dsc$w_length - 1; + while (i > 0) { + int zercnt; + zercnt = 0; + /* Version must be '1' */ + if (vmspath[i--] != '1') + break; + /* Version delimiter is one of ".;" */ + if ((vmspath[i] != '.') && (vmspath[i] != ';')) + break; + i--; + if (vmspath[i--] != 'R') + break; + if (vmspath[i--] != 'I') + break; + if (vmspath[i--] != 'D') + break; + if (vmspath[i--] != '.') + break; + eptr = &vmspath[i+1]; + while (i > 0) { + if ((vmspath[i] == ']') || (vmspath[i] == '>')) { + if (vmspath[i-1] != '^') { + if (zercnt != 6) { + *eptr = vmspath[i]; + eptr[1] = '\0'; + vmspath[i] = '.'; + break; + } + else { + /* Get rid of 6 imaginary zero directory filename */ + vmspath[i+1] = '\0'; + } + } + } + if (vmspath[i] == '0') + zercnt++; + else + zercnt = 10; + i--; + } + break; + } + } + } + Safefree(esa); + return sts; +} + +/* Can not use LIB$FID_TO_NAME, so doing a manual conversion */ +static int posix_to_vmsspec_hardway + (char *vmspath, int vmspath_len, const char *unixpath) { + +char *esa; +const char *unixptr; +char *vmsptr; +const char *lastslash; +const char *lastdot; +int unixlen; +int vmslen; +int dir_start; +int dir_dot; +int quoted; + + + unixptr = unixpath; + dir_dot = 0; + + /* Ignore leading "/" characters */ + while((unixptr[0] == '/') && (unixptr[1] == '/')) { + unixptr++; + } + unixlen = strlen(unixptr); + + /* Do nothing with blank paths */ + if (unixlen == 0) { + vmspath[0] = '\0'; + return SS$_NORMAL; + } + + lastslash = strrchr(unixptr,'/'); + lastdot = strrchr(unixptr,'.'); + + + /* last dot is last dot or past end of string */ + if (lastdot == NULL) + lastdot = unixptr + unixlen; + + /* if no directories, set last slash to beginning of string */ + if (lastslash == NULL) { + lastslash = unixptr; + } + else { + /* Watch out for trailing "." after last slash, still a directory */ + if ((lastslash[1] == '.') && (lastslash[2] == '\0')) { + lastslash = unixptr + unixlen; + } + + /* Watch out for traiing ".." after last slash, still a directory */ + if ((lastslash[1] == '.')&&(lastslash[2] == '.')&&(lastslash[3] == '\0')) { + lastslash = unixptr + unixlen; + } + + /* dots in directories are aways escaped */ + if (lastdot < lastslash) + lastdot = unixptr + unixlen; + } + + /* if (unixptr < lastslash) then we are in a directory */ + + dir_start = 0; + quoted = 0; + + vmsptr = vmspath; + vmslen = 0; + + /* This could have a "^UP^ on the front */ + if (strncmp(unixptr,"\"^UP^",5) == 0) { + quoted = 1; + unixptr+= 5; + } + + /* Start with the UNIX path */ + if (*unixptr != '/') { + /* relative paths */ + if (lastslash > unixptr) { + int dotdir_seen; + + /* skip leading ./ */ + dotdir_seen = 0; + while ((unixptr[0] == '.') && (unixptr[1] == '/')) { + dotdir_seen = 1; + unixptr++; + unixptr++; + } + + /* Are we still in a directory? */ + if (unixptr <= lastslash) { + *vmsptr++ = '['; + vmslen = 1; + dir_start = 1; + + /* if not backing up, then it is relative forward. */ + if (!((*unixptr == '.') && (unixptr[1] == '.') && + ((unixptr[2] == '/') || (unixptr[2] == '\0')))) { + *vmsptr++ = '.'; + vmslen++; + dir_dot = 1; + } + } + else { + if (dotdir_seen) { + /* Perl wants an empty directory here to tell the difference + * between a DCL commmand and a filename + */ + *vmsptr++ = '['; + *vmsptr++ = ']'; + vmslen = 2; + } + } + } + else { + /* Handle two special files . and .. */ + if (unixptr[0] == '.') { + if (unixptr[1] == '\0') { + *vmsptr++ = '['; + *vmsptr++ = ']'; + vmslen += 2; + *vmsptr++ = '\0'; + return SS$_NORMAL; + } + if ((unixptr[1] == '.') && (unixptr[2] == '\0')) { + *vmsptr++ = '['; + *vmsptr++ = '-'; + *vmsptr++ = ']'; + vmslen += 3; + *vmsptr++ = '\0'; + return SS$_NORMAL; + } + } + } + } + else { /* Absolute PATH handling */ + int sts; + char * nextslash; + int seg_len; + /* Need to find out where root is */ + + /* In theory, this procedure should never get an absolute POSIX pathname + * that can not be found on the POSIX root. + * In practice, that can not be relied on, and things will show up + * here that are a VMS device name or concealed logical name instead. + * So to make things work, this procedure must be tolerant. + */ + Newx(esa, vmspath_len, char); + + sts = SS$_NORMAL; + nextslash = strchr(&unixptr[1],'/'); + seg_len = 0; + if (nextslash != NULL) { + seg_len = nextslash - &unixptr[1]; + strncpy(vmspath, unixptr, seg_len + 1); + vmspath[seg_len+1] = 0; + sts = posix_to_vmsspec(esa, vmspath_len, vmspath); + } + + if (sts & 1) { + /* This is verified to be a real path */ + + sts = posix_to_vmsspec(esa, vmspath_len, "/"); + strcpy(vmspath, esa); + vmslen = strlen(vmspath); + vmsptr = vmspath + vmslen; + unixptr++; + if (unixptr < lastslash) { + char * rptr; + vmsptr--; + *vmsptr++ = '.'; + dir_start = 1; + dir_dot = 1; + if (vmslen > 7) { + int cmp; + rptr = vmsptr - 7; + cmp = strcmp(rptr,"000000."); + if (cmp == 0) { + vmslen -= 7; + vmsptr -= 7; + vmsptr[1] = '\0'; + } /* removing 6 zeros */ + } /* vmslen < 7, no 6 zeros possible */ + } /* Not in a directory */ + } /* end of verified real path handling */ + else { + int add_6zero; + int islnm; + + /* Ok, we have a device or a concealed root that is not in POSIX + * or we have garbage. Make the best of it. + */ + + /* Posix to VMS destroyed this, so copy it again */ + strncpy(vmspath, &unixptr[1], seg_len); + vmspath[seg_len] = 0; + vmslen = seg_len; + vmsptr = &vmsptr[vmslen]; + islnm = 0; + + /* Now do we need to add the fake 6 zero directory to it? */ + add_6zero = 1; + if ((*lastslash == '/') && (nextslash < lastslash)) { + /* No there is another directory */ + add_6zero = 0; + } + else { + int trnend; + + /* now we have foo:bar or foo:[000000]bar to decide from */ + islnm = vmstrnenv(vmspath, esa, 0, fildev, 0); + trnend = islnm ? islnm - 1 : 0; + + /* if this was a logical name, ']' or '>' must be present */ + /* if not a logical name, then assume a device and hope. */ + islnm = trnend ? (esa[trnend] == ']' || esa[trnend] == '>') : 0; + + /* if log name and trailing '.' then rooted - treat as device */ + add_6zero = islnm ? (esa[trnend-1] == '.') : 0; + + /* Fix me, if not a logical name, a device lookup should be + * done to see if the device is file structured. If the device + * is not file structured, the 6 zeros should not be put on. + * + * As it is, perl is occasionally looking for dev:[000000]tty. + * which looks a little strange. + */ + + if ((add_6zero == 0) && (*nextslash == '/') && (nextslash[1] == '\0')) { + /* No real directory present */ + add_6zero = 1; + } + } + + /* Put the device delimiter on */ + *vmsptr++ = ':'; + vmslen++; + unixptr = nextslash; + unixptr++; + + /* Start directory if needed */ + if (!islnm || add_6zero) { + *vmsptr++ = '['; + vmslen++; + dir_start = 1; + } + + /* add fake 000000] if needed */ + if (add_6zero) { + *vmsptr++ = '0'; + *vmsptr++ = '0'; + *vmsptr++ = '0'; + *vmsptr++ = '0'; + *vmsptr++ = '0'; + *vmsptr++ = '0'; + *vmsptr++ = ']'; + vmslen += 7; + dir_start = 0; + } + + } /* non-POSIX translation */ + Safefree(esa); + } /* End of relative/absolute path handling */ + + while ((*unixptr) && (vmslen < vmspath_len)){ + int dash_flag; + + dash_flag = 0; + + if (dir_start != 0) { + + /* First characters in a directory are handled special */ + while ((*unixptr == '/') || + ((*unixptr == '.') && + ((unixptr[1]=='.') || (unixptr[1]=='/') || (unixptr[1]=='\0')))) { + int loop_flag; + + loop_flag = 0; + + /* Skip redundant / in specification */ + while ((*unixptr == '/') && (dir_start != 0)) { + loop_flag = 1; + unixptr++; + if (unixptr == lastslash) + break; + } + if (unixptr == lastslash) + break; + + /* Skip redundant ./ characters */ + while ((*unixptr == '.') && + ((unixptr[1] == '/')||(unixptr[1] == '\0'))) { + loop_flag = 1; + unixptr++; + if (unixptr == lastslash) + break; + if (*unixptr == '/') + unixptr++; + } + if (unixptr == lastslash) + break; + + /* Skip redundant ../ characters */ + while ((*unixptr == '.') && (unixptr[1] == '.') && + ((unixptr[2] == '/') || (unixptr[2] == '\0'))) { + /* Set the backing up flag */ + loop_flag = 1; + dir_dot = 0; + dash_flag = 1; + *vmsptr++ = '-'; + vmslen++; + unixptr++; /* first . */ + unixptr++; /* second . */ + if (unixptr == lastslash) + break; + if (*unixptr == '/') /* The slash */ + unixptr++; + } + if (unixptr == lastslash) + break; + + /* To do: Perl expects /.../ to be translated to [...] on VMS */ + /* Not needed when VMS is pretending to be UNIX. */ + + /* Is this loop stuck because of too many dots? */ + if (loop_flag == 0) { + /* Exit the loop and pass the rest through */ + break; + } + } + + /* Are we done with directories yet? */ + if (unixptr >= lastslash) { + + /* Watch out for trailing dots */ + if (dir_dot != 0) { + vmslen --; + vmsptr--; + } + *vmsptr++ = ']'; + vmslen++; + dash_flag = 0; + dir_start = 0; + if (*unixptr == '/') + unixptr++; + } + else { + /* Have we stopped backing up? */ + if (dash_flag) { + *vmsptr++ = '.'; + vmslen++; + dash_flag = 0; + /* dir_start continues to be = 1 */ + } + if (*unixptr == '-') { + *vmsptr++ = '^'; + *vmsptr++ = *unixptr++; + vmslen += 2; + dir_start = 0; + + /* Now are we done with directories yet? */ + if (unixptr >= lastslash) { + + /* Watch out for trailing dots */ + if (dir_dot != 0) { + vmslen --; + vmsptr--; + } + + *vmsptr++ = ']'; + vmslen++; + dash_flag = 0; + dir_start = 0; + } + } + } + } + + /* All done? */ + if (*unixptr == '\0') + break; + + /* Normal characters - More EFS work probably needed */ + dir_start = 0; + dir_dot = 0; + + switch(*unixptr) { + case '/': + /* remove multiple / */ + while (unixptr[1] == '/') { + unixptr++; + } + if (unixptr == lastslash) { + /* Watch out for trailing dots */ + if (dir_dot != 0) { + vmslen --; + vmsptr--; + } + *vmsptr++ = ']'; + } + else { + dir_start = 1; + *vmsptr++ = '.'; + dir_dot = 1; + + /* To do: Perl expects /.../ to be translated to [...] on VMS */ + /* Not needed when VMS is pretending to be UNIX. */ + + } + dash_flag = 0; + if (*unixptr != '\0') + unixptr++; + vmslen++; + break; + case '?': + *vmsptr++ = '%'; + vmslen++; + unixptr++; + break; + case ' ': + *vmsptr++ = '^'; + *vmsptr++ = '_'; + vmslen += 2; + unixptr++; + break; + case '.': + if ((unixptr < lastdot) || (unixptr[1] == '\0')) { + *vmsptr++ = '^'; + *vmsptr++ = '.'; + vmslen += 2; + unixptr++; + + /* trailing dot ==> '^..' on VMS */ + if (*unixptr == '\0') { + *vmsptr++ = '.'; + vmslen++; + } + *vmsptr++ = *unixptr++; + vmslen ++; + } + if (quoted && (unixptr[1] == '\0')) { + unixptr++; + break; + } + *vmsptr++ = '^'; + *vmsptr++ = *unixptr++; + vmslen += 2; + break; + case '~': + case ';': + case '\\': + *vmsptr++ = '^'; + *vmsptr++ = *unixptr++; + vmslen += 2; + break; + default: + if (*unixptr != '\0') { + *vmsptr++ = *unixptr++; + vmslen++; + } + break; + } + } + + /* Make sure directory is closed */ + if (unixptr == lastslash) { + char *vmsptr2; + vmsptr2 = vmsptr - 1; + + if (*vmsptr2 != ']') { + *vmsptr2--; + + /* directories do not end in a dot bracket */ + if (*vmsptr2 == '.') { + vmsptr2--; + + /* ^. is allowed */ + if (*vmsptr2 != '^') { + vmsptr--; /* back up over the dot */ + } + } + *vmsptr++ = ']'; + } + } + else { + char *vmsptr2; + /* Add a trailing dot if a file with no extension */ + vmsptr2 = vmsptr - 1; + if ((*vmsptr2 != ']') && (*vmsptr2 != '*') && (*vmsptr2 != '%') && + (*lastdot != '.')) { + *vmsptr++ = '.'; + vmslen++; + } + } + + *vmsptr = '\0'; + return SS$_NORMAL; +} +#endif /*{{{ char *tovmsspec[_ts](char *path, char *buf)*/ -static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { +static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { static char __tovmsspec_retbuf[NAM$C_MAXRSS+1]; char *rslt, *dirend; - register char *cp1, *cp2; + char *lastdot; + char *vms_delim; + register char *cp1; + const char *cp2; unsigned long int infront = 0, hasdir = 1; + int rslt_len; + int no_type_seen; if (path == NULL) return NULL; + rslt_len = VMS_MAXRSS; if (buf) rslt = buf; - else if (ts) New(1316,rslt,strlen(path)+9,char); + else if (ts) Newx(rslt,NAM$C_MAXRSS+1,char); else rslt = __tovmsspec_retbuf; if (strpbrk(path,"]:>") || (dirend = strrchr(path,'/')) == NULL) { @@ -3112,13 +5887,80 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { else strcpy(rslt,path); return rslt; } + + /* Posix specifications are now a native VMS format */ + /*--------------------------------------------------*/ +#if __CRTL_VER >= 80200000 && !defined(__VAX) + if (decc_posix_compliant_pathnames) { + if (strncmp(path,"\"^UP^",5) == 0) { + posix_to_vmsspec_hardway(rslt, rslt_len, path); + return rslt; + } + } +#endif + + vms_delim = strpbrk(path,"]:>"); + + if ((vms_delim != NULL) || + ((dirend = strrchr(path,'/')) == NULL)) { + + /* VMS special characters found! */ + + if (path[0] == '.') { + if (path[1] == '\0') strcpy(rslt,"[]"); + else if (path[1] == '.' && path[2] == '\0') + strcpy(rslt,"[-]"); + + /* Dot preceeding a device or directory ? */ + else { + /* If not in POSIX mode, pass it through and hope it works */ +#if __CRTL_VER >= 80200000 && !defined(__VAX) + if (!decc_posix_compliant_pathnames) + strcpy(rslt,path); /* probably garbage */ + else + posix_to_vmsspec_hardway(rslt, rslt_len, path); +#else + strcpy(rslt,path); /* probably garbage */ +#endif + } + } + else { + + /* If no VMS characters and in POSIX mode, convert it! + * This is the easiest way to get directory specifications + * handled correctly in POSIX mode + */ +#if __CRTL_VER >= 80200000 && !defined(__VAX) + if ((vms_delim == NULL) && decc_posix_compliant_pathnames) + posix_to_vmsspec_hardway(rslt, rslt_len, path); + else { + /* No unix path separators - presume VMS already */ + strcpy(rslt,path); + } +#else + strcpy(rslt,path); /* probably garbage */ +#endif + } + return rslt; + } + +/* If POSIX mode active, handle the conversion */ +#if __CRTL_VER >= 80200000 && !defined(__VAX) + if (decc_posix_compliant_pathnames) { + posix_to_vmsspec_hardway(rslt, rslt_len, path); + return rslt; + } +#endif + 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; + lastdot = strrchr(cp2,'.'); if (*cp2 == '/') { char trndev[NAM$C_MAXRSS+1]; int islnm, rooted; @@ -3126,13 +5968,53 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { while (*(cp2+1) == '/') cp2++; /* Skip multiple /s */ if (!*(cp2+1)) { - if (!buf & ts) Renew(rslt,18,char); - strcpy(rslt,"sys$disk:[000000]"); + if (decc_disable_posix_root) { + strcpy(rslt,"sys$disk:[000000]"); + } + else { + strcpy(rslt,"sys$posix_root:[000000]"); + } return rslt; } while (*(++cp2) != '/' && *cp2) *(cp1++) = *cp2; *cp1 = '\0'; islnm = my_trnlnm(rslt,trndev,0); + + /* DECC special handling */ + if (!islnm) { + if (strcmp(rslt,"bin") == 0) { + strcpy(rslt,"sys$system"); + cp1 = rslt + 10; + *cp1 = 0; + islnm = my_trnlnm(rslt,trndev,0); + } + else if (strcmp(rslt,"tmp") == 0) { + strcpy(rslt,"sys$scratch"); + cp1 = rslt + 11; + *cp1 = 0; + islnm = my_trnlnm(rslt,trndev,0); + } + else if (!decc_disable_posix_root) { + strcpy(rslt, "sys$posix_root"); + cp1 = rslt + 13; + *cp1 = 0; + cp2 = path; + while (*(cp2+1) == '/') cp2++; /* Skip multiple /s */ + islnm = my_trnlnm(rslt,trndev,0); + } + else if (strcmp(rslt,"dev") == 0) { + if (strncmp(cp2,"/null", 5) == 0) { + if ((cp2[5] == 0) || (cp2[5] == '/')) { + strcpy(rslt,"NLA0"); + cp1 = rslt + 4; + *cp1 = 0; + cp2 = cp2 + 5; + islnm = my_trnlnm(rslt,trndev,0); + } + } + } + } + trnend = islnm ? strlen(trndev) - 1 : 0; islnm = trnend ? (trndev[trnend] == ']' || trndev[trnend] == '>') : 0; rooted = islnm ? (trndev[trnend-1] == '.') : 0; @@ -3149,12 +6031,16 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { if (!buf && ts) Renew(rslt,strlen(path)-strlen(rslt)+trnend+4,char); strcpy(rslt,trndev); cp1 = rslt + trnend; - *(cp1++) = '.'; - cp2++; + if (*cp2 != 0) { + *(cp1++) = '.'; + cp2++; + } } else { - *(cp1++) = ':'; - hasdir = 0; + if (decc_disable_posix_root) { + *(cp1++) = ':'; + hasdir = 0; + } } } } @@ -3175,6 +6061,10 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { if (!*(cp2+4)) *(cp1++) = '.'; /* Simulate trailing '/' for later */ cp2 += 4; } + else if ((cp2 != lastdot) || (lastdot < dirend)) { + /* Escape the extra dots in EFS file specifications */ + *(cp1++) = '^'; + } if (cp2 > dirend) cp2 = dirend; } else *(cp1++) = '.'; @@ -3212,11 +6102,25 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { } else cp2 += 3; /* Trailing '/' was there, so skip it, too */ } - else *(cp1++) = '_'; /* fix up syntax - '.' in name not allowed */ + else { + if (decc_efs_charset == 0) + *(cp1++) = '_'; /* fix up syntax - '.' in name not allowed */ + else { + *(cp1++) = '^'; /* fix up syntax - '.' in name is allowed */ + *(cp1++) = '.'; + } + } } else { if (!infront && *(cp1-1) == '-') *(cp1++) = '.'; - if (*cp2 == '.') *(cp1++) = '_'; + if (*cp2 == '.') { + if (decc_efs_charset == 0) + *(cp1++) = '_'; + else { + *(cp1++) = '^'; + *(cp1++) = '.'; + } + } else *(cp1++) = *cp2; infront = 1; } @@ -3224,7 +6128,91 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { if (*(cp1-1) == '.') cp1--; /* Unix spec ending in '/' ==> trailing '.' */ if (hasdir) *(cp1++) = ']'; if (*cp2) cp2++; /* check in case we ended with trailing '..' */ - while (*cp2) *(cp1++) = *(cp2++); + /* fixme for ODS5 */ + no_type_seen = 0; + if (cp2 > lastdot) + no_type_seen = 1; + while (*cp2) { + switch(*cp2) { + case '?': + *(cp1++) = '%'; + cp2++; + case ' ': + *(cp1)++ = '^'; + *(cp1)++ = '_'; + cp2++; + break; + case '.': + if (((cp2 < lastdot) || (cp2[1] == '\0')) && + decc_readdir_dropdotnotype) { + *(cp1)++ = '^'; + *(cp1)++ = '.'; + cp2++; + + /* trailing dot ==> '^..' on VMS */ + if (*cp2 == '\0') { + *(cp1++) = '.'; + no_type_seen = 0; + } + } + else { + *(cp1++) = *(cp2++); + no_type_seen = 0; + } + break; + case '\"': + case '~': + case '`': + case '!': + case '#': + case '%': + case '^': + case '&': + case '(': + case ')': + case '=': + case '+': + case '\'': + case '@': + case '[': + case ']': + case '{': + case '}': + case ':': + case '\\': + case '|': + case '<': + case '>': + *(cp1++) = '^'; + *(cp1++) = *(cp2++); + break; + case ';': + /* FIXME: This needs fixing as Perl is putting ".dir;" on UNIX filespecs + * which is wrong. UNIX notation should be ".dir. unless + * the DECC$FILENAME_UNIX_NO_VERSION is enabled. + * changing this behavior could break more things at this time. + * efs character set effectively does not allow "." to be a version + * delimiter as a further complication about changing this. + */ + if (decc_filename_unix_report != 0) { + *(cp1++) = '^'; + } + *(cp1++) = *(cp2++); + break; + default: + *(cp1++) = *(cp2++); + } + } + if ((no_type_seen == 1) && decc_readdir_dropdotnotype) { + char *lcp1; + lcp1 = cp1; + lcp1--; + /* Fix me for "^]", but that requires making sure that you do + * not back up past the start of the filename + */ + if ((*lcp1 != ']') && (*lcp1 != '*') && (*lcp1 != '%')) + *cp1++ = '.'; + } *cp1 = '\0'; return rslt; @@ -3232,11 +6220,11 @@ static char *mp_do_tovmsspec(pTHX_ char *path, char *buf, int ts) { } /* end of do_tovmsspec() */ /*}}}*/ /* External entry points */ -char *Perl_tovmsspec(pTHX_ char *path, char *buf) { return do_tovmsspec(path,buf,0); } -char *Perl_tovmsspec_ts(pTHX_ char *path, char *buf) { return do_tovmsspec(path,buf,1); } +char *Perl_tovmsspec(pTHX_ const char *path, char *buf) { return do_tovmsspec(path,buf,0); } +char *Perl_tovmsspec_ts(pTHX_ const char *path, char *buf) { return do_tovmsspec(path,buf,1); } /*{{{ char *tovmspath[_ts](char *path, char *buf)*/ -static char *mp_do_tovmspath(pTHX_ char *path, char *buf, int ts) { +static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) { static char __tovmspath_retbuf[NAM$C_MAXRSS+1]; int vmslen; char pathified[NAM$C_MAXRSS+1], vmsified[NAM$C_MAXRSS+1], *cp; @@ -3247,7 +6235,7 @@ static char *mp_do_tovmspath(pTHX_ char *path, char *buf, int ts) { if (buf) return buf; else if (ts) { vmslen = strlen(vmsified); - New(1317,cp,vmslen+1,char); + Newx(cp,vmslen+1,char); memcpy(cp,vmsified,vmslen); cp[vmslen] = '\0'; return cp; @@ -3260,12 +6248,12 @@ static char *mp_do_tovmspath(pTHX_ char *path, char *buf, int ts) { } /* end of do_tovmspath() */ /*}}}*/ /* External entry points */ -char *Perl_tovmspath(pTHX_ char *path, char *buf) { return do_tovmspath(path,buf,0); } -char *Perl_tovmspath_ts(pTHX_ char *path, char *buf) { return do_tovmspath(path,buf,1); } +char *Perl_tovmspath(pTHX_ const char *path, char *buf) { return do_tovmspath(path,buf,0); } +char *Perl_tovmspath_ts(pTHX_ const char *path, char *buf) { return do_tovmspath(path,buf,1); } /*{{{ char *tounixpath[_ts](char *path, char *buf)*/ -static char *mp_do_tounixpath(pTHX_ char *path, char *buf, int ts) { +static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts) { static char __tounixpath_retbuf[NAM$C_MAXRSS+1]; int unixlen; char pathified[NAM$C_MAXRSS+1], unixified[NAM$C_MAXRSS+1], *cp; @@ -3276,7 +6264,7 @@ static char *mp_do_tounixpath(pTHX_ char *path, char *buf, int ts) { if (buf) return buf; else if (ts) { unixlen = strlen(unixified); - New(1317,cp,unixlen+1,char); + Newx(cp,unixlen+1,char); memcpy(cp,unixified,unixlen); cp[unixlen] = '\0'; return cp; @@ -3289,8 +6277,8 @@ static char *mp_do_tounixpath(pTHX_ char *path, char *buf, int ts) { } /* end of do_tounixpath() */ /*}}}*/ /* External entry points */ -char *Perl_tounixpath(pTHX_ char *path, char *buf) { return do_tounixpath(path,buf,0); } -char *Perl_tounixpath_ts(pTHX_ char *path, char *buf) { return do_tounixpath(path,buf,1); } +char *Perl_tounixpath(pTHX_ const char *path, char *buf) { return do_tounixpath(path,buf,0); } +char *Perl_tounixpath_ts(pTHX_ const char *path, char *buf) { return do_tounixpath(path,buf,1); } /* * @(#)argproc.c 2.2 94/08/16 Mark Pizzolato (mark@infocomm.com) @@ -3340,9 +6328,9 @@ static void mp_expand_wild_cards(pTHX_ char *item, struct list_item **tail, int *count); -static int background_process(int argc, char **argv); +static int background_process(pTHX_ int argc, char **argv); -static void pipe_and_fork(char **cmargv); +static void pipe_and_fork(pTHX_ char **cmargv); /*{{{ void getredirection(int *ac, char ***av)*/ static void @@ -3390,11 +6378,11 @@ mp_getredirection(pTHX_ int *ac, char ***av) */ ap = argv[argc-1]; if (0 == strcmp("&", ap)) - exit(background_process(--argc, argv)); + exit(background_process(aTHX_ --argc, argv)); if (*ap && '&' == ap[strlen(ap)-1]) { ap[strlen(ap)-1] = '\0'; - exit(background_process(argc, argv)); + exit(background_process(aTHX_ argc, argv)); } /* * Now we handle the general redirection cases that involve '>', '>>', @@ -3406,7 +6394,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) { if (j+1 >= argc) { - PerlIO_printf(Perl_debug_log,"No input file after < on command line"); + fprintf(stderr,"No input file after < on command line"); exit(LIB$_WRONUMARG); } in = argv[++j]; @@ -3421,7 +6409,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) { if (j+1 >= argc) { - PerlIO_printf(Perl_debug_log,"No output file after > on command line"); + fprintf(stderr,"No output file after > on command line"); exit(LIB$_WRONUMARG); } out = argv[++j]; @@ -3441,7 +6429,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) out = 1 + ap; if (j >= argc) { - PerlIO_printf(Perl_debug_log,"No output file after > or >> on command line"); + fprintf(stderr,"No output file after > or >> on command line"); exit(LIB$_WRONUMARG); } continue; @@ -3463,7 +6451,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) err = 2 + ap; if (j >= argc) { - PerlIO_printf(Perl_debug_log,"No output file after 2> or 2>> on command line"); + fprintf(stderr,"No output file after 2> or 2>> on command line"); exit(LIB$_WRONUMARG); } continue; @@ -3472,7 +6460,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) { if (j+1 >= argc) { - PerlIO_printf(Perl_debug_log,"No command into which to pipe on command line"); + fprintf(stderr,"No command into which to pipe on command line"); exit(LIB$_WRONUMARG); } cmargc = argc-(j+1); @@ -3494,7 +6482,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) * Allocate and fill in the new argument vector, Some Unix's terminate * the list with an extra null pointer. */ - New(1302, argv, item_count+1, char *); + Newx(argv, item_count+1, char *); *av = argv; for (j = 0; j < item_count; ++j, list_head = list_head->next) argv[j] = list_head->value; @@ -3503,10 +6491,10 @@ mp_getredirection(pTHX_ int *ac, char ***av) { if (out != NULL) { - PerlIO_printf(Perl_debug_log,"'|' and '>' may not both be specified on command line"); + fprintf(stderr,"'|' and '>' may not both be specified on command line"); exit(LIB$_INVARGORD); } - pipe_and_fork(cmargv); + pipe_and_fork(aTHX_ cmargv); } /* Check for input from a pipe (mailbox) */ @@ -3522,7 +6510,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) /* Input from a pipe, reopen it in binary mode to disable */ /* carriage control processing. */ - PerlIO_getname(stdin, mbxname); + fgetname(stdin, mbxname); mbxnam.dsc$a_pointer = mbxname; mbxnam.dsc$w_length = strlen(mbxnam.dsc$a_pointer); lib$getdvi(&dvi_item, 0, &mbxnam, &bufsize, 0, 0); @@ -3536,35 +6524,39 @@ mp_getredirection(pTHX_ int *ac, char ***av) freopen(mbxname, "rb", stdin); if (errno != 0) { - PerlIO_printf(Perl_debug_log,"Can't reopen input pipe (name: %s) in binary mode",mbxname); + fprintf(stderr,"Can't reopen input pipe (name: %s) in binary mode",mbxname); exit(vaxc$errno); } } if ((in != NULL) && (NULL == freopen(in, "r", stdin, "mbc=32", "mbf=2"))) { - PerlIO_printf(Perl_debug_log,"Can't open input file %s as stdin",in); + fprintf(stderr,"Can't open input file %s as stdin",in); exit(vaxc$errno); } if ((out != NULL) && (NULL == freopen(out, outmode, stdout, "mbc=32", "mbf=2"))) { - PerlIO_printf(Perl_debug_log,"Can't open output file %s as stdout",out); + fprintf(stderr,"Can't open output file %s as stdout",out); exit(vaxc$errno); } + if (out != NULL) Perl_vmssetuserlnm(aTHX_ "SYS$OUTPUT",out); + if (err != NULL) { if (strcmp(err,"&1") == 0) { - dup2(fileno(stdout), fileno(Perl_debug_log)); + dup2(fileno(stdout), fileno(stderr)); + Perl_vmssetuserlnm(aTHX_ "SYS$ERROR","SYS$OUTPUT"); } else { FILE *tmperr; if (NULL == (tmperr = fopen(err, errmode, "mbc=32", "mbf=2"))) { - PerlIO_printf(Perl_debug_log,"Can't open error file %s as stderr",err); + fprintf(stderr,"Can't open error file %s as stderr",err); exit(vaxc$errno); } fclose(tmperr); - if (NULL == freopen(err, "a", Perl_debug_log, "mbc=32", "mbf=2")) + if (NULL == freopen(err, "a", stderr, "mbc=32", "mbf=2")) { exit(vaxc$errno); } + Perl_vmssetuserlnm(aTHX_ "SYS$ERROR",err); } } #ifdef ARGPROC_DEBUG @@ -3585,11 +6577,11 @@ static void add_item(struct list_item **head, { if (*head == 0) { - New(1303,*head,1,struct list_item); + Newx(*head,1,struct list_item); *tail = *head; } else { - New(1304,(*tail)->next,1,struct list_item); + Newx((*tail)->next,1,struct list_item); *tail = (*tail)->next; } (*tail)->value = value; @@ -3604,6 +6596,7 @@ static void mp_expand_wild_cards(pTHX_ char *item, int expcount = 0; unsigned long int context = 0; int isunix = 0; +int item_len = 0; char *had_version; char *had_device; int had_directory; @@ -3623,6 +6616,20 @@ unsigned long int zero = 0, sts; add_item(head, tail, item, count); return; } + else + { + /* "double quoted" wild card expressions pass as is */ + /* From DCL that means using e.g.: */ + /* perl program """perl.*""" */ + item_len = strlen(item); + if ( '"' == *item && '"' == item[item_len-1] ) + { + item++; + item[item_len-2] = '\0'; + add_item(head, tail, item, count); + return; + } + } resultspec.dsc$b_dtype = DSC$K_DTYPE_T; resultspec.dsc$b_class = DSC$K_CLASS_D; resultspec.dsc$a_pointer = NULL; @@ -3647,11 +6654,11 @@ unsigned long int zero = 0, sts; char *string; char *c; - New(1305,string,resultspec.dsc$w_length+1,char); + Newx(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) - *((char *)strrchr(string, ';')) = '\0'; + *(strrchr(string, ';')) = '\0'; if ((!had_directory) && (had_device == NULL)) { if (NULL == (devdir = strrchr(string, ']'))) @@ -3662,9 +6669,11 @@ unsigned long int zero = 0, sts; * Be consistent with what the C RTL has already done to the rest of * the argv items and lowercase all of these names. */ - for (c = string; *c; ++c) + if (!decc_efs_case_preserve) { + for (c = string; *c; ++c) if (isupper(*c)) *c = tolower(*c); + } if (isunix) trim_unixpath(string,item,1); add_item(head, tail, string, count); ++expcount; @@ -3735,44 +6744,58 @@ static struct exit_control_block exit_block = 0 }; -static void pipe_and_fork(char **cmargv) +static void +pipe_and_fork(pTHX_ char **cmargv) { - char subcmd[2048]; - $DESCRIPTOR(cmddsc, ""); - static char mbxname[64]; - $DESCRIPTOR(mbxdsc, mbxname); - int pid, j; - unsigned long int zero = 0, one = 1; - - strcpy(subcmd, cmargv[0]); - for (j = 1; NULL != cmargv[j]; ++j) - { - strcat(subcmd, " \""); - strcat(subcmd, cmargv[j]); - strcat(subcmd, "\""); + PerlIO *fp; + struct dsc$descriptor_s *vmscmd; + char subcmd[2*MAX_DCL_LINE_LENGTH], *p, *q; + int sts, j, l, ismcr, quote, tquote = 0; + + sts = setup_cmddsc(aTHX_ cmargv[0],0,"e,&vmscmd); + vms_execfree(vmscmd); + + j = l = 0; + p = subcmd; + q = cmargv[0]; + ismcr = q && toupper(*q) == 'M' && toupper(*(q+1)) == 'C' + && toupper(*(q+2)) == 'R' && !*(q+3); + + while (q && l < MAX_DCL_LINE_LENGTH) { + if (!*q) { + if (j > 0 && quote) { + *p++ = '"'; + l++; + } + q = cmargv[++j]; + if (q) { + if (ismcr && j > 1) quote = 1; + tquote = (strchr(q,' ')) != NULL || *q == '\0'; + *p++ = ' '; + l++; + if (quote || tquote) { + *p++ = '"'; + l++; + } + } + } else { + if ((quote||tquote) && *q == '"') { + *p++ = '"'; + l++; } - cmddsc.dsc$a_pointer = subcmd; - cmddsc.dsc$w_length = strlen(cmddsc.dsc$a_pointer); + *p++ = *q++; + l++; + } + } + *p = '\0'; - create_mbx(&child_chan,&mbxdsc); -#ifdef ARGPROC_DEBUG - PerlIO_printf(Perl_debug_log, "Pipe Mailbox Name = '%s'\n", mbxdsc.dsc$a_pointer); - PerlIO_printf(Perl_debug_log, "Sub Process Command = '%s'\n", cmddsc.dsc$a_pointer); -#endif - _ckvmssts_noperl(lib$spawn(&cmddsc, &mbxdsc, 0, &one, - 0, &pid, child_st, &zero, sig_child, - &child_chan)); -#ifdef ARGPROC_DEBUG - PerlIO_printf(Perl_debug_log, "Subprocess's Pid = %08X\n", pid); -#endif - sys$dclexh(&exit_block); - if (NULL == freopen(mbxname, "wb", stdout)) - { - PerlIO_printf(Perl_debug_log,"Can't open output pipe (name %s)",mbxname); + fp = safe_popen(aTHX_ subcmd,"wbF",&sts); + if (fp == Nullfp) { + PerlIO_printf(Perl_debug_log,"Can't open output pipe (status %d)",sts); } } -static int background_process(int argc, char **argv) +static int background_process(pTHX_ int argc, char **argv) { char command[2048] = "$"; $DESCRIPTOR(value, ""); @@ -3834,17 +6857,23 @@ vms_image_init(int *argcp, char ***argvp) 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; - dTHX; +#if defined(PERL_IMPLICIT_CONTEXT) + pTHX = NULL; +#endif 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]); +#ifdef KILL_BY_SIGPRC + Perl_csighandler_init(); +#endif + + _ckvmssts_noperl(sys$getjpiw(0,NULL,NULL,jpilist,iosb,NULL,NULL)); + _ckvmssts_noperl(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. */ + _ckvmssts_noperl(sys$setprv(0,iprv,0,NULL)); /* Turn 'em off. */ will_taint = TRUE; break; } @@ -3867,10 +6896,10 @@ vms_image_init(int *argcp, char ***argvp) exit(SS$_ABORT); } if (jpilist[1].bufadr != rlst) Safefree(jpilist[1].bufadr); - jpilist[1].bufadr = New(1320,mask,rsz,unsigned long int); + jpilist[1].bufadr = Newx(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]); + _ckvmssts_noperl(sys$getjpiw(0,NULL,NULL,&jpilist[1],iosb,NULL,NULL)); + _ckvmssts_noperl(iosb[0]); } mask = jpilist[1].bufadr; /* Check attribute flags for each identifier (2nd longword); protected @@ -3884,20 +6913,51 @@ vms_image_init(int *argcp, char ***argvp) } if (mask != rlst) Safefree(mask); } + + /* When Perl is in decc_filename_unix_report mode and is run from a concealed + * logical, some versions of the CRTL will add a phanthom /000000/ + * directory. This needs to be removed. + */ + if (decc_filename_unix_report) { + char * zeros; + int ulen; + ulen = strlen(argvp[0][0]); + if (ulen > 7) { + zeros = strstr(argvp[0][0], "/000000/"); + if (zeros != NULL) { + int mlen; + mlen = ulen - (zeros - argvp[0][0]) - 7; + memmove(zeros, &zeros[7], mlen); + ulen = ulen - 7; + argvp[0][0][ulen] = '\0'; + } + } + /* It also may have a trailing dot that needs to be removed otherwise + * it will be converted to VMS mode incorrectly. + */ + ulen--; + if ((argvp[0][0][ulen] == '.') && (decc_readdir_dropdotnotype)) + argvp[0][0][ulen] = '\0'; + } + /* 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 **); + char **newargv, **oldargv; + oldargv = *argvp; + Newx(newargv,(*argcp)+2,char *); + newargv[0] = oldargv[0]; + Newx(newargv[1],3,char); + strcpy(newargv[1], "-T"); + Copy(&oldargv[1],&newargv[2],(*argcp)-1,char **); + (*argcp)++; + newargv[*argcp] = NULL; /* 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; + *argvp = newargv; } else { /* Did user explicitly request tainting? */ int i; @@ -3916,25 +6976,25 @@ vms_image_init(int *argcp, char ***argvp) for (tabidx = 0; len = my_trnlnm("PERL_ENV_TABLES",eqv,tabidx); tabidx++) { - if (!tabidx) New(1321,tabvec,tabct,struct dsc$descriptor_s *); + if (!tabidx) Newx(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); + Newx(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])); + _ckvmssts_noperl(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) +#if defined(USE_ITHREADS) && ( defined(__DECC) || defined(__DECCXX) ) { # include - (void) decc$set_reentrancy(C$C_MULTITHREAD); + decc$set_reentrancy(C$C_MULTITHREAD); } #endif return; @@ -3959,18 +7019,21 @@ vms_image_init(int *argcp, char ***argvp) */ /*{{{int trim_unixpath(char *fspec, char *wildspec, int opts)*/ int -Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) +Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) { char unixified[NAM$C_MAXRSS+1], unixwild[NAM$C_MAXRSS+1], *template, *base, *end, *cp1, *cp2; register int tmplen, reslen = 0, dirs = 0; if (!wildspec || !fspec) return 0; + template = unixwild; if (strpbrk(wildspec,"]>:") != NULL) { if (do_tounixspec(wildspec,unixwild,0) == NULL) return 0; - else template = unixwild; } - else template = wildspec; + else { + strncpy(unixwild, wildspec, NAM$C_MAXRSS); + unixwild[NAM$C_MAXRSS] = 0; + } if (strpbrk(fspec,"]>:") != NULL) { if (do_tounixspec(fspec,unixified,0) == NULL) return 0; else base = unixified; @@ -4019,12 +7082,14 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) * 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; + if (!decc_efs_case_preserve) { + 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); + memmove(fspec,cp2+1,end - cp2); return 1; } } @@ -4033,8 +7098,10 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) for (front = end ; front >= base; front--) if (*front == '/' && !dirs--) { front++; break; } } - for (cp1=template,cp2=lcres; *cp1 && cp2 <= lcres + sizeof lcres; + if (!decc_efs_case_preserve) { + 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 */ @@ -4054,7 +7121,14 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) 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 */ + else { + if (!decc_efs_case_preserve) { + *cp2 = _tolower(*cp1); /* else lowercase for match */ + } + else { + *cp2 = *cp1; /* else preserve case for match */ + } + } if (*cp2 == '/') segdirs++; } if (cp1 != ellipsis - 1) return 0; /* Path too long */ @@ -4082,18 +7156,20 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) 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; + if (!decc_efs_case_preserve) { + 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); + memmove(fspec,cp2+1,end - cp2); return 1; } /* Nope -- stick with lcfront from above and keep going. */ } } - memcpy(fspec,base + (lcfront - lcres), lcend - lcfront + 1); + memmove(fspec,base + (lcfront - lcres), lcend - lcfront + 1); return 1; ellipsis = nextell; } @@ -4110,6 +7186,18 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) * Minor modifications to original routines. */ +/* readdir may have been redefined by reentr.h, so make sure we get + * the local version for what we do here. + */ +#ifdef readdir +# undef readdir +#endif +#if !defined(PERL_IMPLICIT_CONTEXT) +# define readdir Perl_readdir +#else +# define readdir(a) Perl_readdir(aTHX_ a) +#endif + /* Number of elements in vms_versions array */ #define VERSIZE(e) (sizeof e->vms_versions / sizeof e->vms_versions[0]) @@ -4117,31 +7205,34 @@ Perl_trim_unixpath(pTHX_ char *fspec, char *wildspec, int opts) * Open a directory, return a handle for later use. */ /*{{{ DIR *opendir(char*name) */ -DIR * -Perl_opendir(pTHX_ char *name) +MY_DIR * +Perl_opendir(pTHX_ const char *name) { - DIR *dd; + MY_DIR *dd; char dir[NAM$C_MAXRSS+1]; Stat_t sb; if (do_tovmspath(name,dir,0) == NULL) { return NULL; } + /* Check access before stat; otherwise stat does not + * accurately report whether it's a directory. + */ + if (!cando_by_name(S_IRUSR,0,dir)) { + /* cando_by_name has already set errno */ + 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; - } /* Get memory for the handle, and the pattern. */ - New(1306,dd,1,DIR); - New(1307,dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); + Newx(dd,1,MY_DIR); + Newx(dd->pattern,strlen(dir)+sizeof "*.*" + 1,char); /* Fill in the fields; mainly playing with the descriptor. */ - (void)sprintf(dd->pattern, "%s*.*",dir); + sprintf(dd->pattern, "%s*.*",dir); dd->context = 0; dd->count = 0; dd->vms_wantversions = 0; @@ -4149,6 +7240,12 @@ Perl_opendir(pTHX_ char *name) dd->pat.dsc$w_length = strlen(dd->pattern); dd->pat.dsc$b_dtype = DSC$K_DTYPE_T; dd->pat.dsc$b_class = DSC$K_CLASS_S; +#if defined(USE_ITHREADS) + Newx(dd->mutex,1,perl_mutex); + MUTEX_INIT( (perl_mutex *) dd->mutex ); +#else + dd->mutex = NULL; +#endif return dd; } /* end of opendir() */ @@ -4159,7 +7256,7 @@ Perl_opendir(pTHX_ char *name) */ /*{{{ void vmsreaddirversions(DIR *dd, int flag)*/ void -vmsreaddirversions(DIR *dd, int flag) +vmsreaddirversions(MY_DIR *dd, int flag) { dd->vms_wantversions = flag; } @@ -4170,11 +7267,17 @@ vmsreaddirversions(DIR *dd, int flag) */ /*{{{ void closedir(DIR *dd)*/ void -closedir(DIR *dd) +Perl_closedir(MY_DIR *dd) { - (void)lib$find_file_end(&dd->context); + int sts; + + sts = lib$find_file_end(&dd->context); Safefree(dd->pattern); - Safefree((char *)dd); +#if defined(USE_ITHREADS) + MUTEX_DESTROY( (perl_mutex *) dd->mutex ); + Safefree(dd->mutex); +#endif + Safefree(dd); } /*}}}*/ @@ -4182,25 +7285,23 @@ closedir(DIR *dd) * Collect all the version numbers for the current file. */ static void -collectversions(dd) - DIR *dd; +collectversions(pTHX_ MY_DIR *dd) { struct dsc$descriptor_s pat; struct dsc$descriptor_s res; - struct dirent *e; + struct my_dirent *e; char *p, *text, buff[sizeof dd->entry.d_name]; int i; unsigned long context, tmpsts; - dTHX; /* Convenient shorthand. */ e = &dd->entry; /* Add the version wildcard, ignoring the "*.*" put on before */ i = strlen(dd->pattern); - New(1308,text,i + e->d_namlen + 3,char); - (void)strcpy(text, dd->pattern); - (void)sprintf(&text[i - 3], "%s;*", e->d_name); + Newx(text,i + e->d_namlen + 3,char); + strcpy(text, dd->pattern); + sprintf(&text[i - 3], "%s;*", e->d_name); /* Set up the pattern descriptor. */ pat.dsc$a_pointer = text; @@ -4237,8 +7338,8 @@ collectversions(dd) * Read the next entry from the directory. */ /*{{{ struct dirent *readdir(DIR *dd)*/ -struct dirent * -readdir(DIR *dd) +struct my_dirent * +Perl_readdir(pTHX_ MY_DIR *dd) { struct dsc$descriptor_s res; char *p, buff[sizeof dd->entry.d_name]; @@ -4269,32 +7370,63 @@ 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'; + if (!decc_efs_case_preserve) { + buff[sizeof buff - 1] = '\0'; + for (p = buff; *p; p++) *p = _tolower(*p); + while (--p >= buff) if (!isspace(*p)) break; /* Do we really need this? */ + *p = '\0'; + } + else { + /* we don't want to force to lowercase, just null terminate */ + buff[res.dsc$w_length] = '\0'; + } 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. */ - if ((p = strchr(buff, ']'))) (void)strcpy(dd->entry.d_name, p + 1); - else (void)strcpy(dd->entry.d_name, buff); + if ((p = strchr(buff, ']'))) strcpy(dd->entry.d_name, p + 1); + else strcpy(dd->entry.d_name, buff); /* Clobber the version. */ if ((p = strchr(dd->entry.d_name, ';'))) *p = '\0'; dd->entry.d_namlen = strlen(dd->entry.d_name); dd->entry.vms_verscount = 0; - if (dd->vms_wantversions) collectversions(dd); + if (dd->vms_wantversions) collectversions(aTHX_ dd); return &dd->entry; } /* end of readdir() */ /*}}}*/ /* + * Read the next entry from the directory -- thread-safe version. + */ +/*{{{ int readdir_r(DIR *dd, struct dirent *entry, struct dirent **result)*/ +int +Perl_readdir_r(pTHX_ MY_DIR *dd, struct my_dirent *entry, struct my_dirent **result) +{ + int retval; + + MUTEX_LOCK( (perl_mutex *) dd->mutex ); + + entry = readdir(dd); + *result = entry; + retval = ( *result == NULL ? errno : 0 ); + + MUTEX_UNLOCK( (perl_mutex *) dd->mutex ); + + return retval; + +} /* end of readdir_r() */ +/*}}}*/ + +/* * Return something that can be used in a seekdir later. */ /*{{{ long telldir(DIR *dd)*/ long -telldir(DIR *dd) +Perl_telldir(MY_DIR *dd) { return dd->count; } @@ -4305,10 +7437,9 @@ telldir(DIR *dd) */ /*{{{ void seekdir(DIR *dd,long count)*/ void -seekdir(DIR *dd, long count) +Perl_seekdir(pTHX_ MY_DIR *dd, long count) { int vms_wantversions; - dTHX; /* If we haven't done anything yet... */ if (dd->count == 0) @@ -4322,7 +7453,7 @@ seekdir(DIR *dd, long count) /* The increment is in readdir(). */ for (dd->count = 0; dd->count < count; ) - (void)readdir(dd); + readdir(dd); dd->vms_wantversions = vms_wantversions; @@ -4336,7 +7467,7 @@ seekdir(DIR *dd, long count) * * vms_do_aexec() and vms_do_exec() are called in response to the * perl 'exec' function. If this follows a vfork call, then they - * call out the the regular perl routines in doio.c which do an + * call out the regular perl routines in doio.c which do an * execvp (for those who really want to try this under VMS). * Otherwise, they do exactly what the perl docs say exec should * do - terminate the current script and invoke a new command @@ -4349,7 +7480,7 @@ 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 handed off to DCL directly. Otherwise, + * 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 if found, the resultant @@ -4372,22 +7503,19 @@ my_vfork() static void -vms_execfree(pTHX) { - if (PL_Cmd) { - if (PL_Cmd != VMScmd.dsc$a_pointer) Safefree(PL_Cmd); - PL_Cmd = Nullch; - } - if (VMScmd.dsc$a_pointer) { - Safefree(VMScmd.dsc$a_pointer); - VMScmd.dsc$w_length = 0; - VMScmd.dsc$a_pointer = Nullch; +vms_execfree(struct dsc$descriptor_s *vmscmd) +{ + if (vmscmd) { + if (vmscmd->dsc$a_pointer) { + Safefree(vmscmd->dsc$a_pointer); + } + Safefree(vmscmd); } } static char * -setup_argstr(SV *really, SV **mark, SV **sp) +setup_argstr(pTHX_ SV *really, SV **mark, SV **sp) { - dTHX; char *junk, *tmps = Nullch; register size_t cmdlen = 0; size_t rlen; @@ -4409,7 +7537,7 @@ setup_argstr(SV *really, SV **mark, SV **sp) cmdlen += rlen ? rlen + 1 : 0; } } - New(401,PL_Cmd,cmdlen+1,char); + Newx(PL_Cmd,cmdlen+1,char); if (tmps && *tmps) { strcpy(PL_Cmd,tmps); @@ -4430,22 +7558,48 @@ setup_argstr(SV *really, SV **mark, SV **sp) static unsigned long int -setup_cmddsc(char *cmd, int check_img) +setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, + struct dsc$descriptor_s **pvmscmd) { char vmsspec[NAM$C_MAXRSS+1], resspec[NAM$C_MAXRSS+1]; + char image_name[NAM$C_MAXRSS+1]; + char image_argv[NAM$C_MAXRSS+1]; $DESCRIPTOR(defdsc,".EXE"); $DESCRIPTOR(defdsc2,"."); $DESCRIPTOR(resdsc,resspec); + struct dsc$descriptor_s *vmscmd; struct dsc$descriptor_s imgdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; unsigned long int cxt = 0, flags = 1, retsts = SS$_NORMAL; register char *s, *rest, *cp, *wordbreak; + char * cmd; + int cmdlen; register int isdcl; - dTHX; - if (strlen(cmd) > - (sizeof(vmsspec) > sizeof(resspec) ? sizeof(resspec) : sizeof(vmsspec))) - return LIB$_INVARG; + Newx(vmscmd,sizeof(struct dsc$descriptor_s),struct dsc$descriptor_s); + + /* Make a copy for modification */ + cmdlen = strlen(incmd); + Newx(cmd, cmdlen+1, char); + strncpy(cmd, incmd, cmdlen); + cmd[cmdlen] = 0; + image_name[0] = 0; + image_argv[0] = 0; + + vmscmd->dsc$a_pointer = NULL; + vmscmd->dsc$b_dtype = DSC$K_DTYPE_T; + vmscmd->dsc$b_class = DSC$K_CLASS_S; + vmscmd->dsc$w_length = 0; + if (pvmscmd) *pvmscmd = vmscmd; + + if (suggest_quote) *suggest_quote = 0; + + if (strlen(cmd) > MAX_DCL_LINE_LENGTH) { + return CLI$_BUFOVF; /* continuation lines currently unsupported */ + Safefree(cmd); + } + s = cmd; + while (*s && isspace(*s)) s++; if (*s == '@' || *s == '$') { @@ -4476,8 +7630,10 @@ setup_cmddsc(char *cmd, int check_img) * - if it doesn't, caller tells us whether to default to a DCL * command, or to a local image unless told it's DCL (by leading '$') */ - if (*s == '@') isdcl = 1; - else { + if (*s == '@') { + isdcl = 1; + if (suggest_quote) *suggest_quote = 1; + } else { register char *filespec = strpbrk(s,":<[.;"); rest = wordbreak = strpbrk(s," \"\t/"); if (!wordbreak) wordbreak = s + strlen(s); @@ -4493,15 +7649,15 @@ setup_cmddsc(char *cmd, int check_img) if (!(retsts&1)) { _ckvmssts(lib$find_file_end(&cxt)); retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,0,&flags); - if (!(retsts & 1) && *s == '$') { - _ckvmssts(lib$find_file_end(&cxt)); - imgdsc.dsc$a_pointer++; imgdsc.dsc$w_length--; - retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,0,&flags); - if (!(retsts&1)) { - _ckvmssts(lib$find_file_end(&cxt)); - retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,0,&flags); - } - } + if (!(retsts & 1) && *s == '$') { + _ckvmssts(lib$find_file_end(&cxt)); + imgdsc.dsc$a_pointer++; imgdsc.dsc$w_length--; + retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,0,&flags); + if (!(retsts&1)) { + _ckvmssts(lib$find_file_end(&cxt)); + retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,0,&flags); + } + } } _ckvmssts(lib$find_file_end(&cxt)); @@ -4512,34 +7668,180 @@ setup_cmddsc(char *cmd, int check_img) *s = '\0'; /* check that it's really not DCL with no file extension */ - fp = fopen(resspec,"r","ctx=bin,shr=get"); + fp = fopen(resspec,"r","ctx=bin","ctx=rec","shr=get"); if (fp) { - char b[4] = {0,0,0,0}; - read(fileno(fp),b,4); + char b[256] = {0,0,0,0}; + read(fileno(fp), b, 256); isdcl = isprint(b[0]) && isprint(b[1]) && isprint(b[2]) && isprint(b[3]); + if (isdcl) { + int shebang_len; + + /* Check for script */ + shebang_len = 0; + if ((b[0] == '#') && (b[1] == '!')) + shebang_len = 2; +#ifdef ALTERNATE_SHEBANG + else { + shebang_len = strlen(ALTERNATE_SHEBANG); + if (strncmp(b, ALTERNATE_SHEBANG, shebang_len) == 0) { + char * perlstr; + perlstr = strstr("perl",b); + if (perlstr == NULL) + shebang_len = 0; + } + else + shebang_len = 0; + } +#endif + + if (shebang_len > 0) { + int i; + int j; + char tmpspec[NAM$C_MAXRSS + 1]; + + i = shebang_len; + /* Image is following after white space */ + /*--------------------------------------*/ + while (isprint(b[i]) && isspace(b[i])) + i++; + + j = 0; + while (isprint(b[i]) && !isspace(b[i])) { + tmpspec[j++] = b[i++]; + if (j >= NAM$C_MAXRSS) + break; + } + tmpspec[j] = '\0'; + + /* There may be some default parameters to the image */ + /*---------------------------------------------------*/ + j = 0; + while (isprint(b[i])) { + image_argv[j++] = b[i++]; + if (j >= NAM$C_MAXRSS) + break; + } + while ((j > 0) && !isprint(image_argv[j-1])) + j--; + image_argv[j] = 0; + + /* It will need to be converted to VMS format and validated */ + if (tmpspec[0] != '\0') { + char * iname; + + /* Try to find the exact program requested to be run */ + /*---------------------------------------------------*/ + iname = do_rmsexpand + (tmpspec, image_name, 0, ".exe", PERL_RMSEXPAND_M_VMS); + if (iname != NULL) { + if (cando_by_name(S_IXUSR,0,image_name)) { + /* MCR prefix needed */ + isdcl = 0; + } + else { + /* Try again with a null type */ + /*----------------------------*/ + iname = do_rmsexpand + (tmpspec, image_name, 0, ".", PERL_RMSEXPAND_M_VMS); + if (iname != NULL) { + if (cando_by_name(S_IXUSR,0,image_name)) { + /* MCR prefix needed */ + isdcl = 0; + } + } + } + + /* Did we find the image to run the script? */ + /*------------------------------------------*/ + if (isdcl) { + char *tchr; + + /* Assume DCL or foreign command exists */ + /*--------------------------------------*/ + tchr = strrchr(tmpspec, '/'); + if (tchr != NULL) { + tchr++; + } + else { + tchr = tmpspec; + } + strcpy(image_name, tchr); + } + } + } + } + } fclose(fp); } if (check_img && isdcl) return RMS$_FNF; if (cando_by_name(S_IXUSR,0,resspec)) { - New(402,VMScmd.dsc$a_pointer,7 + s - resspec + (rest ? strlen(rest) : 0),char); + Newx(vmscmd->dsc$a_pointer, MAX_DCL_LINE_LENGTH ,char); if (!isdcl) { - strcpy(VMScmd.dsc$a_pointer,"$ MCR "); + strcpy(vmscmd->dsc$a_pointer,"$ MCR "); + if (image_name[0] != 0) { + strcat(vmscmd->dsc$a_pointer, image_name); + strcat(vmscmd->dsc$a_pointer, " "); + } + } else if (image_name[0] != 0) { + strcpy(vmscmd->dsc$a_pointer, image_name); + strcat(vmscmd->dsc$a_pointer, " "); } else { - strcpy(VMScmd.dsc$a_pointer,"@"); + strcpy(vmscmd->dsc$a_pointer,"@"); } - 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; + if (suggest_quote) *suggest_quote = 1; + + /* If there is an image name, use original command */ + if (image_name[0] == 0) + strcat(vmscmd->dsc$a_pointer,resspec); + else { + rest = cmd; + while (*rest && isspace(*rest)) rest++; + } + + if (image_argv[0] != 0) { + strcat(vmscmd->dsc$a_pointer,image_argv); + strcat(vmscmd->dsc$a_pointer, " "); + } + if (rest) { + int rest_len; + int vmscmd_len; + + rest_len = strlen(rest); + vmscmd_len = strlen(vmscmd->dsc$a_pointer); + if ((rest_len + vmscmd_len) < MAX_DCL_LINE_LENGTH) + strcat(vmscmd->dsc$a_pointer,rest); + else + retsts = CLI$_BUFOVF; + } + vmscmd->dsc$w_length = strlen(vmscmd->dsc$a_pointer); + Safefree(cmd); + return (vmscmd->dsc$w_length > MAX_DCL_LINE_LENGTH ? CLI$_BUFOVF : 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; - else VMScmd.dsc$a_pointer = savepvn(cmd,VMScmd.dsc$w_length); + vmscmd->dsc$w_length = strlen(cmd); +/* if (cmd == PL_Cmd) { + vmscmd->dsc$a_pointer = PL_Cmd; + if (suggest_quote) *suggest_quote = 1; + } + else */ + vmscmd->dsc$a_pointer = savepvn(cmd,vmscmd->dsc$w_length); + + Safefree(cmd); + + /* check if it's a symbol (for quoting purposes) */ + if (suggest_quote && !*suggest_quote) { + int iss; + char equiv[LNM$C_NAMLENGTH]; + struct dsc$descriptor_s eqvdsc = {sizeof(equiv), DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + eqvdsc.dsc$a_pointer = equiv; + + iss = lib$get_symbol(vmscmd,&eqvdsc); + if (iss&1 && (*equiv == '$' || *equiv == '@')) *suggest_quote = 1; + } 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 || @@ -4548,16 +7850,15 @@ setup_cmddsc(char *cmd, int check_img) else { _ckvmssts(retsts); } } - return (VMScmd.dsc$w_length > 255 ? CLI$_BUFOVF : retsts); + return (vmscmd->dsc$w_length > MAX_DCL_LINE_LENGTH ? CLI$_BUFOVF : retsts); } /* end of setup_cmddsc() */ /* {{{ bool vms_do_aexec(SV *really,SV **mark,SV **sp) */ bool -vms_do_aexec(SV *really,SV **mark,SV **sp) +Perl_vms_do_aexec(pTHX_ SV *really,SV **mark,SV **sp) { - dTHX; if (sp > mark) { if (vfork_called) { /* this follows a vfork - act Unixish */ vfork_called--; @@ -4568,7 +7869,7 @@ vms_do_aexec(SV *really,SV **mark,SV **sp) else return do_aexec(really,mark,sp); } /* no vfork - act VMSish */ - return vms_do_exec(setup_argstr(really,mark,sp)); + return vms_do_exec(setup_argstr(aTHX_ really,mark,sp)); } @@ -4578,10 +7879,10 @@ vms_do_aexec(SV *really,SV **mark,SV **sp) /* {{{bool vms_do_exec(char *cmd) */ bool -vms_do_exec(char *cmd) +Perl_vms_do_exec(pTHX_ const char *cmd) { + struct dsc$descriptor_s *vmscmd; - dTHX; if (vfork_called) { /* this follows a vfork - act Unixish */ vfork_called--; if (vfork_called < 0) { @@ -4596,8 +7897,8 @@ vms_do_exec(char *cmd) TAINT_ENV(); TAINT_PROPER("exec"); - if ((retsts = setup_cmddsc(cmd,1)) & 1) - retsts = lib$do_command(&VMScmd); + if ((retsts = setup_cmddsc(aTHX_ cmd,1,0,&vmscmd)) & 1) + retsts = lib$do_command(vmscmd); switch (retsts) { case RMS$_FNF: case RMS$_DNF: @@ -4610,7 +7911,7 @@ vms_do_exec(char *cmd) set_errno(EACCES); break; case RMS$_SYN: set_errno(EINVAL); break; - case CLI$_BUFOVF: + case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: set_errno(E2BIG); break; case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ _ckvmssts(retsts); /* fall through */ @@ -4619,10 +7920,10 @@ vms_do_exec(char *cmd) } set_vaxc_errno(retsts); if (ckWARN(WARN_EXEC)) { - Perl_warner(aTHX_ WARN_EXEC,"Can't exec \"%*s\": %s", - VMScmd.dsc$w_length, VMScmd.dsc$a_pointer, Strerror(errno)); + Perl_warner(aTHX_ packWARN(WARN_EXEC),"Can't exec \"%*s\": %s", + vmscmd->dsc$w_length, vmscmd->dsc$a_pointer, Strerror(errno)); } - vms_execfree(aTHX); + vms_execfree(vmscmd); } return FALSE; @@ -4630,14 +7931,13 @@ vms_do_exec(char *cmd) } /* end of vms_do_exec() */ /*}}}*/ -unsigned long int do_spawn(char *); +unsigned long int Perl_do_spawn(pTHX_ const char *); /* {{{ unsigned long int do_aspawn(void *really,void **mark,void **sp) */ unsigned long int -do_aspawn(void *really,void **mark,void **sp) +Perl_do_aspawn(pTHX_ void *really,void **mark,void **sp) { - dTHX; - if (sp > mark) return do_spawn(setup_argstr((SV *)really,(SV **)mark,(SV **)sp)); + if (sp > mark) return do_spawn(setup_argstr(aTHX_ (SV *)really,(SV **)mark,(SV **)sp)); return SS$_ABORT; } /* end of do_aspawn() */ @@ -4645,54 +7945,102 @@ do_aspawn(void *really,void **mark,void **sp) /* {{{unsigned long int do_spawn(char *cmd) */ unsigned long int -do_spawn(char *cmd) +Perl_do_spawn(pTHX_ const char *cmd) { - unsigned long int sts, substs, hadcmd = 1; - dTHX; + unsigned long int sts, substs; TAINT_ENV(); TAINT_PROPER("spawn"); if (!cmd || !*cmd) { - hadcmd = 0; sts = lib$spawn(0,0,0,0,0,0,&substs,0,0,0,0,0,0); + if (!(sts & 1)) { + switch (sts) { + case RMS$_FNF: case RMS$_DNF: + set_errno(ENOENT); break; + case RMS$_DIR: + set_errno(ENOTDIR); break; + case RMS$_DEV: + set_errno(ENODEV); break; + case RMS$_PRV: + set_errno(EACCES); break; + case RMS$_SYN: + set_errno(EINVAL); break; + case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: + 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)) { + Perl_warner(aTHX_ packWARN(WARN_EXEC),"Can't spawn: %s", + Strerror(errno)); + } + } + sts = substs; } - else if ((sts = setup_cmddsc(cmd,0)) & 1) { - sts = lib$spawn(&VMScmd,0,0,0,0,0,&substs,0,0,0,0,0,0); + else { + PerlIO * fp; + fp = safe_popen(aTHX_ cmd, "nW", (int *)&sts); + if (fp != NULL) + my_pclose(fp); } - - if (!(sts & 1)) { - switch (sts) { - case RMS$_FNF: case RMS$_DNF: - set_errno(ENOENT); break; - case RMS$_DIR: - set_errno(ENOTDIR); break; - case RMS$_DEV: - set_errno(ENODEV); 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)) { - Perl_warner(aTHX_ WARN_EXEC,"Can't spawn \"%*s\": %s", - hadcmd ? VMScmd.dsc$w_length : 0, - hadcmd ? VMScmd.dsc$a_pointer : "", - Strerror(errno)); - } + return sts; +} /* end of do_spawn() */ +/*}}}*/ + + +static unsigned int *sockflags, sockflagsize; + +/* + * Shim fdopen to identify sockets for my_fwrite later, since the stdio + * routines found in some versions of the CRTL can't deal with sockets. + * We don't shim the other file open routines since a socket isn't + * likely to be opened by a name. + */ +/*{{{ FILE *my_fdopen(int fd, const char *mode)*/ +FILE *my_fdopen(int fd, const char *mode) +{ + FILE *fp = fdopen(fd, mode); + + if (fp) { + unsigned int fdoff = fd / sizeof(unsigned int); + Stat_t sbuf; /* native stat; we don't need flex_stat */ + if (!sockflagsize || fdoff > sockflagsize) { + if (sockflags) Renew( sockflags,fdoff+2,unsigned int); + else Newx (sockflags,fdoff+2,unsigned int); + memset(sockflags+sockflagsize,0,fdoff + 2 - sockflagsize); + sockflagsize = fdoff + 2; + } + if (fstat(fd, (struct stat *)&sbuf) == 0 && S_ISSOCK(sbuf.st_mode)) + sockflags[fdoff] |= 1 << (fd % sizeof(unsigned int)); } - vms_execfree(aTHX); - return substs; + return fp; -} /* end of do_spawn() */ +} +/*}}}*/ + + +/* + * Clear the corresponding bit when the (possibly) socket stream is closed. + * There still a small hole: we miss an implicit close which might occur + * via freopen(). >> Todo + */ +/*{{{ int my_fclose(FILE *fp)*/ +int my_fclose(FILE *fp) { + if (fp) { + unsigned int fd = fileno(fp); + unsigned int fdoff = fd / sizeof(unsigned int); + + if (sockflagsize && fdoff <= sockflagsize) + sockflags[fdoff] &= ~(1 << fd % sizeof(unsigned int)); + } + return fclose(fp); +} /*}}}*/ + /* * A simple fwrite replacement which outputs itmsz*nitm chars without * introducing record boundaries every itmsz chars. @@ -4701,15 +8049,23 @@ do_spawn(char *cmd) * data with nulls sprinkled in the middle but also data with no null * byte at the end. */ -/*{{{ int my_fwrite(void *src, size_t itmsz, size_t nitm, FILE *dest)*/ +/*{{{ int my_fwrite(const void *src, size_t itmsz, size_t nitm, FILE *dest)*/ int -my_fwrite(void *src, size_t itmsz, size_t nitm, FILE *dest) +my_fwrite(const void *src, size_t itmsz, size_t nitm, FILE *dest) { register char *cp, *end, *cpd, *data; + register unsigned int fd = fileno(dest); + register unsigned int fdoff = fd / sizeof(unsigned int); int retval; - int bufsize = itmsz*nitm+1; + int bufsize = itmsz * nitm + 1; + + if (fdoff < sockflagsize && + (sockflags[fdoff] | 1 << (fd % sizeof(unsigned int)))) { + if (write(fd, src, itmsz * nitm) == EOF) return EOF; + return nitm; + } - _ckvmssts_noperl(lib$get_vm( &bufsize, &data )); + _ckvmssts_noperl(lib$get_vm(&bufsize, &data)); memcpy( data, src, itmsz*nitm ); data[itmsz*nitm] = '\0'; @@ -4725,7 +8081,7 @@ my_fwrite(void *src, size_t itmsz, size_t nitm, FILE *dest) cpd = cp + 1; } - if (data) _ckvmssts_noperl(lib$free_vm( &bufsize, &data )); + if (data) _ckvmssts_noperl(lib$free_vm(&bufsize, &data)); return retval; } /* end of my_fwrite() */ @@ -4733,7 +8089,7 @@ my_fwrite(void *src, size_t itmsz, size_t nitm, FILE *dest) /*{{{ int my_flush(FILE *fp)*/ int -my_flush(FILE *fp) +Perl_my_flush(pTHX_ FILE *fp) { int res; if ((res = fflush(fp)) == 0 && fp) { @@ -4814,9 +8170,8 @@ static char __pw_namecache[UAI$S_IDENT+1]; /* * This routine does most of the work extracting the user information. */ -static int fillpasswd (const char *name, struct passwd *pwd) +static int fillpasswd (pTHX_ const char *name, struct passwd *pwd) { - dTHX; static struct { unsigned char length; char pw_gecos[UAI$S_OWNER+1]; @@ -4852,7 +8207,7 @@ static int fillpasswd (const char *name, struct passwd *pwd) name_desc.dsc$w_length= strlen(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; + name_desc.dsc$a_pointer= (char *) name; /* read only pointer */ /* Note that sys$getuai returns many fields as counted strings. */ sts= sys$getuai(0, 0, &name_desc, &itmlst, 0, 0, 0); @@ -4888,7 +8243,8 @@ static int fillpasswd (const char *name, struct passwd *pwd) } else strcpy(pwd->pw_unixdir, pwd->pw_dir); - __mystrtolower(pwd->pw_unixdir); + if (!decc_efs_case_preserve) + __mystrtolower(pwd->pw_unixdir); return 1; } @@ -4896,15 +8252,14 @@ static int fillpasswd (const char *name, struct passwd *pwd) * Get information for a named user. */ /*{{{struct passwd *getpwnam(char *name)*/ -struct passwd *my_getpwnam(char *name) +struct passwd *Perl_my_getpwnam(pTHX_ const char *name) { struct dsc$descriptor_s name_desc; union uicdef uic; unsigned long int status, sts; - dTHX; __pwdcache = __passwd_empty; - if (!fillpasswd(name, &__pwdcache)) { + if (!fillpasswd(aTHX_ name, &__pwdcache)) { /* We still may be able to determine pw_uid and pw_gid */ name_desc.dsc$w_length= strlen(name); name_desc.dsc$b_dtype= DSC$K_DTYPE_T; @@ -4935,13 +8290,12 @@ struct passwd *my_getpwnam(char *name) * Called by my_getpwent with uid=-1 to list all users. */ /*{{{struct passwd *my_getpwuid(Uid_t uid)*/ -struct passwd *my_getpwuid(Uid_t uid) +struct passwd *Perl_my_getpwuid(pTHX_ Uid_t uid) { const $DESCRIPTOR(name_desc,__pw_namecache); unsigned short lname; union uicdef uic; unsigned long int status; - dTHX; if (uid == (unsigned int) -1) { do { @@ -4981,7 +8335,7 @@ struct passwd *my_getpwuid(Uid_t uid) __pwdcache.pw_uid = uic.uic$l_uic; __pwdcache.pw_gid = uic.uic$v_group; - fillpasswd(__pw_namecache, &__pwdcache); + fillpasswd(aTHX_ __pw_namecache, &__pwdcache); return &__pwdcache; } /* end of my_getpwuid() */ @@ -4991,7 +8345,7 @@ struct passwd *my_getpwuid(Uid_t uid) * Get information for next user. */ /*{{{struct passwd *my_getpwent()*/ -struct passwd *my_getpwent() +struct passwd *Perl_my_getpwent(pTHX) { return (my_getpwuid((unsigned int) -1)); } @@ -5001,9 +8355,8 @@ struct passwd *my_getpwent() * Finish searching rights database for users. */ /*{{{void my_endpwent()*/ -void my_endpwent() +void Perl_my_endpwent(pTHX) { - dTHX; if (contxt) { _ckvmssts(sys$finish_rdb(&contxt)); contxt= 0; @@ -5063,7 +8416,7 @@ int my_sigdelset(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)); + return *set & (1 << (sig - 1)); } /*}}}*/ @@ -5129,9 +8482,6 @@ static long int utc_offset_secs; #undef localtime #undef time -#if defined(__VMS_VER) && __VMS_VER >= 70000000 && __DECC_VER >= 50200000 -# define RTL_USES_UTC 1 -#endif /* * DEC C previous to 6.0 corrupts the behavior of the /prefix @@ -5175,11 +8525,294 @@ static time_t toloc_dst(time_t utc) { if (rsltmp->tm_isdst) utc += 3600; return utc; } -#define _toloc(secs) ((secs) == (time_t) -1 ? (time_t) -1 : \ - ((gmtime_emulation_type || my_time(NULL)), \ - (gmtime_emulation_type == 1 ? toloc_dst(secs) : \ - ((secs) + utc_offset_secs)))) +#define _toloc(secs) ((secs) == (time_t) -1 ? (time_t) -1 : \ + ((gmtime_emulation_type || my_time(NULL)), \ + (gmtime_emulation_type == 1 ? toloc_dst(secs) : \ + ((secs) + utc_offset_secs)))) + +#ifndef RTL_USES_UTC +/* + + ucx$tz = "EST5EDT4,M4.1.0,M10.5.0" typical + DST starts on 1st sun of april at 02:00 std time + ends on last sun of october at 02:00 dst time + see the UCX management command reference, SET CONFIG TIMEZONE + for formatting info. + + No, it's not as general as it should be, but then again, NOTHING + will handle UK times in a sensible way. +*/ + + +/* + parse the DST start/end info: + (Jddd|ddd|Mmon.nth.dow)[/hh:mm:ss] +*/ + +static char * +tz_parse_startend(char *s, struct tm *w, int *past) +{ + int dinm[] = {31,28,31,30,31,30,31,31,30,31,30,31}; + int ly, dozjd, d, m, n, hour, min, sec, j, k; + time_t g; + + if (!s) return 0; + if (!w) return 0; + if (!past) return 0; + + ly = 0; + if (w->tm_year % 4 == 0) ly = 1; + if (w->tm_year % 100 == 0) ly = 0; + if (w->tm_year+1900 % 400 == 0) ly = 1; + if (ly) dinm[1]++; + + dozjd = isdigit(*s); + if (*s == 'J' || *s == 'j' || dozjd) { + if (!dozjd && !isdigit(*++s)) return 0; + d = *s++ - '0'; + if (isdigit(*s)) { + d = d*10 + *s++ - '0'; + if (isdigit(*s)) { + d = d*10 + *s++ - '0'; + } + } + if (d == 0) return 0; + if (d > 366) return 0; + d--; + if (!dozjd && d > 58 && ly) d++; /* after 28 feb */ + g = d * 86400; + dozjd = 1; + } else if (*s == 'M' || *s == 'm') { + if (!isdigit(*++s)) return 0; + m = *s++ - '0'; + if (isdigit(*s)) m = 10*m + *s++ - '0'; + if (*s != '.') return 0; + if (!isdigit(*++s)) return 0; + n = *s++ - '0'; + if (n < 1 || n > 5) return 0; + if (*s != '.') return 0; + if (!isdigit(*++s)) return 0; + d = *s++ - '0'; + if (d > 6) return 0; + } + + if (*s == '/') { + if (!isdigit(*++s)) return 0; + hour = *s++ - '0'; + if (isdigit(*s)) hour = 10*hour + *s++ - '0'; + if (*s == ':') { + if (!isdigit(*++s)) return 0; + min = *s++ - '0'; + if (isdigit(*s)) min = 10*min + *s++ - '0'; + if (*s == ':') { + if (!isdigit(*++s)) return 0; + sec = *s++ - '0'; + if (isdigit(*s)) sec = 10*sec + *s++ - '0'; + } + } + } else { + hour = 2; + min = 0; + sec = 0; + } + + if (dozjd) { + if (w->tm_yday < d) goto before; + if (w->tm_yday > d) goto after; + } else { + if (w->tm_mon+1 < m) goto before; + if (w->tm_mon+1 > m) goto after; + + j = (42 + w->tm_wday - w->tm_mday)%7; /*dow of mday 0 */ + k = d - j; /* mday of first d */ + if (k <= 0) k += 7; + k += 7 * ((n>4?4:n)-1); /* mday of n'th d */ + if (n == 5 && k+7 <= dinm[w->tm_mon]) k += 7; + if (w->tm_mday < k) goto before; + if (w->tm_mday > k) goto after; + } + + if (w->tm_hour < hour) goto before; + if (w->tm_hour > hour) goto after; + if (w->tm_min < min) goto before; + if (w->tm_min > min) goto after; + if (w->tm_sec < sec) goto before; + goto after; + +before: + *past = 0; + return s; +after: + *past = 1; + return s; +} + + + + +/* parse the offset: (+|-)hh[:mm[:ss]] */ + +static char * +tz_parse_offset(char *s, int *offset) +{ + int hour = 0, min = 0, sec = 0; + int neg = 0; + if (!s) return 0; + if (!offset) return 0; + + if (*s == '-') {neg++; s++;} + if (*s == '+') s++; + if (!isdigit(*s)) return 0; + hour = *s++ - '0'; + if (isdigit(*s)) hour = hour*10+(*s++ - '0'); + if (hour > 24) return 0; + if (*s == ':') { + if (!isdigit(*++s)) return 0; + min = *s++ - '0'; + if (isdigit(*s)) min = min*10 + (*s++ - '0'); + if (min > 59) return 0; + if (*s == ':') { + if (!isdigit(*++s)) return 0; + sec = *s++ - '0'; + if (isdigit(*s)) sec = sec*10 + (*s++ - '0'); + if (sec > 59) return 0; + } + } + + *offset = (hour*60+min)*60 + sec; + if (neg) *offset = -*offset; + return s; +} + +/* + input time is w, whatever type of time the CRTL localtime() uses. + sets dst, the zone, and the gmtoff (seconds) + + caches the value of TZ and UCX$TZ env variables; note that + my_setenv looks for these and sets a flag if they're changed + for efficiency. + + We have to watch out for the "australian" case (dst starts in + october, ends in april)...flagged by "reverse" and checked by + scanning through the months of the previous year. + +*/ + +static int +tz_parse(pTHX_ time_t *w, int *dst, char *zone, int *gmtoff) +{ + time_t when; + struct tm *w2; + char *s,*s2; + char *dstzone, *tz, *s_start, *s_end; + int std_off, dst_off, isdst; + int y, dststart, dstend; + static char envtz[1025]; /* longer than any logical, symbol, ... */ + static char ucxtz[1025]; + static char reversed = 0; + + if (!w) return 0; + + if (tz_updated) { + tz_updated = 0; + reversed = -1; /* flag need to check */ + envtz[0] = ucxtz[0] = '\0'; + tz = my_getenv("TZ",0); + if (tz) strcpy(envtz, tz); + tz = my_getenv("UCX$TZ",0); + if (tz) strcpy(ucxtz, tz); + if (!envtz[0] && !ucxtz[0]) return 0; /* we give up */ + } + tz = envtz; + if (!*tz) tz = ucxtz; + + s = tz; + while (isalpha(*s)) s++; + s = tz_parse_offset(s, &std_off); + if (!s) return 0; + if (!*s) { /* no DST, hurray we're done! */ + isdst = 0; + goto done; + } + + dstzone = s; + while (isalpha(*s)) s++; + s2 = tz_parse_offset(s, &dst_off); + if (s2) { + s = s2; + } else { + dst_off = std_off - 3600; + } + + if (!*s) { /* default dst start/end?? */ + if (tz != ucxtz) { /* if TZ tells zone only, UCX$TZ tells rule */ + s = strchr(ucxtz,','); + } + if (!s || !*s) s = ",M4.1.0,M10.5.0"; /* we know we do dst, default rule */ + } + if (*s != ',') return 0; + + when = *w; + when = _toutc(when); /* convert to utc */ + when = when - std_off; /* convert to pseudolocal time*/ + + w2 = localtime(&when); + y = w2->tm_year; + s_start = s+1; + s = tz_parse_startend(s_start,w2,&dststart); + if (!s) return 0; + if (*s != ',') return 0; + + when = *w; + when = _toutc(when); /* convert to utc */ + when = when - dst_off; /* convert to pseudolocal time*/ + w2 = localtime(&when); + if (w2->tm_year != y) { /* spans a year, just check one time */ + when += dst_off - std_off; + w2 = localtime(&when); + } + s_end = s+1; + s = tz_parse_startend(s_end,w2,&dstend); + if (!s) return 0; + + if (reversed == -1) { /* need to check if start later than end */ + int j, ds, de; + + when = *w; + if (when < 2*365*86400) { + when += 2*365*86400; + } else { + when -= 365*86400; + } + w2 =localtime(&when); + when = when + (15 - w2->tm_yday) * 86400; /* jan 15 */ + + for (j = 0; j < 12; j++) { + w2 =localtime(&when); + tz_parse_startend(s_start,w2,&ds); + tz_parse_startend(s_end,w2,&de); + if (ds != de) break; + when += 30*86400; + } + reversed = 0; + if (de && !ds) reversed = 1; + } + + isdst = dststart && !dstend; + if (reversed) isdst = dststart || !dstend; + +done: + if (dst) *dst = isdst; + if (gmtoff) *gmtoff = isdst ? dst_off : std_off; + if (isdst) tz = dstzone; + if (zone) { + while(isalpha(*tz)) *zone++ = *tz++; + *zone = '\0'; + } + return 1; +} +#endif /* !RTL_USES_UTC */ /* my_time(), my_localtime(), my_gmtime() * By default traffic in UTC time values, using CRTL gmtime() or @@ -5192,9 +8825,8 @@ static time_t toloc_dst(time_t utc) { */ /*{{{time_t my_time(time_t *timep)*/ -time_t my_time(time_t *timep) +time_t Perl_my_time(pTHX_ time_t *timep) { - dTHX; time_t when; struct tm *tm_p; @@ -5211,6 +8843,7 @@ time_t my_time(time_t *timep) gmtime_emulation_type++; if (!vmstrnenv("SYS$TIMEZONE_DIFFERENTIAL",off,0,fildev,0)) { gmtime_emulation_type++; + utc_offset_secs = 0; Perl_warn(aTHX_ "no UTC offset information; assuming local time is UTC"); } else { utc_offset_secs = atol(off); } @@ -5245,9 +8878,8 @@ time_t my_time(time_t *timep) /*{{{struct tm *my_gmtime(const time_t *timep)*/ struct tm * -my_gmtime(const time_t *timep) +Perl_my_gmtime(pTHX_ const time_t *timep) { - dTHX; char *p; time_t when; struct tm *rsltmp; @@ -5276,18 +8908,18 @@ my_gmtime(const time_t *timep) /*{{{struct tm *my_localtime(const time_t *timep)*/ struct tm * -my_localtime(const time_t *timep) +Perl_my_localtime(pTHX_ const time_t *timep) { - dTHX; - time_t when; + time_t when, whenutc; struct tm *rsltmp; + int dst, offset; 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 */ + if (gmtime_emulation_type == 0) my_time(NULL); /* Init UTC */ when = *timep; # ifdef RTL_USES_UTC @@ -5296,15 +8928,24 @@ my_localtime(const time_t *timep) # endif /* CRTL localtime() wants UTC as input, does tz correction itself */ return localtime(&when); -# else + +# else /* !RTL_USES_UTC */ + whenutc = when; # ifdef VMSISH_TIME - if (!VMSISH_TIME) when = _toloc(when); /* Input was UTC */ + if (!VMSISH_TIME) when = _toloc(whenutc); /* input was UTC */ + if (VMSISH_TIME) whenutc = _toutc(when); /* input was truelocal */ # endif + dst = -1; +#ifndef RTL_USES_UTC + if (tz_parse(aTHX_ &when, &dst, 0, &offset)) { /* truelocal determines DST*/ + when = whenutc - offset; /* pseudolocal time*/ + } # 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; + if (rsltmp && gmtime_emulation_type != 1) rsltmp->tm_isdst = dst; return rsltmp; +# endif } /* end of my_localtime() */ /*}}}*/ @@ -5332,11 +8973,11 @@ my_localtime(const time_t *timep) */ 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_utime(const char *path, const struct utimbuf *utimes)*/ +int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) { - dTHX; register int i; + int sts; long int bintime[2], len = 2, lowbit, unixtime, secscale = 10000000; /* seconds --> 100 ns intervals */ unsigned long int chan, iosb[2], retsts; @@ -5358,6 +8999,7 @@ int my_utime(char *file, struct utimbuf *utimes) */ # pragma message restore #endif + /* cast ok for read only parameter */ 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}; @@ -5413,6 +9055,8 @@ int my_utime(char *file, struct utimbuf *utimes) mynam.nam$b_ess = (unsigned char) sizeof esa; mynam.nam$l_rsa = rsa; mynam.nam$b_rss = (unsigned char) sizeof rsa; + if (decc_efs_case_preserve) + mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; /* Look for the file to be affected, letting RMS parse the file * specification for us as well. I have set errno using only @@ -5429,7 +9073,7 @@ int my_utime(char *file, struct utimbuf *utimes) retsts = sys$search(&myfab,0,0); if (!(retsts & 1)) { mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; - myfab.fab$b_dns = 0; (void) sys$parse(&myfab,0,0); + myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); set_vaxc_errno(retsts); if (retsts == RMS$_PRV) set_errno(EACCES); else if (retsts == RMS$_FNF) set_errno(ENOENT); @@ -5438,12 +9082,13 @@ int my_utime(char *file, struct utimbuf *utimes) } devdsc.dsc$w_length = mynam.nam$b_dev; + /* cast ok for read only parameter */ devdsc.dsc$a_pointer = (char *) mynam.nam$l_dev; retsts = sys$assign(&devdsc,&chan,0,0); if (!(retsts & 1)) { mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; - myfab.fab$b_dns = 0; (void) sys$parse(&myfab,0,0); + myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); set_vaxc_errno(retsts); if (retsts == SS$_IVDEVNAM) set_errno(ENOTDIR); else if (retsts == SS$_NOPRIV) set_errno(EACCES); @@ -5456,7 +9101,7 @@ int my_utime(char *file, struct utimbuf *utimes) fnmdsc.dsc$w_length = mynam.nam$b_name + mynam.nam$b_type + mynam.nam$b_ver; memset((void *) &myfib, 0, sizeof myfib); -#ifdef __DECC +#if defined(__DECC) || defined(__DECCXX) 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 @@ -5469,7 +9114,7 @@ int my_utime(char *file, struct utimbuf *utimes) #endif retsts = sys$qiow(0,chan,IO$_MODIFY,iosb,0,0,&fibdsc,&fnmdsc,0,0,myatr,0); mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; - myfab.fab$b_dns = 0; (void) sys$parse(&myfab,0,0); + myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); _ckvmssts(sys$dassgn(chan)); if (retsts & 1) retsts = iosb[0]; if (!(retsts & 1)) { @@ -5484,11 +9129,12 @@ int my_utime(char *file, struct utimbuf *utimes) /*}}}*/ /* - * flex_stat, flex_fstat + * flex_stat, flex_lstat, flex_fstat * basic stat, but gets it right when asked to stat * a Unix-style path ending in a directory name (e.g. dir1/dir2/dir3) */ +#ifndef _USE_STD_STAT /* encode_dev packs a VMS device name string into an integer to allow * simple comparisons. This can be used, for example, to check whether two * files are located on the same device, by comparing their encoded device @@ -5518,14 +9164,13 @@ int my_utime(char *file, struct utimbuf *utimes) * on the first call. */ #define LOCKID_MASK 0x80000000 /* Use 0 to force device name use only */ -static mydev_t encode_dev (const char *dev) +static mydev_t encode_dev (pTHX_ const char *dev) { int i; unsigned long int f; mydev_t enc; char c; const char *q; - dTHX; if (!dev || !dev[0]) return 0; @@ -5539,7 +9184,7 @@ static mydev_t encode_dev (const char *dev) dev_desc.dsc$w_length = strlen (dev); dev_desc.dsc$b_dtype = DSC$K_DTYPE_T; dev_desc.dsc$b_class = DSC$K_CLASS_S; - dev_desc.dsc$a_pointer = (char *) dev; + dev_desc.dsc$a_pointer = (char *) dev; /* Read only parameter */ _ckvmssts(lib$getdvi(&item, 0, &dev_desc, &lockid, 0, 0)); if (lockid) return (lockid & ~LOCKID_MASK); } @@ -5564,6 +9209,7 @@ static mydev_t encode_dev (const char *dev) return (enc | LOCKID_MASK); /* May have already overflowed into bit 31 */ } /* end of encode_dev() */ +#endif static char namecache[NAM$C_MAXRSS+1]; @@ -5571,7 +9217,10 @@ static int is_null_device(name) const char *name; { - dTHX; + if (decc_bug_devnull != 0) { + if (strcmp("/dev/null", name) == 0) /* temp hack */ + return 1; + } /* The VMS null device is named "_NLA0:", usually abbreviated as "NL:". The underscore prefix, controller letter, and unit number are independently optional; for our purposes, the colon punctuation @@ -5591,11 +9240,22 @@ is_null_device(name) * subset of the applicable information. */ bool -Perl_cando(pTHX_ Mode_t bit, Uid_t effective, Stat_t *statbufp) +Perl_cando(pTHX_ Mode_t bit, Uid_t effective, const Stat_t *statbufp) { char fname_phdev[NAM$C_MAXRSS+1]; - if (statbufp == &PL_statcache) return cando_by_name(bit,effective,namecache); - else { +#if __CRTL_VER >= 80200000 && !defined(__VAX) + /* Namecache not workable with symbolic links, as symbolic links do + * not have extensions and directories do in VMS mode. So in order + * to test this, the did and ino_t must be used. + * + * Fix-me - Hide the information in the new stat structure + * Get rid of the namecache. + */ + if (decc_posix_compliant_pathnames == 0) +#endif + if (statbufp == &PL_statcache) + return cando_by_name(bit,effective,namecache); + { char fname[NAM$C_MAXRSS+1]; unsigned long int retsts; struct dsc$descriptor_s devdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}, @@ -5635,27 +9295,34 @@ Perl_cando(pTHX_ Mode_t bit, Uid_t effective, Stat_t *statbufp) /*{{{I32 cando_by_name(I32 bit, Uid_t effective, char *fname)*/ I32 -cando_by_name(I32 bit, Uid_t effective, char *fname) +Perl_cando_by_name(pTHX_ I32 bit, Uid_t effective, const char *fname) { static char usrname[L_cuserid]; static struct dsc$descriptor_s usrdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, usrname}; char vmsname[NAM$C_MAXRSS+1], fileified[NAM$C_MAXRSS+1]; unsigned long int objtyp = ACL$C_FILE, access, retsts, privused, iosb[2]; - unsigned short int retlen; - dTHX; + unsigned short int retlen, trnlnm_iter_count; struct dsc$descriptor_s namdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; union prvdef curprv; struct itmlst_3 armlst[3] = {{sizeof access, CHP$_ACCESS, &access, &retlen}, {sizeof privused, CHP$_PRIVUSED, &privused, &retlen},{0,0,0,0}}; - struct itmlst_3 jpilst[2] = {{sizeof curprv, JPI$_CURPRIV, &curprv, &retlen}, + struct itmlst_3 jpilst[3] = {{sizeof curprv, JPI$_CURPRIV, &curprv, &retlen}, + {sizeof usrname, JPI$_USERNAME, &usrname, &usrdsc.dsc$w_length}, + {0,0,0,0}}; + struct itmlst_3 usrprolst[2] = {{sizeof curprv, CHP$_PRIV, &curprv, &retlen}, {0,0,0,0}}; + struct dsc$descriptor_s usrprodsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; if (!fname || !*fname) return FALSE; /* Make sure we expand logical names, since sys$check_access doesn't */ if (!strpbrk(fname,"/]>:")) { strcpy(fileified,fname); - while (!strpbrk(fileified,"/]>:>") && my_trnlnm(fileified,fileified,0)) ; + trnlnm_iter_count = 0; + while (!strpbrk(fileified,"/]>:>") && my_trnlnm(fileified,fileified,0)) { + trnlnm_iter_count++; + if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; + } fname = fileified; } if (!do_tovmsspec(fname,vmsname,1)) return FALSE; @@ -5668,11 +9335,6 @@ cando_by_name(I32 bit, Uid_t effective, char *fname) namdsc.dsc$a_pointer = fileified; } - if (!usrdsc.dsc$w_length) { - cuserid(usrname); - usrdsc.dsc$w_length = strlen(usrname); - } - switch (bit) { case S_IXUSR: case S_IXGRP: case S_IXOTH: access = ARM$M_EXECUTE; break; @@ -5686,7 +9348,39 @@ cando_by_name(I32 bit, Uid_t effective, char *fname) return FALSE; } + /* Before we call $check_access, create a user profile with the current + * process privs since otherwise it just uses the default privs from the + * UAF and might give false positives or negatives. This only works on + * VMS versions v6.0 and later since that's when sys$create_user_profile + * became available. + */ + + /* get current process privs and username */ + _ckvmssts(sys$getjpiw(0,0,0,jpilst,iosb,0,0)); + _ckvmssts(iosb[0]); + +#if defined(__VMS_VER) && __VMS_VER >= 60000000 + + /* find out the space required for the profile */ + _ckvmssts(sys$create_user_profile(&usrdsc,&usrprolst,0,0, + &usrprodsc.dsc$w_length,0)); + + /* allocate space for the profile and get it filled in */ + Newx(usrprodsc.dsc$a_pointer,usrprodsc.dsc$w_length,char); + _ckvmssts(sys$create_user_profile(&usrdsc,&usrprolst,0,usrprodsc.dsc$a_pointer, + &usrprodsc.dsc$w_length,0)); + + /* use the profile to check access to the file; free profile & analyze results */ + retsts = sys$check_access(&objtyp,&namdsc,0,armlst,0,0,0,&usrprodsc); + Safefree(usrprodsc.dsc$a_pointer); + if (retsts == SS$_NOCALLPRIV) retsts = SS$_NOPRIV; /* not really 3rd party */ + +#else + retsts = sys$check_access(&objtyp,&namdsc,&usrdsc,armlst); + +#endif + if (retsts == SS$_NOPRIV || retsts == SS$_NOSUCHOBJECT || retsts == SS$_INVFILFOROP || retsts == RMS$_FNF || retsts == RMS$_SYN || retsts == RMS$_DIR || retsts == RMS$_DEV || retsts == RMS$_DNF) { @@ -5696,20 +9390,7 @@ cando_by_name(I32 bit, Uid_t effective, char *fname) else set_errno(ENOENT); return FALSE; } - if (retsts == SS$_NORMAL) { - if (!privused) return TRUE; - /* We can get access, but only by using privs. Do we have the - necessary privs currently enabled? */ - _ckvmssts(sys$getjpiw(0,0,0,jpilst,iosb,0,0)); - if ((privused & CHP$M_BYPASS) && !curprv.prv$v_bypass) return FALSE; - if ((privused & CHP$M_SYSPRV) && !curprv.prv$v_sysprv && - !curprv.prv$v_bypass) return FALSE; - if ((privused & CHP$M_GRPPRV) && !curprv.prv$v_grpprv && - !curprv.prv$v_sysprv && !curprv.prv$v_bypass) return FALSE; - if ((privused & CHP$M_READALL) && !curprv.prv$v_readall) return FALSE; - return TRUE; - } - if (retsts == SS$_ACCONFLICT) { + if (retsts == SS$_NORMAL || retsts == SS$_ACCONFLICT) { return TRUE; } _ckvmssts(retsts); @@ -5722,12 +9403,38 @@ cando_by_name(I32 bit, Uid_t effective, char *fname) /*{{{ int flex_fstat(int fd, Stat_t *statbuf)*/ int -flex_fstat(int fd, Stat_t *statbufp) +Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp) { - dTHX; if (!fstat(fd,(stat_t *) statbufp)) { - if (statbufp == (Stat_t *) &PL_statcache) *namecache == '\0'; - statbufp->st_dev = encode_dev(statbufp->st_devnam); + if (statbufp == (Stat_t *) &PL_statcache) { + char *cptr; + + /* Save name for cando by name in VMS format */ + cptr = getname(fd, namecache, 1); + + /* This should not happen, but just in case */ + if (cptr == NULL) + namecache[0] = '\0'; + } +#ifdef _USE_STD_STAT + memcpy(&statbufp->st_ino, &statbufp->crtl_stat.st_ino, 8); +#else + memcpy(&statbufp->st_ino, statbufp->crtl_stat.st_ino, 8); +#endif +#ifndef _USE_STD_STAT + strncpy(statbufp->st_devnam, statbufp->crtl_stat.st_dev, 63); + statbufp->st_devnam[63] = 0; + statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam); +#else + /* todo: + * The device is only encoded so that Perl_cando can use it to + * look up ACLS. So rmsexpand it to the 255 character version + * and store it in ->st_devnam. rmsexpand needs to be fixed + * for long filenames and symbolic links first. This also seems + * to remove the need for a namecache that could be stale. + */ +#endif + # ifdef RTL_USES_UTC # ifdef VMSISH_TIME if (VMSISH_TIME) { @@ -5754,27 +9461,43 @@ flex_fstat(int fd, Stat_t *statbufp) } /* end of flex_fstat() */ /*}}}*/ -/*{{{ int flex_stat(const char *fspec, Stat_t *statbufp)*/ -int -flex_stat(const char *fspec, Stat_t *statbufp) +#if !defined(__VAX) && __CRTL_VER >= 80200000 +#ifdef lstat +#undef lstat +#endif +#else +#ifdef lstat +#undef lstat +#endif +#define lstat(_x, _y) stat(_x, _y) +#endif + +#define flex_stat_int(a,b,c) Perl_flex_stat_int(aTHX_ a,b,c) + +static int +Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) { - dTHX; char fileified[NAM$C_MAXRSS+1]; char temp_fspec[NAM$C_MAXRSS+300]; int retval = -1; + int saved_errno, saved_vaxc_errno; + if (!fspec) return retval; + saved_errno = errno; saved_vaxc_errno = vaxc$errno; strcpy(temp_fspec, fspec); if (statbufp == (Stat_t *) &PL_statcache) do_tovmsspec(temp_fspec,namecache,0); - if (is_null_device(temp_fspec)) { /* Fake a stat() for the null device */ - memset(statbufp,0,sizeof *statbufp); - statbufp->st_dev = encode_dev("_NLA0:"); - statbufp->st_mode = S_IFBLK | S_IREAD | S_IWRITE | S_IEXEC; - statbufp->st_uid = 0x00010001; - statbufp->st_gid = 0x0001; - time((time_t *)&statbufp->st_mtime); - statbufp->st_atime = statbufp->st_ctime = statbufp->st_mtime; - return 0; + if (decc_bug_devnull != 0) { + if (is_null_device(temp_fspec)) { /* Fake a stat() for the null device */ + memset(statbufp,0,sizeof *statbufp); + statbufp->st_dev = encode_dev(aTHX_ "_NLA0:"); + statbufp->st_mode = S_IFBLK | S_IREAD | S_IWRITE | S_IEXEC; + statbufp->st_uid = 0x00010001; + statbufp->st_gid = 0x0001; + time((time_t *)&statbufp->st_mtime); + statbufp->st_atime = statbufp->st_ctime = statbufp->st_mtime; + return 0; + } } /* Try for a directory name first. If fspec contains a filename without @@ -5784,15 +9507,53 @@ flex_stat(const char *fspec, Stat_t *statbufp) * 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 we are in Posix filespec mode, accept the filename as is. */ +#if __CRTL_VER >= 80200000 && !defined(__VAX) + if (decc_posix_compliant_pathnames == 0) { +#endif if (do_fileify_dirspec(temp_fspec,fileified,0) != NULL) { - retval = stat(fileified,(stat_t *) statbufp); + if (lstat_flag == 0) + retval = stat(fileified,(stat_t *) statbufp); + else + retval = lstat(fileified,(stat_t *) statbufp); if (!retval && statbufp == (Stat_t *) &PL_statcache) strcpy(namecache,fileified); } - if (retval) retval = stat(temp_fspec,(stat_t *) statbufp); + if (retval) { + if (lstat_flag == 0) + retval = stat(temp_fspec,(stat_t *) statbufp); + else + retval = lstat(temp_fspec,(stat_t *) statbufp); + } +#if __CRTL_VER >= 80200000 && !defined(__VAX) + } else { + if (lstat_flag == 0) + retval = stat(temp_fspec,(stat_t *) statbufp); + else + retval = lstat(temp_fspec,(stat_t *) statbufp); + } +#endif if (!retval) { - statbufp->st_dev = encode_dev(statbufp->st_devnam); +#ifdef _USE_STD_STAT + memcpy(&statbufp->st_ino, &statbufp->crtl_stat.st_ino, 8); +#else + memcpy(&statbufp->st_ino, statbufp->crtl_stat.st_ino, 8); +#endif +#ifndef _USE_STD_STAT + strncpy(statbufp->st_devnam, statbufp->crtl_stat.st_dev, 63); + statbufp->st_devnam[63] = 0; + statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam); +#else + /* todo: + * The device is only encoded so that Perl_cando can use it to + * look up ACLS. So rmsexpand it to the 255 character version + * and store it in ->st_devnam. rmsexpand needs to be fixed + * for long filenames and symbolic links first. This also seems + * to remove the need for a namecache that could be stale. + */ +#endif # ifdef RTL_USES_UTC # ifdef VMSISH_TIME if (VMSISH_TIME) { @@ -5813,16 +9574,34 @@ flex_stat(const char *fspec, Stat_t *statbufp) } # endif } + /* If we were successful, leave errno where we found it */ + if (retval == 0) { errno = saved_errno; vaxc$errno = saved_vaxc_errno; } return retval; -} /* end of flex_stat() */ +} /* end of flex_stat_int() */ + + +/*{{{ int flex_stat(const char *fspec, Stat_t *statbufp)*/ +int +Perl_flex_stat(pTHX_ const char *fspec, Stat_t *statbufp) +{ + return flex_stat_int(fspec, statbufp, 0); +} +/*}}}*/ + +/*{{{ int flex_lstat(const char *fspec, Stat_t *statbufp)*/ +int +Perl_flex_lstat(pTHX_ const char *fspec, Stat_t *statbufp) +{ + return flex_stat_int(fspec, statbufp, 1); +} /*}}}*/ /*{{{char *my_getlogin()*/ /* VMS cuserid == Unix getlogin, except calling sequence */ char * -my_getlogin() +my_getlogin(void) { static char user[L_cuserid]; return cuserid(user); @@ -5856,7 +9635,7 @@ my_getlogin() */ /*{{{int rmscopy(char *src, char *dst, int preserve_dates)*/ int -Perl_rmscopy(pTHX_ char *spec_in, char *spec_out, int preserve_dates) +Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates) { char vmsin[NAM$C_MAXRSS+1], vmsout[NAM$C_MAXRSS+1], esa[NAM$C_MAXRSS], rsa[NAM$C_MAXRSS], ubf[32256]; @@ -5890,6 +9669,10 @@ Perl_rmscopy(pTHX_ char *spec_in, char *spec_out, int preserve_dates) nam.nam$l_esa = esa; nam.nam$b_ess = sizeof (esa); nam.nam$b_esl = nam.nam$b_rsl = 0; +#ifdef NAM$M_NO_SHORT_UPCASE + if (decc_efs_case_preserve) + nam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; +#endif xabdat = cc$rms_xabdat; /* To get creation date */ xabdat.xab$l_nxt = (void *) &xabfhc; @@ -5929,7 +9712,7 @@ Perl_rmscopy(pTHX_ char *spec_in, char *spec_out, int preserve_dates) fab_out.fab$b_dns = nam.nam$l_name ? nam.nam$b_name + nam.nam$b_type : 0; if (preserve_dates == 0) { /* Act like DCL COPY */ - nam.nam$b_nop = NAM$M_SYNCHK; + nam.nam$b_nop |= NAM$M_SYNCHK; fab_out.fab$l_xab = NULL; /* Don't disturb data from input file */ if (!((sts = sys$parse(&fab_out)) & 1)) { set_errno(sts == RMS$_SYN ? EINVAL : EVMSERR); @@ -6145,7 +9928,7 @@ candelete_fromperl(pTHX_ CV *cv) mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),fspec,1)) { + if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),fspec)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); ST(0) = &PL_sv_no; XSRETURN(1); @@ -6182,7 +9965,7 @@ rmscopy_fromperl(pTHX_ CV *cv) mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),inspec,1)) { + if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),inspec)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); ST(0) = &PL_sv_no; XSRETURN(1); @@ -6198,7 +9981,7 @@ rmscopy_fromperl(pTHX_ CV *cv) } mysv = SvROK(ST(1)) ? SvRV(ST(1)) : ST(1); if (SvTYPE(mysv) == SVt_PVGV) { - if (!(io = GvIOp(mysv)) || !fgetname(IoIFP(io),outspec,1)) { + if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),outspec)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); ST(0) = &PL_sv_no; XSRETURN(1); @@ -6220,7 +10003,7 @@ rmscopy_fromperl(pTHX_ CV *cv) void -mod2fname(CV *cv) +mod2fname(pTHX_ CV *cv) { dXSARGS; char ultimate_name[NAM$C_MAXRSS+1], work_name[NAM$C_MAXRSS*8 + 1], @@ -6295,10 +10078,90 @@ mod2fname(CV *cv) } void -init_os_extras() +hushexit_fromperl(pTHX_ CV *cv) +{ + dXSARGS; + + if (items > 0) { + VMSISH_HUSHED = SvTRUE(ST(0)); + } + ST(0) = boolSV(VMSISH_HUSHED); + XSRETURN(1); +} + +#ifdef HAS_SYMLINK +static char * +mp_do_vms_realpath(pTHX_ const char *filespec, char * rslt_spec); + +void +vms_realpath_fromperl(pTHX_ CV *cv) +{ + dXSARGS; + char *fspec, *rslt_spec, *rslt; + STRLEN n_a; + + if (!items || items != 1) + Perl_croak(aTHX_ "Usage: VMS::Filespec::vms_realpath(spec)"); + + fspec = SvPV(ST(0),n_a); + if (!fspec || !*fspec) XSRETURN_UNDEF; + + Newx(rslt_spec, VMS_MAXRSS + 1, char); + rslt = do_vms_realpath(fspec, rslt_spec); + ST(0) = sv_newmortal(); + if (rslt != NULL) + sv_usepvn(ST(0),rslt,strlen(rslt)); + else + Safefree(rslt_spec); + XSRETURN(1); +} +#endif + +#if __CRTL_VER >= 70301000 && !defined(__VAX) +int do_vms_case_tolerant(void); + +void +vms_case_tolerant_fromperl(pTHX_ CV *cv) +{ + dXSARGS; + ST(0) = boolSV(do_vms_case_tolerant()); + XSRETURN(1); +} +#endif + +void +Perl_sys_intern_dup(pTHX_ struct interp_intern *src, + struct interp_intern *dst) +{ + memcpy(dst,src,sizeof(struct interp_intern)); +} + +void +Perl_sys_intern_clear(pTHX) +{ +} + +void +Perl_sys_intern_init(pTHX) +{ + unsigned int ix = RAND_MAX; + double x; + + VMSISH_HUSHED = 0; + + /* fix me later to track running under GNV */ + /* this allows some limited testing */ + MY_POSIX_EXIT = decc_filename_unix_report; + + x = (float)ix; + MY_INV_RAND_MAX = 1./x; +} + +void +init_os_extras(void) { - char* file = __FILE__; dTHX; + char* file = __FILE__; char temp_buff[512]; if (my_trnlnm("DECC$DISABLE_TO_VMS_LOGNAME_TRANSLATION", temp_buff, 0)) { no_translate_barewords = TRUE; @@ -6316,10 +10179,392 @@ init_os_extras() newXSproto("VMS::Filespec::candelete",candelete_fromperl,file,"$"); newXSproto("DynaLoader::mod2fname", mod2fname, file, "$"); newXS("File::Copy::rmscopy",rmscopy_fromperl,file); + newXSproto("vmsish::hushed",hushexit_fromperl,file,";$"); +#ifdef HAS_SYMLINK + newXSproto("VMS::Filespec::vms_realpath",vms_realpath_fromperl,file,"$;$"); +#endif +#if __CRTL_VER >= 70301000 && !defined(__VAX) + newXSproto("VMS::Filespec::case_tolerant",vms_case_tolerant_fromperl,file,"$;$"); +#endif - store_pipelocs(); + store_pipelocs(aTHX); /* will redo any earlier attempts */ return; } +#ifdef HAS_SYMLINK + +#if __CRTL_VER == 80200000 +/* This missed getting in to the DECC SDK for 8.2 */ +char *realpath(const char *file_name, char * resolved_name, ...); +#endif + +/*{{{char *do_vms_realpath(const char *file_name, char *resolved_name)*/ +/* wrapper for the realpath() function added with 8.2 RMS SYMLINK SDK. + * The perl fallback routine to provide realpath() is not as efficient + * on OpenVMS. + */ +static char * +mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf) +{ + return realpath(filespec, outbuf); +} + +/*}}}*/ +/* External entry points */ +char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) +{ return do_vms_realpath(filespec, outbuf); } +#else +char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) +{ return NULL; } +#endif + + +#if __CRTL_VER >= 70301000 && !defined(__VAX) +/* case_tolerant */ + +/*{{{int do_vms_case_tolerant(void)*/ +/* OpenVMS provides a case sensitive implementation of ODS-5 and this is + * controlled by a process setting. + */ +int do_vms_case_tolerant(void) +{ + return vms_process_case_tolerant; +} +/*}}}*/ +/* External entry points */ +int Perl_vms_case_tolerant(void) +{ return do_vms_case_tolerant(); } +#else +int Perl_vms_case_tolerant(void) +{ return vms_process_case_tolerant; } +#endif + + + /* Start of DECC RTL Feature handling */ + +static int sys_trnlnm + (const char * logname, + char * value, + int value_len) +{ + const $DESCRIPTOR(table_dsc, "LNM$FILE_DEV"); + const unsigned long attr = LNM$M_CASE_BLIND; + struct dsc$descriptor_s name_dsc; + int status; + unsigned short result; + struct itmlst_3 itlst[2] = {{value_len, LNM$_STRING, value, &result}, + {0, 0, 0, 0}}; + + name_dsc.dsc$w_length = strlen(logname); + name_dsc.dsc$a_pointer = (char *)logname; + name_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + name_dsc.dsc$b_class = DSC$K_CLASS_S; + + status = sys$trnlnm(&attr, &table_dsc, &name_dsc, 0, itlst); + + if ($VMS_STATUS_SUCCESS(status)) { + + /* Null terminate and return the string */ + /*--------------------------------------*/ + value[result] = 0; + } + + return status; +} + +static int sys_crelnm + (const char * logname, + const char * value) +{ + int ret_val; + const char * proc_table = "LNM$PROCESS_TABLE"; + struct dsc$descriptor_s proc_table_dsc; + struct dsc$descriptor_s logname_dsc; + struct itmlst_3 item_list[2]; + + proc_table_dsc.dsc$a_pointer = (char *) proc_table; + proc_table_dsc.dsc$w_length = strlen(proc_table); + proc_table_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + proc_table_dsc.dsc$b_class = DSC$K_CLASS_S; + + logname_dsc.dsc$a_pointer = (char *) logname; + logname_dsc.dsc$w_length = strlen(logname); + logname_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + logname_dsc.dsc$b_class = DSC$K_CLASS_S; + + item_list[0].buflen = strlen(value); + item_list[0].itmcode = LNM$_STRING; + item_list[0].bufadr = (char *)value; + item_list[0].retlen = NULL; + + item_list[1].buflen = 0; + item_list[1].itmcode = 0; + + ret_val = sys$crelnm + (NULL, + (const struct dsc$descriptor_s *)&proc_table_dsc, + (const struct dsc$descriptor_s *)&logname_dsc, + NULL, + (const struct item_list_3 *) item_list); + + return ret_val; +} + + +/* C RTL Feature settings */ + +static int set_features + (int (* init_coroutine)(int *, int *, void *), /* Needs casts if used */ + int (* cli_routine)(void), /* Not documented */ + void *image_info) /* Not documented */ +{ + int status; + int s; + int dflt; + char* str; + char val_str[10]; + const unsigned long int jpicode1 = JPI$_CASE_LOOKUP_PERM; + const unsigned long int jpicode2 = JPI$_CASE_LOOKUP_IMAGE; + unsigned long case_perm; + unsigned long case_image; + + /* hacks to see if known bugs are still present for testing */ + + /* Readdir is returning filenames in VMS syntax always */ + decc_bug_readdir_efs1 = 1; + status = sys_trnlnm("DECC_BUG_READDIR_EFS1", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + decc_bug_readdir_efs1 = 1; + else + decc_bug_readdir_efs1 = 0; + } + + /* PCP mode requires creating /dev/null special device file */ + decc_bug_devnull = 0; + status = sys_trnlnm("DECC_BUG_DEVNULL", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + decc_bug_devnull = 1; + } + + /* fgetname returning a VMS name in UNIX mode */ + decc_bug_fgetname = 1; + status = sys_trnlnm("DECC_BUG_FGETNAME", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + decc_bug_fgetname = 1; + else + decc_bug_fgetname = 0; + } + + /* UNIX directory names with no paths are broken in a lot of places */ + decc_dir_barename = 1; + status = sys_trnlnm("DECC_DIR_BARENAME", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + decc_dir_barename = 1; + else + decc_dir_barename = 0; + } + +#if __CRTL_VER >= 70300000 && !defined(__VAX) + s = decc$feature_get_index("DECC$DISABLE_TO_VMS_LOGNAME_TRANSLATION"); + if (s >= 0) { + decc_disable_to_vms_logname_translation = decc$feature_get_value(s, 1); + if (decc_disable_to_vms_logname_translation < 0) + decc_disable_to_vms_logname_translation = 0; + } + + s = decc$feature_get_index("DECC$EFS_CASE_PRESERVE"); + if (s >= 0) { + decc_efs_case_preserve = decc$feature_get_value(s, 1); + if (decc_efs_case_preserve < 0) + decc_efs_case_preserve = 0; + } + + s = decc$feature_get_index("DECC$EFS_CHARSET"); + if (s >= 0) { + decc_efs_charset = decc$feature_get_value(s, 1); + if (decc_efs_charset < 0) + decc_efs_charset = 0; + } + + s = decc$feature_get_index("DECC$FILENAME_UNIX_REPORT"); + if (s >= 0) { + decc_filename_unix_report = decc$feature_get_value(s, 1); + if (decc_filename_unix_report > 0) + decc_filename_unix_report = 1; + else + decc_filename_unix_report = 0; + } + + s = decc$feature_get_index("DECC$FILENAME_UNIX_ONLY"); + if (s >= 0) { + decc_filename_unix_only = decc$feature_get_value(s, 1); + if (decc_filename_unix_only > 0) { + decc_filename_unix_only = 1; + } + else { + decc_filename_unix_only = 0; + } + } + + s = decc$feature_get_index("DECC$FILENAME_UNIX_NO_VERSION"); + if (s >= 0) { + decc_filename_unix_no_version = decc$feature_get_value(s, 1); + if (decc_filename_unix_no_version < 0) + decc_filename_unix_no_version = 0; + } + + s = decc$feature_get_index("DECC$READDIR_DROPDOTNOTYPE"); + if (s >= 0) { + decc_readdir_dropdotnotype = decc$feature_get_value(s, 1); + if (decc_readdir_dropdotnotype < 0) + decc_readdir_dropdotnotype = 0; + } + + status = sys_trnlnm("SYS$POSIX_ROOT", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + s = decc$feature_get_index("DECC$DISABLE_POSIX_ROOT"); + if (s >= 0) { + dflt = decc$feature_get_value(s, 4); + if (dflt > 0) { + decc_disable_posix_root = decc$feature_get_value(s, 1); + if (decc_disable_posix_root <= 0) { + decc$feature_set_value(s, 1, 1); + decc_disable_posix_root = 1; + } + } + else { + /* Traditionally Perl assumes this is off */ + decc_disable_posix_root = 1; + decc$feature_set_value(s, 1, 1); + } + } + } + +#if __CRTL_VER >= 80200000 + s = decc$feature_get_index("DECC$POSIX_COMPLIANT_PATHNAMES"); + if (s >= 0) { + decc_posix_compliant_pathnames = decc$feature_get_value(s, 1); + if (decc_posix_compliant_pathnames < 0) + decc_posix_compliant_pathnames = 0; + if (decc_posix_compliant_pathnames > 4) + decc_posix_compliant_pathnames = 0; + } + +#endif +#else + status = sys_trnlnm + ("DECC$DISABLE_TO_VMS_LOGNAME_TRANSLATION", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_disable_to_vms_logname_translation = 1; + } + } + +#ifndef __VAX + status = sys_trnlnm("DECC$EFS_CASE_PRESERVE", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_efs_case_preserve = 1; + } + } +#endif + + status = sys_trnlnm("DECC$FILENAME_UNIX_REPORT", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_filename_unix_report = 1; + } + } + status = sys_trnlnm("DECC$FILENAME_UNIX_ONLY", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_filename_unix_only = 1; + decc_filename_unix_report = 1; + } + } + status = sys_trnlnm("DECC$FILENAME_UNIX_NO_VERSION", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_filename_unix_no_version = 1; + } + } + status = sys_trnlnm("DECC$READDIR_DROPDOTNOTYPE", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + decc_readdir_dropdotnotype = 1; + } + } +#endif + +#ifndef __VAX + + /* Report true case tolerance */ + /*----------------------------*/ + status = lib$getjpi(&jpicode1, 0, 0, &case_perm, 0, 0); + if (!$VMS_STATUS_SUCCESS(status)) + case_perm = PPROP$K_CASE_BLIND; + status = lib$getjpi(&jpicode2, 0, 0, &case_image, 0, 0); + if (!$VMS_STATUS_SUCCESS(status)) + case_image = PPROP$K_CASE_BLIND; + if ((case_perm == PPROP$K_CASE_SENSITIVE) || + (case_image == PPROP$K_CASE_SENSITIVE)) + vms_process_case_tolerant = 0; + +#endif + + + /* CRTL can be initialized past this point, but not before. */ +/* DECC$CRTL_INIT(); */ + + return SS$_NORMAL; +} + +#ifdef __DECC +/* DECC dependent attributes */ +#if __DECC_VER < 60560002 +#define relative +#define not_executable +#else +#define relative ,rel +#define not_executable ,noexe +#endif +#pragma nostandard +#pragma extern_model save +#pragma extern_model strict_refdef "LIB$INITIALIZ" nowrt +#endif + const __align (LONGWORD) int spare[8] = {0}; +/* .psect LIB$INITIALIZE, NOPIC, USR, CON, REL, GBL, NOSHR, NOEXE, RD, */ +/* NOWRT, LONG */ +#ifdef __DECC +#pragma extern_model strict_refdef "LIB$INITIALIZE" con, gbl,noshr, \ + nowrt,noshr relative not_executable +#endif +const long vms_cc_features = (const long)set_features; + +/* +** Force a reference to LIB$INITIALIZE to ensure it +** exists in the image. +*/ +int lib$initialize(void); +#ifdef __DECC +#pragma extern_model strict_refdef +#endif + int lib_init_ref = (int) lib$initialize; + +#ifdef __DECC +#pragma extern_model restore +#pragma standard +#endif + /* End of vms.c */