X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fvms.c;h=40e80a2f7d2e313cdfc3d8714924933b054f8004;hb=53c40a8fd46e24a1d1e4bce188f973172eb1a279;hp=7b661065dc2a946a05ab4f6e70a6b823532112e8;hpb=597c27e224ae9143b61cd7cff67a1f838d9723e8;p=p5sagit%2Fp5-mst-13.2.git diff --git a/vms/vms.c b/vms/vms.c index 7b66106..40e80a2 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,7 @@ #include #include #include +#include #if __CRTL_VER >= 70301000 && !defined(__VAX) #include #endif @@ -47,6 +49,7 @@ #include #include #include +#include #if __CRTL_VER >= 70000000 /* FIXME to earliest version */ #include #define NO_EFN EFN$C_ENF @@ -78,7 +81,6 @@ struct item_list_3 { */ #ifdef sys$getdviw #undef sys$getdviw -#endif int sys$getdviw (unsigned long efn, unsigned short chan, @@ -88,6 +90,68 @@ int sys$getdviw void * (astadr)(unsigned long), void * astprm, void * nullarg); +#endif + +#ifdef sys$get_security +#undef sys$get_security +int sys$get_security + (const struct dsc$descriptor_s * clsnam, + const struct dsc$descriptor_s * objnam, + const unsigned int *objhan, + unsigned int flags, + const struct item_list_3 * itmlst, + unsigned int * contxt, + const unsigned int * acmode); +#endif + +#ifdef sys$set_security +#undef sys$set_security +int sys$set_security + (const struct dsc$descriptor_s * clsnam, + const struct dsc$descriptor_s * objnam, + const unsigned int *objhan, + unsigned int flags, + const struct item_list_3 * itmlst, + unsigned int * contxt, + const unsigned int * acmode); +#endif + +#ifdef lib$find_image_symbol +#undef lib$find_image_symbol +int lib$find_image_symbol + (const struct dsc$descriptor_s * imgname, + const struct dsc$descriptor_s * symname, + void * symval, + const struct dsc$descriptor_s * defspec, + unsigned long flag); +#endif + +#ifdef lib$rename_file +#undef lib$rename_file +int lib$rename_file + (const struct dsc$descriptor_s * old_file_dsc, + const struct dsc$descriptor_s * new_file_dsc, + const struct dsc$descriptor_s * default_file_dsc, + const struct dsc$descriptor_s * related_file_dsc, + const unsigned long * flags, + void * (success)(const struct dsc$descriptor_s * old_dsc, + const struct dsc$descriptor_s * new_dsc, + const void *), + void * (error)(const struct dsc$descriptor_s * old_dsc, + const struct dsc$descriptor_s * new_dsc, + const int * rms_sts, + const int * rms_stv, + const int * error_src, + const void * usr_arg), + int (confirm)(const struct dsc$descriptor_s * old_dsc, + const struct dsc$descriptor_s * new_dsc, + const void * old_fab, + const void * usr_arg), + void * user_arg, + struct dsc$descriptor_s * old_result_name_dsc, + struct dsc$descriptor_s * new_result_name_dsc, + unsigned long * file_scan_context); +#endif #if __CRTL_VER >= 70300000 && !defined(__VAX) @@ -142,6 +206,18 @@ return 0; # define RTL_USES_UTC 1 #endif +/* Routine to create a decterm for use with the Perl debugger */ +/* No headers, this information was found in the Programming Concepts Manual */ + +static int (*decw_term_port) + (const struct dsc$descriptor_s * display, + const struct dsc$descriptor_s * setup_file, + const struct dsc$descriptor_s * customization, + struct dsc$descriptor_s * result_device_name, + unsigned short * result_device_name_length, + void * controller, + void * char_buffer, + void * char_change_buffer) = 0; /* gcc's header files don't #define direct access macros * corresponding to VAXC's variant structs */ @@ -189,22 +265,22 @@ struct vs_str_st { #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_fileify_dirspec(a,b,c,d) mp_do_fileify_dirspec(aTHX_ a,b,c,d) +#define do_pathify_dirspec(a,b,c,d) mp_do_pathify_dirspec(aTHX_ a,b,c,d) +#define do_tovmsspec(a,b,c,d) mp_do_tovmsspec(aTHX_ a,b,c,0,d) +#define do_tovmspath(a,b,c,d) mp_do_tovmspath(aTHX_ a,b,c,d) +#define do_rmsexpand(a,b,c,d,e,f,g) mp_do_rmsexpand(aTHX_ a,b,c,d,e,f,g) +#define do_vms_realpath(a,b,c) mp_do_vms_realpath(aTHX_ a,b,c) +#define do_tounixspec(a,b,c,d) mp_do_tounixspec(aTHX_ a,b,c,d) +#define do_tounixpath(a,b,c,d) mp_do_tounixpath(aTHX_ a,b,c,d) #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); +static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts, int *); +static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts, int *); +static char *mp_do_tounixspec(pTHX_ const char *, char *, int, int *); +static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts, int *); /* see system service docs for $TRNLNM -- NOT the same as LNM$_MAX_INDEX */ #define PERL_LNM_MAX_ALLOWED_INDEX 127 @@ -260,6 +336,9 @@ int decc_filename_unix_report = 0; int decc_posix_compliant_pathnames = 0; int decc_readdir_dropdotnotype = 0; static int vms_process_case_tolerant = 1; +int vms_vtf7_filenames = 0; +int gnv_unix_shell = 0; +static int vms_unlink_all_versions = 0; /* bug workarounds if needed */ int decc_bug_readdir_efs1 = 0; @@ -299,6 +378,242 @@ const char * pch1; return ret_val; } +/* This routine converts a UCS-2 character to be VTF-7 encoded. + */ + +static void ucs2_to_vtf7 + (char *outspec, + unsigned long ucs2_char, + int * output_cnt) +{ +unsigned char * ucs_ptr; +int hex; + + ucs_ptr = (unsigned char *)&ucs2_char; + + outspec[0] = '^'; + outspec[1] = 'U'; + hex = (ucs_ptr[1] >> 4) & 0xf; + if (hex < 0xA) + outspec[2] = hex + '0'; + else + outspec[2] = (hex - 9) + 'A'; + hex = ucs_ptr[1] & 0xF; + if (hex < 0xA) + outspec[3] = hex + '0'; + else { + outspec[3] = (hex - 9) + 'A'; + } + hex = (ucs_ptr[0] >> 4) & 0xf; + if (hex < 0xA) + outspec[4] = hex + '0'; + else + outspec[4] = (hex - 9) + 'A'; + hex = ucs_ptr[1] & 0xF; + if (hex < 0xA) + outspec[5] = hex + '0'; + else { + outspec[5] = (hex - 9) + 'A'; + } + *output_cnt = 6; +} + + +/* This handles the conversion of a UNIX extended character set to a ^ + * escaped VMS character. + * in a UNIX file specification. + * + * The output count variable contains the number of characters added + * to the output string. + * + * The return value is the number of characters read from the input string + */ +static int copy_expand_unix_filename_escape + (char *outspec, const char *inspec, int *output_cnt, const int * utf8_fl) +{ +int count; +int scnt; +int utf8_flag; + + utf8_flag = 0; + if (utf8_fl) + utf8_flag = *utf8_fl; + + count = 0; + *output_cnt = 0; + if (*inspec >= 0x80) { + if (utf8_fl && vms_vtf7_filenames) { + unsigned long ucs_char; + + ucs_char = 0; + + if ((*inspec & 0xE0) == 0xC0) { + /* 2 byte Unicode */ + ucs_char = ((inspec[0] & 0x1F) << 6) + (inspec[1] & 0x3f); + if (ucs_char >= 0x80) { + ucs2_to_vtf7(outspec, ucs_char, output_cnt); + return 2; + } + } else if ((*inspec & 0xF0) == 0xE0) { + /* 3 byte Unicode */ + ucs_char = ((inspec[0] & 0xF) << 12) + + ((inspec[1] & 0x3f) << 6) + + (inspec[2] & 0x3f); + if (ucs_char >= 0x800) { + ucs2_to_vtf7(outspec, ucs_char, output_cnt); + return 3; + } + +#if 0 /* I do not see longer sequences supported by OpenVMS */ + /* Maybe some one can fix this later */ + } else if ((*inspec & 0xF8) == 0xF0) { + /* 4 byte Unicode */ + /* UCS-4 to UCS-2 */ + } else if ((*inspec & 0xFC) == 0xF8) { + /* 5 byte Unicode */ + /* UCS-4 to UCS-2 */ + } else if ((*inspec & 0xFE) == 0xFC) { + /* 6 byte Unicode */ + /* UCS-4 to UCS-2 */ +#endif + } + } + + /* High bit set, but not a Unicode character! */ + + /* Non printing DECMCS or ISO Latin-1 character? */ + if (*inspec <= 0x9F) { + int hex; + outspec[0] = '^'; + outspec++; + hex = (*inspec >> 4) & 0xF; + if (hex < 0xA) + outspec[1] = hex + '0'; + else { + outspec[1] = (hex - 9) + 'A'; + } + hex = *inspec & 0xF; + if (hex < 0xA) + outspec[2] = hex + '0'; + else { + outspec[2] = (hex - 9) + 'A'; + } + *output_cnt = 3; + return 1; + } else if (*inspec == 0xA0) { + outspec[0] = '^'; + outspec[1] = 'A'; + outspec[2] = '0'; + *output_cnt = 3; + return 1; + } else if (*inspec == 0xFF) { + outspec[0] = '^'; + outspec[1] = 'F'; + outspec[2] = 'F'; + *output_cnt = 3; + return 1; + } + *outspec = *inspec; + *output_cnt = 1; + return 1; + } + + /* Is this a macro that needs to be passed through? + * Macros start with $( and an alpha character, followed + * by a string of alpha numeric characters ending with a ) + * If this does not match, then encode it as ODS-5. + */ + if ((inspec[0] == '$') && (inspec[1] == '(')) { + int tcnt; + + if (isalnum(inspec[2]) || (inspec[2] == '.') || (inspec[2] == '_')) { + tcnt = 3; + outspec[0] = inspec[0]; + outspec[1] = inspec[1]; + outspec[2] = inspec[2]; + + while(isalnum(inspec[tcnt]) || + (inspec[2] == '.') || (inspec[2] == '_')) { + outspec[tcnt] = inspec[tcnt]; + tcnt++; + } + if (inspec[tcnt] == ')') { + outspec[tcnt] = inspec[tcnt]; + tcnt++; + *output_cnt = tcnt; + return tcnt; + } + } + } + + switch (*inspec) { + case 0x7f: + outspec[0] = '^'; + outspec[1] = '7'; + outspec[2] = 'F'; + *output_cnt = 3; + return 1; + break; + case '?': + if (decc_efs_charset == 0) + outspec[0] = '%'; + else + outspec[0] = '?'; + *output_cnt = 1; + return 1; + break; + case '.': + case '~': + case '!': + case '#': + case '&': + case '\'': + case '`': + case '(': + case ')': + case '+': + case '@': + case '{': + case '}': + case ',': + case ';': + case '[': + case ']': + case '%': + case '^': + /* Don't escape again if following character is + * already something we escape. + */ + if (strchr(".~!#&\'`()+@{},;[]%^=_", *(inspec+1))) { + *outspec = *inspec; + *output_cnt = 1; + return 1; + break; + } + /* But otherwise fall through and escape it. */ + case '=': + /* Assume that this is to be escaped */ + outspec[0] = '^'; + outspec[1] = *inspec; + *output_cnt = 2; + return 1; + break; + case ' ': /* space */ + /* Assume that this is to be escaped */ + outspec[0] = '^'; + outspec[1] = '_'; + *output_cnt = 2; + return 1; + break; + default: + *outspec = *inspec; + *output_cnt = 1; + return 1; + break; + } +} + + /* This handles the expansion of a '^' prefix to the proper character * in a UNIX file specification. * @@ -319,19 +634,27 @@ int scnt; if (*inspec == '^') { inspec++; switch (*inspec) { + /* Spaces and non-trailing dots should just be passed through, + * but eat the escape character. + */ case '.': - /* Non trailing dots should just be passed through */ *outspec = *inspec; - count++; + count += 2; (*output_cnt)++; break; case '_': /* space */ *outspec = ' '; - inspec++; - count++; + count += 2; (*output_cnt)++; break; - case 'U': /* Unicode */ + case '^': + /* Hmm. Better leave the escape escaped. */ + outspec[0] = '^'; + outspec[1] = '^'; + count += 2; + (*output_cnt) += 2; + break; + case 'U': /* Unicode - FIX-ME this is wrong. */ inspec++; count++; scnt = strspn(inspec, "0123456789ABCDEFabcdef"); @@ -382,13 +705,15 @@ int scnt; return count; } - -int SYS$FILESCAN +#ifdef sys$filescan +#undef sys$filescan +int sys$filescan (const struct dsc$descriptor_s * srcstr, struct filescan_itmlst_2 * valuelist, unsigned long * fldflags, struct dsc$descriptor_s *auxout, unsigned short * retlen); +#endif /* vms_split_path - Verify that the input file specification is a * VMS format file specification, and provide pointers to the components of @@ -400,7 +725,7 @@ int SYS$FILESCAN * path. */ static int vms_split_path - (pTHX_ const char * path, + (const char * path, char * * volume, int * vol_len, char * * root, @@ -494,10 +819,10 @@ const int verspec = 7; item_list[8].length = 0; item_list[8].component = NULL; - status = SYS$FILESCAN + status = sys$filescan ((const struct dsc$descriptor_s *)&path_desc, item_list, &flags, NULL, NULL); - _ckvmssts(status); /* All failure status values indicate a coding error */ + _ckvmssts_noperl(status); /* All failure status values indicate a coding error */ /* If we parsed it successfully these two lengths should be the same */ if (path_desc.dsc$w_length != item_list[filespec].length) @@ -1011,7 +1336,7 @@ prime_env_iter(void) for (i = 0; env_tables[i]; i++) { if (!have_sym && (tmpdsc.dsc$a_pointer = env_tables[i]->dsc$a_pointer) && !str$case_blind_compare(&tmpdsc,&clisym)) have_sym = 1; - if (!have_lnm && !str$case_blind_compare(env_tables[i],&crtlenv)) have_lnm = 1; + if (!have_lnm && str$case_blind_compare(env_tables[i],&crtlenv)) have_lnm = 1; } if (have_sym || have_lnm) { long int syiitm = SYI$_MAXBUF, dviitm = DVI$_DEVNAM; @@ -1129,8 +1454,9 @@ prime_env_iter(void) */ char lnm[LNM$C_NAMLENGTH+1]; char eqv[MAX_DCL_SYMBOL+1]; + int trnlen; strncpy(lnm, key, keylen); - int trnlen = vmstrnenv(lnm, eqv, 0, fildev, 0); + trnlen = vmstrnenv(lnm, eqv, 0, fildev, 0); sv = newSVpvn(eqv, strlen(eqv)); } else { @@ -1464,9 +1790,9 @@ Perl_my_crypt(pTHX_ const char *textpasswd, const char *usrname) /*}}}*/ -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); +static char *mp_do_rmsexpand(pTHX_ const char *, char *, int, const char *, unsigned, int *, int *); +static char *mp_do_fileify_dirspec(pTHX_ const char *, char *, int, int *); +static char *mp_do_tovmsspec(pTHX_ const char *, char *, int, int, int *); /* fixup barenames that are directories for internal use. * There have been problems with the consistent handling of UNIX @@ -1482,6 +1808,10 @@ static char * fixup_bare_dirnames(const char * name) return NULL; } +/* 8.3, remove() is now broken on symbolic links */ +static int rms_erase(const char * vmsname); + + /* 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 @@ -1497,8 +1827,8 @@ static char * fixup_bare_dirnames(const char * name) static int mp_do_kill_file(pTHX_ const char *name, int dirflag) { - char *vmsname, *rspec; - char *remove_name; + char *vmsname; + char *rslt; 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}; @@ -1525,59 +1855,31 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) vmsname = PerlMem_malloc(NAM$C_MAXRSS+1); if (vmsname == NULL) _ckvmssts(SS$_INSFMEM); - if (do_rmsexpand(name, vmsname, 0, NULL, PERL_RMSEXPAND_M_VMS) == NULL) { - PerlMem_free(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 { - rspec = PerlMem_malloc(NAM$C_MAXRSS+1); - if (rspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_rmsexpand(vmsname, rspec, 0, NULL, PERL_RMSEXPAND_M_VMS) == NULL) { - PerlMem_free(rspec); + rslt = do_rmsexpand(name, + vmsname, + 0, + NULL, + PERL_RMSEXPAND_M_VMS | PERL_RMSEXPAND_M_SYMLINK, + NULL, + NULL); + if (rslt == NULL) { PerlMem_free(vmsname); return -1; } - PerlMem_free(vmsname); - remove_name = rspec; - } -#if defined(__CRTL_VER) && __CRTL_VER >= 70000000 - if (dirflag != 0) { - if (decc_dir_barename && decc_posix_compliant_pathnames) { - remove_name = PerlMem_malloc(NAM$C_MAXRSS+1); - if (remove_name == NULL) _ckvmssts(SS$_INSFMEM); + /* Erase the file */ + rmsts = rms_erase(vmsname); - do_pathify_dirspec(name, remove_name, 0); - if (!rmdir(remove_name)) { - - PerlMem_free(remove_name); - PerlMem_free(rspec); - return 0; /* Can we just get rid of it? */ - } - } - else { - if (!rmdir(remove_name)) { - PerlMem_free(rspec); - return 0; /* Can we just get rid of it? */ - } - } - } - else -#endif - if (!remove(remove_name)) { - PerlMem_free(rspec); - return 0; /* Can we just get rid of it? */ + /* Did it succeed */ + if ($VMS_STATUS_SUCCESS(rmsts)) { + PerlMem_free(vmsname); + return 0; } /* If not, can changing protections help? */ - if (vaxc$errno != RMS$_PRV) { - PerlMem_free(rspec); + if (rmsts != RMS$_PRV) { + set_vaxc_errno(rmsts); + PerlMem_free(vmsname); return -1; } @@ -1586,10 +1888,11 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) * 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; + fildsc.dsc$w_length = strlen(vmsname); + fildsc.dsc$a_pointer = vmsname; cxt = 0; newace.myace$l_ident = oldace.myace$l_ident; + rmsts = -1; if (!((aclsts = sys$change_acl(0,&type,&fildsc,lcklst,0,0,0)) & 1)) { switch (aclsts) { case RMS$_FNF: case RMS$_DNF: case SS$_NOSUCHOBJECT: @@ -1606,7 +1909,7 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) _ckvmssts(aclsts); } set_vaxc_errno(aclsts); - PerlMem_free(rspec); + PerlMem_free(vmsname); return -1; } /* Grab any existing ACEs with this identifier in case we fail */ @@ -1617,23 +1920,12 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) if (!((aclsts = sys$change_acl(0,&type,&fildsc,addlst,0,0,0)) & 1)) goto yourroom; -#if defined(__CRTL_VER) && __CRTL_VER >= 70000000 - if (dirflag != 0) - if (decc_dir_barename && decc_posix_compliant_pathnames) { - remove_name = PerlMem_malloc(NAM$C_MAXRSS+1); - if (remove_name == NULL) _ckvmssts(SS$_INSFMEM); - - do_pathify_dirspec(name, remove_name, 0); - rmsts = rmdir(remove_name); - PerlMem_free(remove_name); + rmsts = rms_erase(vmsname); + if ($VMS_STATUS_SUCCESS(rmsts)) { + rmsts = 0; } else { - rmsts = rmdir(remove_name); - } - else -#endif - rmsts = remove(remove_name); - if (rmsts) { + rmsts = -1; /* 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)) @@ -1657,11 +1949,9 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) if (!(aclsts & 1)) { set_errno(EVMSERR); set_vaxc_errno(aclsts); - PerlMem_free(rspec); - return -1; } - PerlMem_free(rspec); + PerlMem_free(vmsname); return rmsts; } /* end of kill_file() */ @@ -1672,13 +1962,27 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) int Perl_do_rmdir(pTHX_ const char *name) { - char dirfile[NAM$C_MAXRSS+1]; + char * dirfile; 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 = mp_do_kill_file(aTHX_ dirfile, 1); + dirfile = PerlMem_malloc(VMS_MAXRSS + 1); + if (dirfile == NULL) + _ckvmssts(SS$_INSFMEM); + + /* Force to a directory specification */ + if (do_fileify_dirspec(name, dirfile, 0, NULL) == NULL) { + PerlMem_free(dirfile); + return -1; + } + if (Perl_flex_lstat(aTHX_ dirfile, &st) || !S_ISDIR(st.st_mode)) { + errno = ENOTDIR; + retval = -1; + } + else + retval = mp_do_kill_file(aTHX_ dirfile, 1); + + PerlMem_free(dirfile); return retval; } /* end of do_rmdir */ @@ -1698,95 +2002,19 @@ Perl_kill_file(pTHX_ const char *name) { char rspec[NAM$C_MAXRSS+1]; char *tspec; - 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. */ - tspec = do_rmsexpand(name, rspec, 0, NULL, PERL_RMSEXPAND_M_VMS); - if (tspec == 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; + Stat_t st; + int rmsts; - /* 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. + /* Remove() is allowed to delete directories, according to the X/Open + * specifications. + * This may need special handling to work with the ACL hacks. */ - _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; - } - } + if ((flex_lstat(name, &st) == 0) && S_ISDIR(st.st_mode)) { + rmsts = Perl_do_rmdir(aTHX_ name); + return rmsts; } - 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; - } + rmsts = mp_do_kill_file(aTHX_ name, 0); return rmsts; @@ -1855,6 +2083,61 @@ Perl_my_chdir(pTHX_ const char *dir) /*}}}*/ +/*{{{int my_chmod(char *, mode_t)*/ +int +Perl_my_chmod(pTHX_ const char *file_spec, mode_t mode) +{ + STRLEN speclen = strlen(file_spec); + + /* zero length string sometimes gives ACCVIO */ + if (speclen == 0) return -1; + + /* some versions of CRTL chmod() 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. + * + * Tests are showing that chmod() on VMS 8.3 is only accepting directories + * in VMS file.dir notation. + */ + if ((speclen > 1) && (file_spec[speclen-1] == '/')) { + char *vms_src, *vms_dir, *rslt; + int ret = -1; + errno = EIO; + + /* First convert this to a VMS format specification */ + vms_src = PerlMem_malloc(VMS_MAXRSS); + if (vms_src == NULL) + _ckvmssts(SS$_INSFMEM); + + rslt = do_tovmsspec(file_spec, vms_src, 0, NULL); + if (rslt == NULL) { + /* If we fail, then not a file specification */ + PerlMem_free(vms_src); + errno = EIO; + return -1; + } + + /* Now make it a directory spec so chmod is happy */ + vms_dir = PerlMem_malloc(VMS_MAXRSS + 1); + if (vms_dir == NULL) + _ckvmssts(SS$_INSFMEM); + rslt = do_fileify_dirspec(vms_src, vms_dir, 0, NULL); + PerlMem_free(vms_src); + + /* Now do it */ + if (rslt != NULL) { + ret = chmod(vms_dir, mode); + } else { + errno = EIO; + } + PerlMem_free(vms_dir); + return ret; + } + else return chmod(file_spec, mode); +} /* end of my_chmod */ +/*}}}*/ + + /*{{{FILE *my_tmpfile()*/ FILE * my_tmpfile(void) @@ -1935,7 +2218,7 @@ Perl_my_sigaction (pTHX_ int sig, const struct sigaction* act, than signalling with an unrecognized (and unhandled by CRTL) code. */ -#define _MY_SIG_MAX 17 +#define _MY_SIG_MAX 28 static unsigned int Perl_sig_to_vmscondition_int(int sig) @@ -1963,7 +2246,18 @@ Perl_sig_to_vmscondition_int(int sig) SS$_ASTFLT, /* 14 SIGALRM */ 4, /* 15 SIGTERM */ 0, /* 16 SIGUSR1 */ - 0 /* 17 SIGUSR2 */ + 0, /* 17 SIGUSR2 */ + 0, /* 18 */ + 0, /* 19 */ + 0, /* 20 SIGCHLD */ + 0, /* 21 SIGCONT */ + 0, /* 22 SIGSTOP */ + 0, /* 23 SIGTSTP */ + 0, /* 24 SIGTTIN */ + 0, /* 25 SIGTTOU */ + 0, /* 26 */ + 0, /* 27 */ + 0 /* 28 SIGWINCH */ }; #if __VMS_VER >= 60200000 @@ -1972,6 +2266,12 @@ Perl_sig_to_vmscondition_int(int sig) initted = 1; sig_code[16] = C$_SIGUSR1; sig_code[17] = C$_SIGUSR2; +#if __CRTL_VER >= 70000000 + sig_code[20] = C$_SIGCHLD; +#endif +#if __CRTL_VER >= 70300000 + sig_code[28] = C$_SIGWINCH; +#endif } #endif @@ -2513,6 +2813,8 @@ struct pipe_details int in_done; /* true when in pipe finished */ int out_done; int err_done; + unsigned short xchan; /* channel to debug xterm */ + unsigned short xchan_valid; /* channel is assigned */ }; struct exit_control_block @@ -2557,14 +2859,20 @@ pipe_exit_routine(pTHX) unsigned long int retsts = SS$_NORMAL, abort = SS$_TIMEOUT; int sts, did_stuff, need_eof, j; - /* - flush any pending i/o + /* + * Flush any pending i/o, but since we are in process run-down, be + * careful about referencing PerlIO structures that may already have + * been deallocated. We may not even have an interpreter anymore. */ info = open_pipes; while (info) { if (info->fp) { - if (!info->useFILE) - PerlIO_flush(info->fp); /* first, flush data */ + if (!info->useFILE +#if defined(USE_ITHREADS) + && my_perl +#endif + && PL_perlio_fd_refcnt) + PerlIO_flush(info->fp); else fflush((FILE *)info->fp); } @@ -2646,6 +2954,7 @@ pipe_exit_routine(pTHX) if (!info->done) { /* We tried to be nice . . . */ sts = sys$delprc(&info->pid,0); if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts_noperl(sts); + info->done = 1; /* sys$delprc is as done as we're going to get. */ } _ckvmssts_noperl(sys$setast(1)); info = info->next; @@ -3277,7 +3586,7 @@ store_pipelocs(pTHX) temp[1] = '\0'; } - if ((tounixpath(temp, unixdir)) != Nullch) { + if ((tounixpath_utf8(temp, unixdir, NULL)) != Nullch) { p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); if (p == NULL) _ckvmssts(SS$_INSFMEM); p->next = head_PLOC; @@ -3300,7 +3609,7 @@ store_pipelocs(pTHX) if (SvROK(dirsv)) continue; dir = SvPVx(dirsv,n_a); if (strcmp(dir,".") == 0) continue; - if ((tounixpath(dir, unixdir)) == Nullch) + if ((tounixpath_utf8(dir, unixdir, NULL)) == Nullch) continue; p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); @@ -3313,7 +3622,7 @@ store_pipelocs(pTHX) /* most likely spot (ARCHLIB) put first in the list */ #ifdef ARCHLIB_EXP - if ((tounixpath(ARCHLIB_EXP, unixdir)) != Nullch) { + if ((tounixpath_utf8(ARCHLIB_EXP, unixdir, NULL)) != Nullch) { p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); if (p == NULL) _ckvmssts(SS$_INSFMEM); p->next = head_PLOC; @@ -3367,7 +3676,7 @@ find_vmspipe(pTHX) p = p->next; exp_res = do_rmsexpand - (file, vmspipe_file, 0, NULL, PERL_RMSEXPAND_M_VMS); + (file, vmspipe_file, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL); if (!exp_res) continue; if (cando_by_name_int @@ -3462,7 +3771,7 @@ vmspipe_tempfile(pTHX) fclose(fp); if (decc_filename_unix_only) - do_tounixspec(file, file, 0); + do_tounixspec(file, file, 0, NULL); fp = fopen(file,"r","shr=get"); if (!fp) return 0; fstat(fileno(fp), (struct stat *)&s1); @@ -3477,12 +3786,274 @@ vmspipe_tempfile(pTHX) } - -static PerlIO * -safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) +static int vms_is_syscommand_xterm(void) { - static int handler_set_up = FALSE; - unsigned long int sts, flags = CLI$M_NOWAIT; + const static struct dsc$descriptor_s syscommand_dsc = + { 11, DSC$K_DTYPE_T, DSC$K_CLASS_S, "SYS$COMMAND" }; + + const static struct dsc$descriptor_s decwdisplay_dsc = + { 12, DSC$K_DTYPE_T, DSC$K_CLASS_S, "DECW$DISPLAY" }; + + struct item_list_3 items[2]; + unsigned short dvi_iosb[4]; + unsigned long devchar; + unsigned long devclass; + int status; + + /* Very simple check to guess if sys$command is a decterm? */ + /* First see if the DECW$DISPLAY: device exists */ + items[0].len = 4; + items[0].code = DVI$_DEVCHAR; + items[0].bufadr = &devchar; + items[0].retadr = NULL; + items[1].len = 0; + items[1].code = 0; + + status = sys$getdviw + (NO_EFN, 0, &decwdisplay_dsc, items, dvi_iosb, NULL, NULL, NULL); + + if ($VMS_STATUS_SUCCESS(status)) { + status = dvi_iosb[0]; + } + + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(EVMSERR, status); + return -1; + } + + /* If it does, then for now assume that we are on a workstation */ + /* Now verify that SYS$COMMAND is a terminal */ + /* for creating the debugger DECTerm */ + + items[0].len = 4; + items[0].code = DVI$_DEVCLASS; + items[0].bufadr = &devclass; + items[0].retadr = NULL; + items[1].len = 0; + items[1].code = 0; + + status = sys$getdviw + (NO_EFN, 0, &syscommand_dsc, items, dvi_iosb, NULL, NULL, NULL); + + if ($VMS_STATUS_SUCCESS(status)) { + status = dvi_iosb[0]; + } + + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(EVMSERR, status); + return -1; + } + else { + if (devclass == DC$_TERM) { + return 0; + } + } + return -1; +} + +/* If we are on a DECTerm, we can pretend to fork xterms when requested */ +static PerlIO * create_forked_xterm(pTHX_ const char *cmd, const char *mode) +{ + int status; + int ret_stat; + char * ret_char; + char device_name[65]; + unsigned short device_name_len; + struct dsc$descriptor_s customization_dsc; + struct dsc$descriptor_s device_name_dsc; + const char * cptr; + char * tptr; + char customization[200]; + char title[40]; + pInfo info = NULL; + char mbx1[64]; + unsigned short p_chan; + int n; + unsigned short iosb[4]; + struct item_list_3 items[2]; + const char * cust_str = + "DECW$TERMINAL.iconName:\tPerl Dbg\nDECW$TERMINAL.title:\t%40s\n"; + struct dsc$descriptor_s d_mbx1 = {sizeof mbx1, DSC$K_DTYPE_T, + DSC$K_CLASS_S, mbx1}; + + /* LIB$FIND_IMAGE_SIGNAL needs a handler */ + /*---------------------------------------*/ + VAXC$ESTABLISH((__vms_handler)LIB$SIG_TO_RET); + + + /* Make sure that this is from the Perl debugger */ + ret_char = strstr(cmd," xterm "); + if (ret_char == NULL) + return NULL; + cptr = ret_char + 7; + ret_char = strstr(cmd,"tty"); + if (ret_char == NULL) + return NULL; + ret_char = strstr(cmd,"sleep"); + if (ret_char == NULL) + return NULL; + + if (decw_term_port == 0) { + $DESCRIPTOR(filename1_dsc, "DECW$TERMINALSHR12"); + $DESCRIPTOR(filename2_dsc, "DECW$TERMINALSHR"); + $DESCRIPTOR(decw_term_port_dsc, "DECW$TERM_PORT"); + + status = LIB$FIND_IMAGE_SYMBOL + (&filename1_dsc, + &decw_term_port_dsc, + (void *)&decw_term_port, + NULL, + 0); + + /* Try again with the other image name */ + if (!$VMS_STATUS_SUCCESS(status)) { + + status = LIB$FIND_IMAGE_SYMBOL + (&filename2_dsc, + &decw_term_port_dsc, + (void *)&decw_term_port, + NULL, + 0); + + } + + } + + + /* No decw$term_port, give it up */ + if (!$VMS_STATUS_SUCCESS(status)) + return NULL; + + /* Are we on a workstation? */ + /* to do: capture the rows / columns and pass their properties */ + ret_stat = vms_is_syscommand_xterm(); + if (ret_stat < 0) + return NULL; + + /* Make the title: */ + ret_char = strstr(cptr,"-title"); + if (ret_char != NULL) { + while ((*cptr != 0) && (*cptr != '\"')) { + cptr++; + } + if (*cptr == '\"') + cptr++; + n = 0; + while ((*cptr != 0) && (*cptr != '\"')) { + title[n] = *cptr; + n++; + if (n == 39) { + title[39] == 0; + break; + } + cptr++; + } + title[n] = 0; + } + else { + /* Default title */ + strcpy(title,"Perl Debug DECTerm"); + } + sprintf(customization, cust_str, title); + + customization_dsc.dsc$a_pointer = customization; + customization_dsc.dsc$w_length = strlen(customization); + customization_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + customization_dsc.dsc$b_class = DSC$K_CLASS_S; + + device_name_dsc.dsc$a_pointer = device_name; + device_name_dsc.dsc$w_length = sizeof device_name -1; + device_name_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + device_name_dsc.dsc$b_class = DSC$K_CLASS_S; + + device_name_len = 0; + + /* Try to create the window */ + status = (*decw_term_port) + (NULL, + NULL, + &customization_dsc, + &device_name_dsc, + &device_name_len, + NULL, + NULL, + NULL); + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(EVMSERR, status); + return NULL; + } + + device_name[device_name_len] = '\0'; + + /* Need to set this up to look like a pipe for cleanup */ + n = sizeof(Info); + status = lib$get_vm(&n, &info); + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(ENOMEM, status); + return NULL; + } + + info->mode = *mode; + info->done = FALSE; + info->completion = 0; + info->closing = FALSE; + 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; + + /* Assign a channel on this so that it will persist, and not login */ + /* We stash this channel in the info structure for reference. */ + /* The created xterm self destructs when the last channel is removed */ + /* and it appears that perl5db.pl (perl debugger) does this routinely */ + /* So leave this assigned. */ + device_name_dsc.dsc$w_length = device_name_len; + status = sys$assign(&device_name_dsc,&info->xchan,0,0); + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(EVMSERR, status); + return NULL; + } + info->xchan_valid = 1; + + /* Now create a mailbox to be read by the application */ + + create_mbx(aTHX_ &p_chan, &d_mbx1); + + /* write the name of the created terminal to the mailbox */ + status = sys$qiow(NO_EFN, p_chan, IO$_WRITEVBLK|IO$M_NOW, + iosb, NULL, NULL, device_name, device_name_len, 0, 0, 0, 0); + + if (!$VMS_STATUS_SUCCESS(status)) { + SETERRNO(EVMSERR, status); + return NULL; + } + + info->fp = PerlIO_open(mbx1, mode); + + /* Done with this channel */ + sys$dassgn(p_chan); + + /* If any errors, then clean up */ + if (!info->fp) { + n = sizeof(Info); + _ckvmssts(lib$free_vm(&n, &info)); + return NULL; + } + + /* All done */ + return info->fp; +} + +static PerlIO * +safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) +{ + static int handler_set_up = FALSE; + 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. @@ -3505,7 +4076,19 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) $DESCRIPTOR(d_sym_in ,"PERL_POPEN_IN"); $DESCRIPTOR(d_sym_out,"PERL_POPEN_OUT"); $DESCRIPTOR(d_sym_err,"PERL_POPEN_ERR"); - + + /* Check here for Xterm create request. This means looking for + * "3>&1 xterm\b" and "\btty 1>&3\b$" in the command, and that it + * is possible to create an xterm. + */ + if (*in_mode == 'r') { + PerlIO * xterm_fd; + + xterm_fd = create_forked_xterm(aTHX_ cmd, in_mode); + if (xterm_fd != Nullfp) + return xterm_fd; + } + if (!head_PLOC) store_pipelocs(aTHX); /* at least TRY to use a static vmspipe file */ /* once-per-program initialization... @@ -3574,7 +4157,7 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) set_errno(EVMSERR); } set_vaxc_errno(sts); - if (*mode != 'n' && ckWARN(WARN_PIPE)) { + if (*in_mode != 'n' && ckWARN(WARN_PIPE)) { Perl_warner(aTHX_ packWARN(WARN_PIPE),"Can't pipe \"%*s\": %s", strlen(cmd), cmd, Strerror(errno)); } *psts = sts; @@ -3597,6 +4180,8 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) info->in_done = TRUE; info->out_done = TRUE; info->err_done = TRUE; + info->xchan = 0; + info->xchan_valid = 0; in = PerlMem_malloc(VMS_MAXRSS); if (in == NULL) _ckvmssts(SS$_INSFMEM); @@ -3625,7 +4210,7 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) info->out->info = info; } if (!info->useFILE) { - info->fp = PerlIO_open(mbx, mode); + info->fp = PerlIO_open(mbx, mode); } else { info->fp = (PerlIO *) freopen(mbx, mode, stdin); Perl_vmssetuserlnm(aTHX_ "SYS$INPUT",mbx); @@ -3847,6 +4432,7 @@ I32 Perl_my_pclose(pTHX_ PerlIO *fp) pInfo info, last = NULL; unsigned long int retsts; int done, iss, n; + int status; for (info = open_pipes; info != NULL; last = info, info = info->next) if (info->fp == fp) break; @@ -3865,8 +4451,12 @@ I32 Perl_my_pclose(pTHX_ PerlIO *fp) * the first EOF closing the pipe (and DASSGN'ing the channel)... */ if (info->fp) { - if (!info->useFILE) - PerlIO_flush(info->fp); /* first, flush data */ + if (!info->useFILE +#if defined(USE_ITHREADS) + && my_perl +#endif + && PL_perlio_fd_refcnt) + PerlIO_flush(info->fp); else fflush((FILE *)info->fp); } @@ -3888,7 +4478,11 @@ I32 Perl_my_pclose(pTHX_ PerlIO *fp) 0, 0, 0, 0, 0, 0)); _ckvmssts(sys$setast(1)); if (info->fp) { - if (!info->useFILE) + if (!info->useFILE +#if defined(USE_ITHREADS) + && my_perl +#endif + && PL_perlio_fd_refcnt) PerlIO_close(info->fp); else fclose((FILE *)info->fp); @@ -4217,6 +4811,461 @@ struct NAML * nam; #endif +/* rms_erase + * The CRTL for 8.3 and later can create symbolic links in any mode, + * however in 8.3 the unlink/remove/delete routines will only properly handle + * them if one of the PCP modes is active. + */ +static int rms_erase(const char * vmsname) +{ + int status; + struct FAB myfab = cc$rms_fab; + rms_setup_nam(mynam); + + rms_set_fna(myfab, mynam, (char *)vmsname, strlen(vmsname)); /* cast ok */ + rms_bind_fab_nam(myfab, mynam); + + /* Are we removing all versions? */ + if (vms_unlink_all_versions == 1) { + const char * defspec = ";*"; + rms_set_dna(myfab, mynam, (char *)defspec, strlen(defspec)); /* cast ok */ + } + +#ifdef NAML$M_OPEN_SPECIAL + rms_set_nam_nop(mynam, NAML$M_OPEN_SPECIAL); +#endif + + status = SYS$ERASE(&myfab, 0, 0); + + return status; +} + + +static int +vms_rename_with_acl(pTHX_ const struct dsc$descriptor_s * vms_src_dsc, + const struct dsc$descriptor_s * vms_dst_dsc, + unsigned long flags) +{ + /* VMS and UNIX handle file permissions differently and the + * the same ACL trick may be needed for renaming files, + * especially if they are directories. + */ + + /* todo: get kill_file and rename to share common code */ + /* I can not find online documentation for $change_acl + * it appears to be replaced by $set_security some time ago */ + +const unsigned int access_mode = 0; +$DESCRIPTOR(obj_file_dsc,"FILE"); +char *vmsname; +char *rslt; +unsigned long int jpicode = JPI$_UIC, type = ACL$C_FILE; +int aclsts, fndsts, rnsts = -1; +unsigned int ctx = 0; +struct dsc$descriptor_s fildsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; +struct dsc$descriptor_s * clean_dsc; + +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 item_list_3 + findlst[3] = {{sizeof oldace, OSS$_ACL_FIND_ENTRY, &oldace, 0}, + {sizeof oldace, OSS$_ACL_READ_ENTRY, &oldace, 0}, + {0,0,0,0}}, + addlst[2] = {{sizeof newace, OSS$_ACL_ADD_ENTRY, &newace, 0},{0,0,0,0}}, + dellst[2] = {{sizeof newace, OSS$_ACL_DELETE_ENTRY, &newace, 0}, + {0,0,0,0}}; + + + /* Expand the input spec using RMS, since we do not want to put + * ACLs on the target of a symbolic link */ + vmsname = PerlMem_malloc(NAM$C_MAXRSS+1); + if (vmsname == NULL) + return SS$_INSFMEM; + + rslt = do_rmsexpand(vms_src_dsc->dsc$a_pointer, + vmsname, + 0, + NULL, + PERL_RMSEXPAND_M_VMS | PERL_RMSEXPAND_M_SYMLINK, + NULL, + NULL); + if (rslt == NULL) { + PerlMem_free(vmsname); + return SS$_INSFMEM; + } + + /* 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(vmsname); + fildsc.dsc$a_pointer = vmsname; + ctx = 0; + newace.myace$l_ident = oldace.myace$l_ident; + rnsts = SS$_ABORT; + + /* Grab any existing ACEs with this identifier in case we fail */ + clean_dsc = &fildsc; + aclsts = fndsts = sys$get_security(&obj_file_dsc, + &fildsc, + NULL, + OSS$M_WLOCK, + findlst, + &ctx, + &access_mode); + + if ($VMS_STATUS_SUCCESS(fndsts) || (fndsts == SS$_ACLEMPTY)) { + /* Add the new ACE . . . */ + + /* if the sys$get_security succeeded, then ctx is valid, and the + * object/file descriptors will be ignored. But otherwise they + * are needed + */ + aclsts = sys$set_security(&obj_file_dsc, &fildsc, NULL, + OSS$M_RELCTX, addlst, &ctx, &access_mode); + if (!$VMS_STATUS_SUCCESS(aclsts) && (aclsts != SS$_NOCLASS)) { + set_errno(EVMSERR); + set_vaxc_errno(aclsts); + PerlMem_free(vmsname); + return aclsts; + } + + rnsts = lib$rename_file(vms_src_dsc, vms_dst_dsc, + NULL, NULL, + &flags, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + if ($VMS_STATUS_SUCCESS(rnsts)) { + clean_dsc = (struct dsc$descriptor_s *)vms_dst_dsc; + } + + /* Put things back the way they were. */ + ctx = 0; + aclsts = sys$get_security(&obj_file_dsc, + clean_dsc, + NULL, + OSS$M_WLOCK, + findlst, + &ctx, + &access_mode); + + if ($VMS_STATUS_SUCCESS(aclsts)) { + int sec_flags; + + sec_flags = 0; + if (!$VMS_STATUS_SUCCESS(fndsts)) + sec_flags = OSS$M_RELCTX; + + /* Get rid of the new ACE */ + aclsts = sys$set_security(NULL, NULL, NULL, + sec_flags, dellst, &ctx, &access_mode); + + /* If there was an old ACE, put it back */ + if ($VMS_STATUS_SUCCESS(aclsts) && $VMS_STATUS_SUCCESS(fndsts)) { + addlst[0].bufadr = &oldace; + aclsts = sys$set_security(NULL, NULL, NULL, + OSS$M_RELCTX, addlst, &ctx, &access_mode); + if (!$VMS_STATUS_SUCCESS(aclsts) && (aclsts != SS$_NOCLASS)) { + set_errno(EVMSERR); + set_vaxc_errno(aclsts); + rnsts = aclsts; + } + } else { + int aclsts2; + + /* Try to clear the lock on the ACL list */ + aclsts2 = sys$set_security(NULL, NULL, NULL, + OSS$M_RELCTX, NULL, &ctx, &access_mode); + + /* Rename errors are most important */ + if (!$VMS_STATUS_SUCCESS(rnsts)) + aclsts = rnsts; + set_errno(EVMSERR); + set_vaxc_errno(aclsts); + rnsts = aclsts; + } + } + else { + if (aclsts != SS$_ACLEMPTY) + rnsts = aclsts; + } + } + else + rnsts = fndsts; + + PerlMem_free(vmsname); + return rnsts; +} + + +/*{{{int rename(const char *, const char * */ +/* Not exactly what X/Open says to do, but doing it absolutely right + * and efficiently would require a lot more work. This should be close + * enough to pass all but the most strict X/Open compliance test. + */ +int +Perl_rename(pTHX_ const char *src, const char * dst) +{ +int retval; +int pre_delete = 0; +int src_sts; +int dst_sts; +Stat_t src_st; +Stat_t dst_st; + + /* Validate the source file */ + src_sts = flex_lstat(src, &src_st); + if (src_sts != 0) { + + /* No source file or other problem */ + return src_sts; + } + + dst_sts = flex_lstat(dst, &dst_st); + if (dst_sts == 0) { + + if (dst_st.st_dev != src_st.st_dev) { + /* Must be on the same device */ + errno = EXDEV; + return -1; + } + + /* VMS_INO_T_COMPARE is true if the inodes are different + * to match the output of memcmp + */ + + if (!VMS_INO_T_COMPARE(src_st.st_ino, dst_st.st_ino)) { + /* That was easy, the files are the same! */ + return 0; + } + + if (S_ISDIR(src_st.st_mode) && !S_ISDIR(dst_st.st_mode)) { + /* If source is a directory, so must be dest */ + errno = EISDIR; + return -1; + } + + } + + + if ((dst_sts == 0) && + (vms_unlink_all_versions || S_ISDIR(dst_st.st_mode))) { + + /* We have issues here if vms_unlink_all_versions is set + * If the destination exists, and is not a directory, then + * we must delete in advance. + * + * If the src is a directory, then we must always pre-delete + * the destination. + * + * If we successfully delete the dst in advance, and the rename fails + * X/Open requires that errno be EIO. + * + */ + + if (!S_ISDIR(dst_st.st_mode) || S_ISDIR(src_st.st_mode)) { + int d_sts; + d_sts = mp_do_kill_file(aTHX_ dst, S_ISDIR(dst_st.st_mode)); + if (d_sts != 0) + return d_sts; + + /* We killed the destination, so only errno now is EIO */ + pre_delete = 1; + } + } + + /* Originally the idea was to call the CRTL rename() and only + * try the lib$rename_file if it failed. + * It turns out that there are too many variants in what the + * the CRTL rename might do, so only use lib$rename_file + */ + retval = -1; + + { + /* Is the source and dest both in VMS format */ + /* if the source is a directory, then need to fileify */ + /* and dest must be a directory or non-existant. */ + + char * vms_src; + char * vms_dst; + int sts; + char * ret_str; + unsigned long flags; + struct dsc$descriptor_s old_file_dsc; + struct dsc$descriptor_s new_file_dsc; + + /* We need to modify the src and dst depending + * on if one or more of them are directories. + */ + + vms_src = PerlMem_malloc(VMS_MAXRSS); + if (vms_src == NULL) + _ckvmssts(SS$_INSFMEM); + + /* Source is always a VMS format file */ + ret_str = do_tovmsspec(src, vms_src, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + errno = EIO; + return -1; + } + + vms_dst = PerlMem_malloc(VMS_MAXRSS); + if (vms_dst == NULL) + _ckvmssts(SS$_INSFMEM); + + if (S_ISDIR(src_st.st_mode)) { + char * ret_str; + char * vms_dir_file; + + vms_dir_file = PerlMem_malloc(VMS_MAXRSS); + if (vms_dir_file == NULL) + _ckvmssts(SS$_INSFMEM); + + /* The source must be a file specification */ + ret_str = do_fileify_dirspec(vms_src, vms_dir_file, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + PerlMem_free(vms_dir_file); + errno = EIO; + return -1; + } + PerlMem_free(vms_src); + vms_src = vms_dir_file; + + /* If the dest is a directory, we must remove it + if (dst_sts == 0) { + int d_sts; + d_sts = mp_do_kill_file(aTHX_ dst, 1); + if (d_sts != 0) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + errno = EIO; + return sts; + } + + pre_delete = 1; + } + + /* The dest must be a VMS file specification */ + ret_str = do_tovmsspec(dst, vms_dst, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + errno = EIO; + return -1; + } + + /* The source must be a file specification */ + vms_dir_file = PerlMem_malloc(VMS_MAXRSS); + if (vms_dir_file == NULL) + _ckvmssts(SS$_INSFMEM); + + ret_str = do_fileify_dirspec(vms_dst, vms_dir_file, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + PerlMem_free(vms_dir_file); + errno = EIO; + return -1; + } + PerlMem_free(vms_dst); + vms_dst = vms_dir_file; + + } else { + /* File to file or file to new dir */ + + if ((dst_sts == 0) && S_ISDIR(dst_st.st_mode)) { + /* VMS pathify a dir target */ + ret_str = do_tovmspath(dst, vms_dst, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + errno = EIO; + return -1; + } + } else { + + /* fileify a target VMS file specification */ + ret_str = do_tovmsspec(dst, vms_dst, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + errno = EIO; + return -1; + } + } + } + + old_file_dsc.dsc$a_pointer = vms_src; + old_file_dsc.dsc$w_length = strlen(vms_src); + old_file_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + old_file_dsc.dsc$b_class = DSC$K_CLASS_S; + + new_file_dsc.dsc$a_pointer = vms_dst; + new_file_dsc.dsc$w_length = strlen(vms_dst); + new_file_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + new_file_dsc.dsc$b_class = DSC$K_CLASS_S; + + flags = 0; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + flags |= 2; /* LIB$M_FIL_LONG_NAMES */ +#endif + + sts = lib$rename_file(&old_file_dsc, + &new_file_dsc, + NULL, NULL, + &flags, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (!$VMS_STATUS_SUCCESS(sts)) { + + /* We could have failed because VMS style permissions do not + * permit renames that UNIX will allow. Just like the hack + * in for kill_file. + */ + sts = vms_rename_with_acl(aTHX_ &old_file_dsc, &new_file_dsc, flags); + } + + PerlMem_free(vms_src); + PerlMem_free(vms_dst); + if (!$VMS_STATUS_SUCCESS(sts)) { + errno = EIO; + return -1; + } + retval = 0; + } + + if (vms_unlink_all_versions) { + /* Now get rid of any previous versions of the source file that + * might still exist + */ + int save_errno; + save_errno = errno; + src_sts = mp_do_kill_file(aTHX_ src, S_ISDIR(src_st.st_mode)); + errno = save_errno; + } + + /* We deleted the destination, so must force the error to be EIO */ + if ((retval != 0) && (pre_delete != 0)) + errno = EIO; + + return retval; +} +/*}}}*/ + + /*{{{char *do_rmsexpand(char *fspec, char *out, int ts, char *def, unsigned opts)*/ /* Shortcut for common case of simple calls to $PARSE and $SEARCH * to expand file specification. Allows for a single default file @@ -4233,17 +5282,25 @@ struct NAML * nam; * PERL_RMSEXPAND_M_VMS - Force output file specification to VMS format. * PERL_RMSEXPAND_M_LONG - Want output in long formst * PERL_RMSEXPAND_M_VMS_IN - Input is already in VMS, so do not vmsify + * PERL_RMSEXPAND_M_SYMLINK - Use symbolic link, not target */ -static char *mp_do_tounixspec(pTHX_ const char *, char *, int); +static char *mp_do_tounixspec(pTHX_ const char *, char *, int, int *); static char * -mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts) +mp_do_rmsexpand + (pTHX_ const char *filespec, + char *outbuf, + int ts, + const char *defspec, + unsigned opts, + int * fs_utf8, + int * dfs_utf8) { static char __rmsexpand_retbuf[VMS_MAXRSS]; char * vmsfspec, *tmpfspec; char * esa, *cp, *out = NULL; char * tbuf; - char * esal; + char * esal = NULL; char * outbufl; struct FAB myfab = cc$rms_fab; rms_setup_nam(mynam); @@ -4251,6 +5308,10 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de unsigned long int retsts, trimver, trimtype, haslower = 0, isunix = 0; int sts; + /* temp hack until UTF8 is actually implemented */ + if (fs_utf8 != NULL) + *fs_utf8 = 0; + if (!filespec || !*filespec) { set_vaxc_errno(LIB$_INVARG); set_errno(EINVAL); return NULL; @@ -4270,7 +5331,7 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (isunix) { vmsfspec = PerlMem_malloc(VMS_MAXRSS); if (vmsfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tovmsspec(filespec,vmsfspec,0) == NULL) { + if (do_tovmsspec(filespec,vmsfspec,0,fs_utf8) == NULL) { PerlMem_free(vmsfspec); if (out) Safefree(out); @@ -4298,7 +5359,7 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (t_isunix) { tmpfspec = PerlMem_malloc(VMS_MAXRSS); if (tmpfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tovmsspec(defspec,tmpfspec,0) == NULL) { + if (do_tovmsspec(defspec,tmpfspec,0,dfs_utf8) == NULL) { PerlMem_free(tmpfspec); if (vmsfspec != NULL) PerlMem_free(vmsfspec); @@ -4337,6 +5398,12 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de rms_set_nam_nop(mynam, NAM$M_NO_SHORT_UPCASE); #endif + /* We may not want to follow symbolic links */ +#ifdef NAML$M_OPEN_SPECIAL + if ((opts & PERL_RMSEXPAND_M_SYMLINK) != 0) + rms_set_nam_nop(mynam, NAML$M_OPEN_SPECIAL); +#endif + /* First attempt to parse as an existing file */ retsts = sys$parse(&myfab,0,0); if (!(retsts & STS$K_SUCCESS)) { @@ -4359,7 +5426,8 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (outbufl != NULL) PerlMem_free(outbufl); PerlMem_free(esa); - PerlMem_free(esal); + if (esal != NULL) + PerlMem_free(esal); set_vaxc_errno(retsts); if (retsts == RMS$_PRV) set_errno(EACCES); else if (retsts == RMS$_DEV) set_errno(ENODEV); @@ -4378,7 +5446,8 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (outbufl != NULL) PerlMem_free(outbufl); PerlMem_free(esa); - PerlMem_free(esal); + if (esal != NULL) + PerlMem_free(esal); set_vaxc_errno(retsts); if (retsts == RMS$_PRV) set_errno(EACCES); else set_errno(EVMSERR); @@ -4433,7 +5502,7 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (trimver || trimtype) { if (defspec && *defspec) { char *defesal = NULL; - defesal = PerlMem_malloc(NAML$C_MAXRSS + 1); + defesal = PerlMem_malloc(VMS_MAXRSS + 1); if (defesal != NULL) { struct FAB deffab = cc$rms_fab; rms_setup_nam(defnam); @@ -4452,6 +5521,10 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (decc_efs_case_preserve) rms_set_nam_nop(defnam, NAM$M_NO_SHORT_UPCASE); #endif +#ifdef NAML$M_OPEN_SPECIAL + if ((opts & PERL_RMSEXPAND_M_SYMLINK) != 0) + rms_set_nam_nop(mynam, NAML$M_OPEN_SPECIAL); +#endif if (sys$parse(&deffab,0,0) & STS$K_SUCCESS) { if (trimver) { trimver = !rms_is_nam_fnb(defnam, NAM$M_EXP_VER); @@ -4533,24 +5606,26 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de if (!rms_nam_rsll(mynam)) { if (isunix) { - if (do_tounixspec(esa,outbuf,0) == NULL) { + if (do_tounixspec(tbuf, outbuf ,0 , fs_utf8) == NULL) { if (out) Safefree(out); - PerlMem_free(esal); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(esa); if (outbufl != NULL) PerlMem_free(outbufl); return NULL; } } - else strcpy(outbuf,esa); + else strcpy(outbuf, tbuf); } else if (isunix) { tmpfspec = PerlMem_malloc(VMS_MAXRSS); if (tmpfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tounixspec(outbuf,tmpfspec,0) == NULL) { + if (do_tounixspec(outbuf,tmpfspec,0,fs_utf8) == NULL) { if (out) Safefree(out); PerlMem_free(esa); - PerlMem_free(esal); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(tmpfspec); if (outbufl != NULL) PerlMem_free(outbufl); @@ -4563,7 +5638,8 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de rms_set_rsal(mynam, NULL, 0, NULL, 0); sts = rms_free_search_context(&myfab); /* Free search context */ PerlMem_free(esa); - PerlMem_free(esal); + if (esal != NULL) + PerlMem_free(esal); if (outbufl != NULL) PerlMem_free(outbufl); return outbuf; @@ -4571,9 +5647,17 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de /*}}}*/ /* External entry points */ char *Perl_rmsexpand(pTHX_ const char *spec, char *buf, const char *def, unsigned opt) -{ return do_rmsexpand(spec,buf,0,def,opt); } +{ return do_rmsexpand(spec,buf,0,def,opt,NULL,NULL); } char *Perl_rmsexpand_ts(pTHX_ const char *spec, char *buf, const char *def, unsigned opt) -{ return do_rmsexpand(spec,buf,1,def,opt); } +{ return do_rmsexpand(spec,buf,1,def,opt,NULL,NULL); } +char *Perl_rmsexpand_utf8 + (pTHX_ const char *spec, char *buf, const char *def, + unsigned opt, int * fs_utf8, int * dfs_utf8) +{ return do_rmsexpand(spec,buf,0,def,opt, fs_utf8, dfs_utf8); } +char *Perl_rmsexpand_utf8_ts + (pTHX_ const char *spec, char *buf, const char *def, + unsigned opt, int * fs_utf8, int * dfs_utf8) +{ return do_rmsexpand(spec,buf,1,def,opt, fs_utf8, dfs_utf8); } /* @@ -4602,6 +5686,7 @@ char *Perl_rmsexpand_ts(pTHX_ const char *spec, char *buf, const char *def, unsi ** tovmspath() - convert a directory spec into a VMS-style path. ** tounixspec() - convert any file spec into a Unix-style file spec. ** tovmsspec() - convert any file spec into a VMS-style spec. +** xxxxx_utf8() - Variants that support UTF8 encoding of Unix-Style file spec. ** ** Copyright 1996 by Charles Bailey ** Permission is given to distribute this code as part of the Perl @@ -4610,8 +5695,8 @@ char *Perl_rmsexpand_ts(pTHX_ const char *spec, char *buf, const char *def, unsi ** found in the Perl standard distribution. */ -/*{{{ char *fileify_dirspec[_ts](char *dir, char *buf)*/ -static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) +/*{{{ char *fileify_dirspec[_ts](char *dir, char *buf, int * utf8_fl)*/ +static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts, int *utf8_fl) { static char __fileify_retbuf[VMS_MAXRSS]; unsigned long int dirlen, retlen, addmfd = 0, hasfilename = 0; @@ -4619,6 +5704,8 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) char *trndir, *vmsdir; unsigned short int trnlnm_iter_count; int sts; + if (utf8_fl != NULL) + *utf8_fl = 0; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; @@ -4643,7 +5730,7 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) (!decc_posix_compliant_pathnames && decc_disable_posix_root)) { strcpy(trndir,*dir == '/' ? dir + 1: dir); trnlnm_iter_count = 0; - while (!strpbrk(trndir,"/]>:>") && my_trnlnm(trndir,trndir,0)) { + while (!strpbrk(trndir,"/]>:") && my_trnlnm(trndir,trndir,0)) { trnlnm_iter_count++; if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; } @@ -4701,13 +5788,13 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) if (trndir[1] == '\0' || (trndir[1] == '/' && trndir[2] == '\0')) { PerlMem_free(trndir); PerlMem_free(vmsdir); - return do_fileify_dirspec("[]",buf,ts); + return do_fileify_dirspec("[]",buf,ts,NULL); } else if (trndir[1] == '.' && (trndir[2] == '\0' || (trndir[2] == '/' && trndir[3] == '\0'))) { PerlMem_free(trndir); PerlMem_free(vmsdir); - return do_fileify_dirspec("[-]",buf,ts); + return do_fileify_dirspec("[-]",buf,ts,NULL); } } if (dirlen && trndir[dirlen-1] == '/') { /* path ends with '/'; just add .dir;1 */ @@ -4722,7 +5809,7 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) if (*(cp1+2) == '.') cp1++; if (*(cp1+2) == '/' || *(cp1+2) == '\0') { char * ret_chr; - if (do_tovmsspec(trndir,vmsdir,0) == NULL) { + if (do_tovmsspec(trndir,vmsdir,0,NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; @@ -4738,12 +5825,12 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) set_errno(EINVAL); set_vaxc_errno(RMS$_SYN); return NULL; } - if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) { + if (do_fileify_dirspec(vmsdir,trndir,0,NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - ret_chr = do_tounixspec(trndir,buf,ts); + ret_chr = do_tounixspec(trndir,buf,ts,NULL); PerlMem_free(trndir); PerlMem_free(vmsdir); return ret_chr; @@ -4764,17 +5851,17 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) */ trndir[dirlen] = '/'; trndir[dirlen+1] = '\0'; - if (do_tovmsspec(trndir,vmsdir,0) == NULL) { + if (do_tovmsspec(trndir,vmsdir,0,NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) { + if (do_fileify_dirspec(vmsdir,trndir,0,NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - ret_chr = do_tounixspec(trndir,buf,ts); + ret_chr = do_tounixspec(trndir,buf,ts,NULL); PerlMem_free(trndir); PerlMem_free(vmsdir); return ret_chr; @@ -4898,6 +5985,7 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) } } } + esa[rms_nam_esll(dirnam)] = '\0'; if (!rms_is_nam_fnb(dirnam, (NAM$M_EXP_DEV | NAM$M_EXP_DIR))) { cp1 = strchr(esa,']'); if (!cp1) cp1 = strchr(esa,'>'); @@ -4920,7 +6008,7 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) return NULL; } } - esa[rms_nam_esll(dirnam)] = '\0'; + if (rms_is_nam_fnb(dirnam, NAM$M_EXP_NAME)) { /* They provided at least the name; we added the type, if necessary, */ if (buf) retspec = buf; /* in sys$parse() */ @@ -5066,12 +6154,16 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) /*}}}*/ /* External entry points */ char *Perl_fileify_dirspec(pTHX_ const char *dir, char *buf) -{ return do_fileify_dirspec(dir,buf,0); } +{ return do_fileify_dirspec(dir,buf,0,NULL); } char *Perl_fileify_dirspec_ts(pTHX_ const char *dir, char *buf) -{ return do_fileify_dirspec(dir,buf,1); } +{ return do_fileify_dirspec(dir,buf,1,NULL); } +char *Perl_fileify_dirspec_utf8(pTHX_ const char *dir, char *buf, int * utf8_fl) +{ return do_fileify_dirspec(dir,buf,0,utf8_fl); } +char *Perl_fileify_dirspec_utf8_ts(pTHX_ const char *dir, char *buf, int * utf8_fl) +{ return do_fileify_dirspec(dir,buf,1,utf8_fl); } /*{{{ char *pathify_dirspec[_ts](char *path, char *buf)*/ -static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts) +static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts, int * utf8_fl) { static char __pathify_retbuf[VMS_MAXRSS]; unsigned long int retlen; @@ -5079,6 +6171,8 @@ static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts) unsigned short int trnlnm_iter_count; STRLEN trnlen; int sts; + if (utf8_fl != NULL) + *utf8_fl = 0; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; @@ -5317,12 +6411,16 @@ static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts) /*}}}*/ /* External entry points */ char *Perl_pathify_dirspec(pTHX_ const char *dir, char *buf) -{ return do_pathify_dirspec(dir,buf,0); } +{ return do_pathify_dirspec(dir,buf,0,NULL); } char *Perl_pathify_dirspec_ts(pTHX_ const char *dir, char *buf) -{ return do_pathify_dirspec(dir,buf,1); } +{ return do_pathify_dirspec(dir,buf,1,NULL); } +char *Perl_pathify_dirspec_utf8(pTHX_ const char *dir, char *buf, int *utf8_fl) +{ return do_pathify_dirspec(dir,buf,0,utf8_fl); } +char *Perl_pathify_dirspec_utf8_ts(pTHX_ const char *dir, char *buf, int *utf8_fl) +{ return do_pathify_dirspec(dir,buf,1,utf8_fl); } -/*{{{ char *tounixspec[_ts](char *spec, char *buf)*/ -static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) +/*{{{ char *tounixspec[_ts](char *spec, char *buf, int *)*/ +static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts, int * utf8_fl) { static char __tounixspec_retbuf[VMS_MAXRSS]; char *dirend, *rslt, *cp1, *cp3, *tmp; @@ -5331,6 +6429,8 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) int expand = 1; /* guarantee room for leading and trailing slashes */ unsigned short int trnlnm_iter_count; int cmp_rslt; + if (utf8_fl != NULL) + *utf8_fl = 0; if (spec == NULL) return NULL; if (strlen(spec) > (VMS_MAXRSS-1)) return NULL; @@ -5525,7 +6625,7 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } if ((*cp2 == '^')) { /* EFS file escape, pass the next character as is */ - /* Fix me: HEX encoding for UNICODE not implemented */ + /* Fix me: HEX encoding for Unicode not implemented */ cp2++; } else if ( *cp2 == '.') { @@ -5540,9 +6640,10 @@ static char *mp_do_tounixspec(pTHX_ const 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; + /* Fix me: HEX encoding for Unicode not implemented */ + *(cp1++) = *(++cp2); + /* An escaped dot stays as is -- don't convert to slash */ + if (*cp2 == '.') cp2++; } if (*cp2 == ':') { *(cp1++) = '/'; @@ -5580,7 +6681,10 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } else *(cp1++) = *cp2; } - while (*cp2) *(cp1++) = *(cp2++); + while (*cp2) { + if ((*cp2 == '^') && (*(cp2+1) == '.')) cp2++; /* '^.' --> '.' */ + *(cp1++) = *(cp2++); + } *cp1 = '\0'; /* This still leaves /000000/ when working with a @@ -5610,13 +6714,36 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } /* end of do_tounixspec() */ /*}}}*/ /* External entry points */ -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); } +char *Perl_tounixspec(pTHX_ const char *spec, char *buf) + { return do_tounixspec(spec,buf,0, NULL); } +char *Perl_tounixspec_ts(pTHX_ const char *spec, char *buf) + { return do_tounixspec(spec,buf,1, NULL); } +char *Perl_tounixspec_utf8(pTHX_ const char *spec, char *buf, int * utf8_fl) + { return do_tounixspec(spec,buf,0, utf8_fl); } +char *Perl_tounixspec_utf8_ts(pTHX_ const char *spec, char *buf, int * utf8_fl) + { return do_tounixspec(spec,buf,1, utf8_fl); } -#if __CRTL_VER >= 80200000 && !defined(__VAX) +#if __CRTL_VER >= 70200000 && !defined(__VAX) + +/* + This procedure is used to identify if a path is based in either + the old SYS$POSIX_ROOT: or the new 8.3 RMS based POSIX root, and + it returns the OpenVMS format directory for it. + + It is expecting specifications of only '/' or '/xxxx/' + + If a posix root does not exist, or 'xxxx' is not a directory + in the posix root, it returns a failure. + + FIX-ME: xxxx could be in UTF-8 and needs to be returned in VTF-7. -static int posix_to_vmsspec - (char *vmspath, int vmspath_len, const char *unixpath) { + It is used only internally by posix_to_vmsspec_hardway(). + */ + +static int posix_root_to_vms + (char *vmspath, int vmspath_len, + const char *unixpath, + const int * utf8_fl) { int sts; struct FAB myfab = cc$rms_fab; struct NAML mynam = cc$rms_naml; @@ -5627,20 +6754,73 @@ char *vms_delim; int dir_flag; int unixlen; + dir_flag = 0; + unixlen = strlen(unixpath); + if (unixlen == 0) { + vmspath[0] = '\0'; + return RMS$_FNF; + } + +#if __CRTL_VER >= 80200000 /* 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); + if (decc_posix_compliant_pathnames) { + 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); + } } - else { - /* This is already a VMS specification, no conversion */ - unixlen--; - strncpy(vmspath,unixpath, vmspath_len); + else +#endif + { + int path_len; + int i,j; + + /* Check to see if this is under the POSIX root */ + if (decc_disable_posix_root) { + return RMS$_FNF; + } + + /* Skip leading / */ + if (unixpath[0] == '/') { + unixpath++; + unixlen--; + } + + + strcpy(vmspath,"SYS$POSIX_ROOT:"); + + /* If this is only the / , or blank, then... */ + if (unixpath[0] == '\0') { + /* by definition, this is the answer */ + return SS$_NORMAL; + } + + /* Need to look up a directory */ + vmspath[15] = '['; + vmspath[16] = '\0'; + + /* Copy and add '^' escape characters as needed */ + j = 16; + i = 0; + while (unixpath[i] != 0) { + int k; + + j += copy_expand_unix_filename_escape + (&vmspath[j], &unixpath[i], &k, utf8_fl); + i += k; + } + + path_len = strlen(vmspath); + if (vmspath[path_len - 1] == '/') + path_len--; + vmspath[path_len] = ']'; + path_len++; + vmspath[path_len] = '\0'; + } vmspath[vmspath_len] = 0; if (unixpath[unixlen - 1] == '/') @@ -5658,7 +6838,9 @@ int unixlen; mynam.naml$b_rss = 0; if (decc_efs_case_preserve) mynam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE; +#ifdef NAML$M_OPEN_SPECIAL mynam.naml$l_input_flags |= NAML$M_OPEN_SPECIAL; +#endif /* Set up the remaining naml fields */ sts = sys$parse(&myfab); @@ -5751,12 +6933,56 @@ int unixlen; return sts; } -/* Can not use LIB$FID_TO_NAME, so doing a manual conversion */ +/* /dev/mumble needs to be handled special. + /dev/null becomes NLA0:, And there is the potential for other stuff + like /dev/tty which may need to be mapped to something. +*/ + +static int +slash_dev_special_to_vms + (const char * unixptr, + char * vmspath, + int vmspath_len) +{ +char * nextslash; +int len; +int cmp; +int islnm; + + unixptr += 4; + nextslash = strchr(unixptr, '/'); + len = strlen(unixptr); + if (nextslash != NULL) + len = nextslash - unixptr; + cmp = strncmp("null", unixptr, 5); + if (cmp == 0) { + if (vmspath_len >= 6) { + strcpy(vmspath, "_NLA0:"); + return SS$_NORMAL; + } + } +} + + +/* The built in routines do not understand perl's special needs, so + doing a manual conversion from UNIX to VMS + + If the utf8_fl is not null and points to a non-zero value, then + treat 8 bit characters as UTF-8. + + The sequence starting with '$(' and ending with ')' will be passed + through with out interpretation instead of being escaped. + + */ static int posix_to_vmsspec_hardway - (char *vmspath, int vmspath_len, const char *unixpath) { + (char *vmspath, int vmspath_len, + const char *unixpath, + int dir_flag, + int * utf8_fl) { char *esa; const char *unixptr; +const char *unixend; char *vmsptr; const char *lastslash; const char *lastdot; @@ -5765,7 +6991,11 @@ int vmslen; int dir_start; int dir_dot; int quoted; +char * v_spec, * r_spec, * d_spec, * n_spec, * e_spec, * vs_spec; +int sts, v_len, r_len, d_len, n_len, e_len, vs_len; + if (utf8_fl != NULL) + *utf8_fl = 0; unixptr = unixpath; dir_dot = 0; @@ -5782,9 +7012,20 @@ int quoted; return SS$_NORMAL; } + quoted = 0; + /* This could have a "^UP^ on the front */ + if (strncmp(unixptr,"\"^UP^",5) == 0) { + quoted = 1; + unixptr+= 5; + unixlen-= 5; + } + lastslash = strrchr(unixptr,'/'); lastdot = strrchr(unixptr,'.'); - + unixend = strrchr(unixptr,'\"'); + if (!quoted || !((unixend != NULL) && (unixend[1] == '\0'))) { + unixend = unixptr + unixlen; + } /* last dot is last dot or past end of string */ if (lastdot == NULL) @@ -5800,33 +7041,182 @@ int quoted; lastslash = unixptr + unixlen; } - /* Watch out for traiing ".." after last slash, still a directory */ - if ((lastslash[1] == '.')&&(lastslash[2] == '.')&&(lastslash[3] == '\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; + + vmsptr = vmspath; + vmslen = 0; + + /* Start with the UNIX path */ + if (*unixptr != '/') { + /* relative paths */ + + /* If allowing logical names on relative pathnames, then handle here */ + if ((unixptr[0] != '.') && !decc_disable_to_vms_logname_translation && + !decc_posix_compliant_pathnames) { + char * nextslash; + int seg_len; + char * trn; + int islnm; + + /* Find the next slash */ + nextslash = strchr(unixptr,'/'); + + esa = PerlMem_malloc(vmspath_len); + if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM); + + trn = PerlMem_malloc(VMS_MAXRSS); + if (trn == NULL) _ckvmssts_noperl(SS$_INSFMEM); + + if (nextslash != NULL) { + + seg_len = nextslash - unixptr; + strncpy(esa, unixptr, seg_len); + esa[seg_len] = 0; + } + else { + strcpy(esa, unixptr); + seg_len = strlen(unixptr); + } + /* trnlnm(section) */ + islnm = vmstrnenv(esa, trn, 0, fildev, 0); + + if (islnm) { + /* Now fix up the directory */ + + /* Split up the path to find the components */ + sts = vms_split_path + (trn, + &v_spec, + &v_len, + &r_spec, + &r_len, + &d_spec, + &d_len, + &n_spec, + &n_len, + &e_spec, + &e_len, + &vs_spec, + &vs_len); + + while (sts == 0) { + char * strt; + int cmp; + + /* A logical name must be a directory or the full + specification. It is only a full specification if + it is the only component */ + if ((unixptr[seg_len] == '\0') || + (unixptr[seg_len+1] == '\0')) { + + /* Is a directory being required? */ + if (((n_len + e_len) != 0) && (dir_flag !=0)) { + /* Not a logical name */ + break; + } + - /* dots in directories are aways escaped */ - if (lastdot < lastslash) - lastdot = unixptr + unixlen; - } + if ((unixptr[seg_len] == '/') || (dir_flag != 0)) { + /* This must be a directory */ + if (((n_len + e_len) == 0)&&(seg_len <= vmspath_len)) { + strcpy(vmsptr, esa); + vmslen=strlen(vmsptr); + vmsptr[vmslen] = ':'; + vmslen++; + vmsptr[vmslen] = '\0'; + return SS$_NORMAL; + } + } - /* if (unixptr < lastslash) then we are in a directory */ + } - dir_start = 0; - quoted = 0; - vmsptr = vmspath; - vmslen = 0; + /* must be dev/directory - ignore version */ + if ((n_len + e_len) != 0) + break; - /* This could have a "^UP^ on the front */ - if (strncmp(unixptr,"\"^UP^",5) == 0) { - quoted = 1; - unixptr+= 5; - } + /* transfer the volume */ + if (v_len > 0 && ((v_len + vmslen) < vmspath_len)) { + strncpy(vmsptr, v_spec, v_len); + vmsptr += v_len; + vmsptr[0] = '\0'; + vmslen += v_len; + } + + /* unroot the rooted directory */ + if ((r_len > 0) && ((r_len + d_len + vmslen) < vmspath_len)) { + r_spec[0] = '['; + r_spec[r_len - 1] = ']'; + + /* This should not be there, but nothing is perfect */ + if (r_len > 9) { + cmp = strcmp(&r_spec[1], "000000."); + if (cmp == 0) { + r_spec += 7; + r_spec[7] = '['; + r_len -= 7; + if (r_len == 2) + r_len = 0; + } + } + if (r_len > 0) { + strncpy(vmsptr, r_spec, r_len); + vmsptr += r_len; + vmslen += r_len; + vmsptr[0] = '\0'; + } + } + /* Bring over the directory. */ + if ((d_len > 0) && + ((d_len + vmslen) < vmspath_len)) { + d_spec[0] = '['; + d_spec[d_len - 1] = ']'; + if (d_len > 9) { + cmp = strcmp(&d_spec[1], "000000."); + if (cmp == 0) { + d_spec += 7; + d_spec[7] = '['; + d_len -= 7; + if (d_len == 2) + d_len = 0; + } + } + + if (r_len > 0) { + /* Remove the redundant root */ + if (r_len > 0) { + /* remove the ][ */ + vmsptr--; + vmslen--; + d_spec++; + d_len--; + } + strncpy(vmsptr, d_spec, d_len); + vmsptr += d_len; + vmslen += d_len; + vmsptr[0] = '\0'; + } + } + break; + } + } + + PerlMem_free(esa); + PerlMem_free(trn); + } - /* Start with the UNIX path */ - if (*unixptr != '/') { - /* relative paths */ if (lastslash > unixptr) { int dotdir_seen; @@ -5846,11 +7236,11 @@ int quoted; /* if not backing up, then it is relative forward. */ if (!((*unixptr == '.') && (unixptr[1] == '.') && - ((unixptr[2] == '/') || (unixptr[2] == '\0')))) { + ((unixptr[2] == '/') || (&unixptr[2] == unixend)))) { *vmsptr++ = '.'; vmslen++; dir_dot = 1; - } + } } else { if (dotdir_seen) { @@ -5866,14 +7256,14 @@ int quoted; else { /* Handle two special files . and .. */ if (unixptr[0] == '.') { - if (unixptr[1] == '\0') { + if (&unixptr[1] == unixend) { *vmsptr++ = '['; *vmsptr++ = ']'; vmslen += 2; *vmsptr++ = '\0'; return SS$_NORMAL; } - if ((unixptr[1] == '.') && (unixptr[2] == '\0')) { + if ((unixptr[1] == '.') && (&unixptr[2] == unixend)) { *vmsptr++ = '['; *vmsptr++ = '-'; *vmsptr++ = ']'; @@ -5903,37 +7293,63 @@ int quoted; nextslash = strchr(&unixptr[1],'/'); seg_len = 0; if (nextslash != NULL) { + int cmp; seg_len = nextslash - &unixptr[1]; strncpy(vmspath, unixptr, seg_len + 1); vmspath[seg_len+1] = 0; - sts = posix_to_vmsspec(esa, vmspath_len, vmspath); + cmp = 1; + if (seg_len == 3) { + cmp = strncmp(vmspath, "dev", 4); + if (cmp == 0) { + sts = slash_dev_special_to_vms(unixptr, vmspath, vmspath_len); + if (sts = SS$_NORMAL) + return SS$_NORMAL; + } + } + sts = posix_root_to_vms(esa, vmspath_len, vmspath, utf8_fl); } - if (sts & 1) { + if ($VMS_STATUS_SUCCESS(sts)) { /* 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 */ + sts = posix_root_to_vms(esa, vmspath_len, "/", NULL); + if ($VMS_STATUS_SUCCESS(sts)) { + 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 */ + } /* Posix root found */ + else { + /* No posix root, fall back to default directory */ + strcpy(vmspath, "SYS$DISK:["); + vmsptr = &vmspath[10]; + vmslen = 10; + if (unixptr > lastslash) { + *vmsptr = ']'; + vmsptr++; + vmslen++; + } + else { + dir_start = 1; + } + } } /* end of verified real path handling */ else { int add_6zero; @@ -5958,9 +7374,27 @@ int quoted; } else { int trnend; + int cmp; /* now we have foo:bar or foo:[000000]bar to decide from */ islnm = vmstrnenv(vmspath, esa, 0, fildev, 0); + + if (!islnm && !decc_posix_compliant_pathnames) { + + cmp = strncmp("bin", vmspath, 4); + if (cmp == 0) { + /* bin => SYS$SYSTEM: */ + islnm = vmstrnenv("SYS$SYSTEM:", esa, 0, fildev, 0); + } + else { + /* tmp => SYS$SCRATCH: */ + cmp = strncmp("tmp", vmspath, 4); + if (cmp == 0) { + islnm = vmstrnenv("SYS$SCRATCH:", esa, 0, fildev, 0); + } + } + } + trnend = islnm ? islnm - 1 : 0; /* if this was a logical name, ']' or '>' must be present */ @@ -5976,9 +7410,13 @@ int quoted; * * As it is, perl is occasionally looking for dev:[000000]tty. * which looks a little strange. + * + * Not that easy to detect as "/dev" may be file structured with + * special device files. */ - if ((add_6zero == 0) && (*nextslash == '/') && (nextslash[1] == '\0')) { + if ((add_6zero == 0) && (*nextslash == '/') && + (&nextslash[1] == unixend)) { /* No real directory present */ add_6zero = 1; } @@ -6014,8 +7452,10 @@ int quoted; PerlMem_free(esa); } /* End of relative/absolute path handling */ - while ((*unixptr) && (vmslen < vmspath_len)){ + while ((unixptr <= unixend) && (vmslen < vmspath_len)){ int dash_flag; + int in_cnt; + int out_cnt; dash_flag = 0; @@ -6024,7 +7464,8 @@ int quoted; /* First characters in a directory are handled special */ while ((*unixptr == '/') || ((*unixptr == '.') && - ((unixptr[1]=='.') || (unixptr[1]=='/') || (unixptr[1]=='\0')))) { + ((unixptr[1]=='.') || (unixptr[1]=='/') || + (&unixptr[1]==unixend)))) { int loop_flag; loop_flag = 0; @@ -6041,7 +7482,7 @@ int quoted; /* Skip redundant ./ characters */ while ((*unixptr == '.') && - ((unixptr[1] == '/')||(unixptr[1] == '\0'))) { + ((unixptr[1] == '/')||(&unixptr[1] == unixend))) { loop_flag = 1; unixptr++; if (unixptr == lastslash) @@ -6054,7 +7495,7 @@ int quoted; /* Skip redundant ../ characters */ while ((*unixptr == '.') && (unixptr[1] == '.') && - ((unixptr[2] == '/') || (unixptr[2] == '\0'))) { + ((unixptr[2] == '/') || (&unixptr[2] == unixend))) { /* Set the backing up flag */ loop_flag = 1; dir_dot = 0; @@ -6129,7 +7570,7 @@ int quoted; } /* All done? */ - if (*unixptr == '\0') + if (unixptr >= unixend) break; /* Normal characters - More EFS work probably needed */ @@ -6160,56 +7601,50 @@ int quoted; } dash_flag = 0; - if (*unixptr != '\0') + if (unixptr != unixend) unixptr++; vmslen++; break; - case '?': - *vmsptr++ = '%'; - vmslen++; - unixptr++; - break; - case ' ': - *vmsptr++ = '^'; - *vmsptr++ = '_'; - vmslen += 2; - unixptr++; - break; case '.': - if ((unixptr < lastdot) || (unixptr[1] == '\0')) { + if ((unixptr < lastdot) || (unixptr < lastslash) || + (&unixptr[1] == unixend)) { *vmsptr++ = '^'; *vmsptr++ = '.'; vmslen += 2; unixptr++; /* trailing dot ==> '^..' on VMS */ - if (*unixptr == '\0') { + if (unixptr == unixend) { *vmsptr++ = '.'; vmslen++; + unixptr++; } - *vmsptr++ = *unixptr++; - vmslen ++; - } - if (quoted && (unixptr[1] == '\0')) { - unixptr++; break; } - *vmsptr++ = '^'; + *vmsptr++ = *unixptr++; - vmslen += 2; + vmslen ++; + break; + case '"': + if (quoted && (&unixptr[1] == unixend)) { + unixptr++; + break; + } + in_cnt = copy_expand_unix_filename_escape + (vmsptr, unixptr, &out_cnt, utf8_fl); + vmsptr += out_cnt; + unixptr += in_cnt; break; case '~': case ';': case '\\': - *vmsptr++ = '^'; - *vmsptr++ = *unixptr++; - vmslen += 2; - break; + case '?': + case ' ': default: - if (*unixptr != '\0') { - *vmsptr++ = *unixptr++; - vmslen++; - } + in_cnt = copy_expand_unix_filename_escape + (vmsptr, unixptr, &out_cnt, utf8_fl); + vmsptr += out_cnt; + unixptr += in_cnt; break; } } @@ -6238,8 +7673,9 @@ int quoted; char *vmsptr2; /* Add a trailing dot if a file with no extension */ vmsptr2 = vmsptr - 1; - if ((*vmsptr2 != ']') && (*vmsptr2 != '*') && (*vmsptr2 != '%') && - (*lastdot != '.')) { + if ((vmslen > 1) && + (*vmsptr2 != ']') && (*vmsptr2 != '*') && (*vmsptr2 != '%') && + (*vmsptr2 != ')') && (*lastdot != '.')) { *vmsptr++ = '.'; vmslen++; } @@ -6250,8 +7686,35 @@ int quoted; } #endif -/*{{{ char *tovmsspec[_ts](char *path, char *buf)*/ -static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { + /* Eventual routine to convert a UTF-8 specification to VTF-7. */ +static char * utf8_to_vtf7(char * rslt, const char * path, int *utf8_fl) +{ +char * result; +int utf8_flag; + + /* If a UTF8 flag is being passed, honor it */ + utf8_flag = 0; + if (utf8_fl != NULL) { + utf8_flag = *utf8_fl; + *utf8_fl = 0; + } + + if (utf8_flag) { + /* If there is a possibility of UTF8, then if any UTF8 characters + are present, then they must be converted to VTF-7 + */ + result = strcpy(rslt, path); /* FIX-ME */ + } + else + result = strcpy(rslt, path); + + return result; +} + + +/*{{{ char *tovmsspec[_ts](char *path, char *buf, int * utf8_flag)*/ +static char *mp_do_tovmsspec + (pTHX_ const char *path, char *buf, int ts, int dir_flag, int * utf8_flag) { static char __tovmsspec_retbuf[VMS_MAXRSS]; char *rslt, *dirend; char *lastdot; @@ -6261,21 +7724,31 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { unsigned long int infront = 0, hasdir = 1; int rslt_len; int no_type_seen; + char * v_spec, * r_spec, * d_spec, * n_spec, * e_spec, * vs_spec; + int sts, v_len, r_len, d_len, n_len, e_len, vs_len; if (path == NULL) return NULL; rslt_len = VMS_MAXRSS-1; if (buf) rslt = buf; else if (ts) Newx(rslt, VMS_MAXRSS, char); else rslt = __tovmsspec_retbuf; - if (strpbrk(path,"]:>") || - (dirend = strrchr(path,'/')) == NULL) { - if (path[0] == '.') { - if (path[1] == '\0') strcpy(rslt,"[]"); - else if (path[1] == '.' && path[2] == '\0') strcpy(rslt,"[-]"); - else strcpy(rslt,path); /* probably garbage */ - } - else strcpy(rslt,path); - return rslt; + + /* '.' and '..' are "[]" and "[-]" for a quick check */ + if (path[0] == '.') { + if (path[1] == '\0') { + strcpy(rslt,"[]"); + if (utf8_flag != NULL) + *utf8_flag = 0; + return rslt; + } + else { + if (path[1] == '.' && path[2] == '\0') { + strcpy(rslt,"[-]"); + if (utf8_flag != NULL) + *utf8_flag = 0; + return rslt; + } + } } /* Posix specifications are now a native VMS format */ @@ -6283,61 +7756,83 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { #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); + posix_to_vmsspec_hardway(rslt, rslt_len, path, dir_flag, utf8_flag); return rslt; } } #endif - vms_delim = strpbrk(path,"]:>"); - - if ((vms_delim != NULL) || - ((dirend = strrchr(path,'/')) == NULL)) { + /* This is really the only way to see if this is already in VMS format */ + sts = vms_split_path + (path, + &v_spec, + &v_len, + &r_spec, + &r_len, + &d_spec, + &d_len, + &n_spec, + &n_len, + &e_spec, + &e_len, + &vs_spec, + &vs_len); + if (sts == 0) { + /* FIX-ME - If dir_flag is non-zero, then this is a mp_do_vmspath() + replacement, because the above parse just took care of most of + what is needed to do vmspath when the specification is already + in VMS format. + + And if it is not already, it is easier to do the conversion as + part of this routine than to call this routine and then work on + the result. + */ - /* VMS special characters found! */ + /* If VMS punctuation was found, it is already VMS format */ + if ((v_len != 0) || (r_len != 0) || (d_len != 0) || (vs_len != 0)) { + if (utf8_flag != NULL) + *utf8_flag = 0; + strcpy(rslt, path); + return rslt; + } + /* Now, what to do with trailing "." cases where there is no + extension? If this is a UNIX specification, and EFS characters + are enabled, then the trailing "." should be converted to a "^.". + But if this was already a VMS specification, then it should be + left alone. - if (path[0] == '.') { - if (path[1] == '\0') strcpy(rslt,"[]"); - else if (path[1] == '.' && path[2] == '\0') - strcpy(rslt,"[-]"); + So in the case of ambiguity, leave the specification alone. + */ - /* 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 - } + /* If there is a possibility of UTF8, then if any UTF8 characters + are present, then they must be converted to VTF-7 + */ + if (utf8_flag != NULL) + *utf8_flag = 0; + strcpy(rslt, path); return rslt; } + dirend = strrchr(path,'/'); + + if (dirend == NULL) { + /* If we get here with no UNIX directory delimiters, then this is + not a complete file specification, either garbage a UNIX glob + specification that can not be converted to a VMS wildcard, or + it a UNIX shell macro. MakeMaker wants these passed through AS-IS, + so apparently other programs expect this also. + + utf8 flag setting needs to be preserved. + */ + strcpy(rslt, path); + 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); + if (decc_efs_charset) { + posix_to_vmsspec_hardway(rslt, rslt_len, path, dir_flag, utf8_flag); return rslt; } #endif @@ -6345,7 +7840,9 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { 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; + if (decc_efs_charset == 0) { + if (*(dirend+2) == '.' && *(dirend+3) == '.' && !*(dirend+4)) dirend += 4; + } } cp1 = rslt; @@ -6364,6 +7861,8 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { else { strcpy(rslt,"sys$posix_root:[000000]"); } + if (utf8_flag != NULL) + *utf8_flag = 0; return rslt; } while (*(++cp2) != '/' && *cp2) *(cp1++) = *cp2; @@ -6527,7 +8026,10 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { while (*cp2) { switch(*cp2) { case '?': - *(cp1++) = '%'; + if (decc_efs_charset == 0) + *(cp1++) = '%'; + else + *(cp1++) = '?'; cp2++; case ' ': *(cp1)++ = '^'; @@ -6552,6 +8054,38 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { no_type_seen = 0; } break; + case '$': + /* This could be a macro to be passed through */ + *(cp1++) = *(cp2++); + if (*cp2 == '(') { + const char * save_cp2; + char * save_cp1; + int is_macro; + + /* paranoid check */ + save_cp2 = cp2; + save_cp1 = cp1; + is_macro = 0; + + /* Test through */ + *(cp1++) = *(cp2++); + if (isalnum(*cp2) || (*cp2 == '.') || (*cp2 == '_')) { + *(cp1++) = *(cp2++); + while (isalnum(*cp2) || (*cp2 == '.') || (*cp2 == '_')) { + *(cp1++) = *(cp2++); + } + if (*cp2 == ')') { + *(cp1++) = *(cp2++); + is_macro = 1; + } + } + if (is_macro == 0) { + /* Not really a macro - never mind */ + cp2 = save_cp2; + cp1 = save_cp1; + } + } + break; case '\"': case '~': case '`': @@ -6559,6 +8093,14 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { case '#': case '%': case '^': + /* Don't escape again if following character is + * already something we escape. + */ + if (strchr("\"~`!#%^&()=+\'@[]{}:\\|<>_.", *(cp2+1))) { + *(cp1++) = *(cp2++); + break; + } + /* But otherwise fall through and escape it. */ case '&': case '(': case ')': @@ -6607,16 +8149,24 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { } *cp1 = '\0'; + if (utf8_flag != NULL) + *utf8_flag = 0; return rslt; } /* end of do_tovmsspec() */ /*}}}*/ /* External entry points */ -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_ const char *path, char *buf, int ts) { +char *Perl_tovmsspec(pTHX_ const char *path, char *buf) + { return do_tovmsspec(path,buf,0,NULL); } +char *Perl_tovmsspec_ts(pTHX_ const char *path, char *buf) + { return do_tovmsspec(path,buf,1,NULL); } +char *Perl_tovmsspec_utf8(pTHX_ const char *path, char *buf, int * utf8_fl) + { return do_tovmsspec(path,buf,0,utf8_fl); } +char *Perl_tovmsspec_utf8_ts(pTHX_ const char *path, char *buf, int * utf8_fl) + { return do_tovmsspec(path,buf,1,utf8_fl); } + +/*{{{ char *tovmspath[_ts](char *path, char *buf, const int *)*/ +static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts, int * utf8_fl) { static char __tovmspath_retbuf[VMS_MAXRSS]; int vmslen; char *pathified, *vmsified, *cp; @@ -6624,7 +8174,7 @@ static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) { if (path == NULL) return NULL; pathified = PerlMem_malloc(VMS_MAXRSS); if (pathified == NULL) _ckvmssts(SS$_INSFMEM); - if (do_pathify_dirspec(path,pathified,0) == NULL) { + if (do_pathify_dirspec(path,pathified,0,NULL) == NULL) { PerlMem_free(pathified); return NULL; } @@ -6632,7 +8182,7 @@ static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) { vmsified = NULL; if (buf == NULL) Newx(vmsified, VMS_MAXRSS, char); - if (do_tovmsspec(pathified, buf ? buf : vmsified, 0) == NULL) { + if (do_tovmsspec(pathified, buf ? buf : vmsified, 0, NULL) == NULL) { PerlMem_free(pathified); if (vmsified) Safefree(vmsified); return NULL; @@ -6658,12 +8208,18 @@ static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) { } /* end of do_tovmspath() */ /*}}}*/ /* External entry points */ -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_ const char *path, char *buf, int ts) { +char *Perl_tovmspath(pTHX_ const char *path, char *buf) + { return do_tovmspath(path,buf,0, NULL); } +char *Perl_tovmspath_ts(pTHX_ const char *path, char *buf) + { return do_tovmspath(path,buf,1, NULL); } +char *Perl_tovmspath_utf8(pTHX_ const char *path, char *buf, int *utf8_fl) + { return do_tovmspath(path,buf,0,utf8_fl); } +char *Perl_tovmspath_utf8_ts(pTHX_ const char *path, char *buf, int *utf8_fl) + { return do_tovmspath(path,buf,1,utf8_fl); } + + +/*{{{ char *tounixpath[_ts](char *path, char *buf, int * utf8_fl)*/ +static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts, int * utf8_fl) { static char __tounixpath_retbuf[VMS_MAXRSS]; int unixlen; char *pathified, *unixified, *cp; @@ -6671,7 +8227,7 @@ static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts) { if (path == NULL) return NULL; pathified = PerlMem_malloc(VMS_MAXRSS); if (pathified == NULL) _ckvmssts(SS$_INSFMEM); - if (do_pathify_dirspec(path,pathified,0) == NULL) { + if (do_pathify_dirspec(path,pathified,0,NULL) == NULL) { PerlMem_free(pathified); return NULL; } @@ -6680,7 +8236,7 @@ static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts) { if (buf == NULL) { Newx(unixified, VMS_MAXRSS, char); } - if (do_tounixspec(pathified,buf ? buf : unixified,0) == NULL) { + if (do_tounixspec(pathified,buf ? buf : unixified,0,NULL) == NULL) { PerlMem_free(pathified); if (unixified) Safefree(unixified); return NULL; @@ -6706,24 +8262,30 @@ static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts) { } /* end of do_tounixpath() */ /*}}}*/ /* External entry points */ -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); } +char *Perl_tounixpath(pTHX_ const char *path, char *buf) + { return do_tounixpath(path,buf,0,NULL); } +char *Perl_tounixpath_ts(pTHX_ const char *path, char *buf) + { return do_tounixpath(path,buf,1,NULL); } +char *Perl_tounixpath_utf8(pTHX_ const char *path, char *buf, int * utf8_fl) + { return do_tounixpath(path,buf,0,utf8_fl); } +char *Perl_tounixpath_utf8_ts(pTHX_ const char *path, char *buf, int * utf8_fl) + { return do_tounixpath(path,buf,1,utf8_fl); } /* - * @(#)argproc.c 2.2 94/08/16 Mark Pizzolato (mark@infocomm.com) + * @(#)argproc.c 2.2 94/08/16 Mark Pizzolato (mark AT infocomm DOT com) * ***************************************************************************** * * - * Copyright (C) 1989-1994 by * + * Copyright (C) 1989-1994, 2007 by * * Mark Pizzolato - INFO COMM, Danville, California (510) 837-5600 * * * - * Permission is hereby granted for the reproduction of this software, * - * on condition that this copyright notice is included in the reproduction, * - * and that such reproduction is not for purposes of profit or material * - * gain. * + * Permission is hereby granted for the reproduction of this software * + * on condition that this copyright notice is included in source * + * distributions of the software. The code may be modified and * + * distributed under the same terms as Perl itself. * * * * 27-Aug-1994 Modified for inclusion in perl5 * - * by Charles Bailey bailey@newman.upenn.edu * + * by Charles Bailey (bailey AT newman DOT upenn DOT edu) * ***************************************************************************** */ @@ -6739,7 +8301,7 @@ char *Perl_tounixpath_ts(pTHX_ const char *path, char *buf) { return do_tounixpa * of program. With suitable modification, it may useful for other * portability problems as well. * - * Author: Mark Pizzolato mark@infocomm.com + * Author: Mark Pizzolato (mark AT infocomm DOT com) */ struct list_item { @@ -7074,7 +8636,7 @@ int rms_sts; vmsspec = PerlMem_malloc(VMS_MAXRSS); if (vmsspec == NULL) _ckvmssts_noperl(SS$_INSFMEM); if ((isunix = (int) strchr(item,'/')) != (int) NULL) - filespec.dsc$a_pointer = do_tovmsspec(item,vmsspec,0); + filespec.dsc$a_pointer = do_tovmsspec(item,vmsspec,0,NULL); if (!isunix || !filespec.dsc$a_pointer) filespec.dsc$a_pointer = item; filespec.dsc$w_length = strlen(filespec.dsc$a_pointer); @@ -7487,7 +9049,7 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) if (!wildspec || !fspec) return 0; template = unixwild; if (strpbrk(wildspec,"]>:") != NULL) { - if (do_tounixspec(wildspec,unixwild,0) == NULL) { + if (do_tounixspec(wildspec,unixwild,0,NULL) == NULL) { PerlMem_free(unixwild); return 0; } @@ -7499,7 +9061,7 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) unixified = PerlMem_malloc(VMS_MAXRSS); if (unixified == NULL) _ckvmssts(SS$_INSFMEM); if (strpbrk(fspec,"]>:") != NULL) { - if (do_tounixspec(fspec,unixified,0) == NULL) { + if (do_tounixspec(fspec,unixified,0,NULL) == NULL) { PerlMem_free(unixwild); PerlMem_free(unixified); return 0; @@ -7739,15 +9301,9 @@ Perl_opendir(pTHX_ const char *name) DIR *dd; char *dir; Stat_t sb; - int unix_flag; - - unix_flag = 0; - if (decc_efs_charset) { - unix_flag = is_unix_filespec(name); - } Newx(dir, VMS_MAXRSS, char); - if (do_tovmspath(name,dir,0) == NULL) { + if (do_tovmspath(name,dir,0,NULL) == NULL) { Safefree(dir); return NULL; } @@ -7775,8 +9331,12 @@ Perl_opendir(pTHX_ const char *name) dd->context = 0; dd->count = 0; dd->flags = 0; - if (unix_flag) - dd->flags = PERL_VMSDIR_M_UNIXSPECS; + /* By saying we always want the result of readdir() in unix format, we + * are really saying we want all the escapes removed. Otherwise the caller, + * having no way to know whether it's already in VMS format, might send it + * through tovmsspec again, thus double escaping. + */ + dd->flags = PERL_VMSDIR_M_UNIXSPECS; dd->pat.dsc$a_pointer = dd->pattern; dd->pat.dsc$w_length = strlen(dd->pattern); dd->pat.dsc$b_dtype = DSC$K_DTYPE_T; @@ -7947,7 +9507,7 @@ Perl_readdir(pTHX_ DIR *dd) /* Skip any directory component and just copy the name. */ sts = vms_split_path - (aTHX_ buff, + (buff, &v_spec, &v_len, &r_spec, @@ -7976,25 +9536,25 @@ Perl_readdir(pTHX_ DIR *dd) if (dd->flags & PERL_VMSDIR_M_UNIXSPECS) { /* Translate the encoded characters. */ - /* Fixme: unicode handling could result in embedded 0 characters */ + /* Fixme: Unicode handling could result in embedded 0 characters */ if (strchr(dd->entry.d_name, '^') != NULL) { char new_name[256]; char * q; - int cnt; p = dd->entry.d_name; q = new_name; while (*p != 0) { - int x, y; - x = copy_expand_vms_filename_escape(q, p, &y); - p += x; - q += y; + int inchars_read, outchars_added; + inchars_read = copy_expand_vms_filename_escape(q, p, &outchars_added); + p += inchars_read; + q += outchars_added; /* fix-me */ - /* if y > 1, then this is a wide file specification */ + /* if outchars_added > 1, then this is a wide file specification */ /* Wide file specifications need to be passed in Perl */ - /* counted strings apparently with a unicode flag */ + /* counted strings apparently with a Unicode flag */ } *q = 0; strcpy(dd->entry.d_name, new_name); + dd->entry.d_namlen = strlen(dd->entry.d_name); } } @@ -8222,7 +9782,7 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, *rest && !isspace(*rest) && cp2 - resspec < sizeof resspec; rest++, cp2++) *cp2 = *rest; *cp2 = '\0'; - if (do_tovmsspec(resspec,cp,0)) { + if (do_tovmsspec(resspec,cp,0,NULL)) { s = vmsspec; if (*rest) { for (cp2 = vmsspec + strlen(vmsspec); @@ -8342,7 +9902,8 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, /* Try to find the exact program requested to be run */ /*---------------------------------------------------*/ iname = do_rmsexpand - (tmpspec, image_name, 0, ".exe", PERL_RMSEXPAND_M_VMS); + (tmpspec, image_name, 0, ".exe", + PERL_RMSEXPAND_M_VMS, NULL, NULL); if (iname != NULL) { if (cando_by_name_int (S_IXUSR,0,image_name,PERL_RMSEXPAND_M_VMS_IN)) { @@ -8353,7 +9914,8 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, /* Try again with a null type */ /*----------------------------*/ iname = do_rmsexpand - (tmpspec, image_name, 0, ".", PERL_RMSEXPAND_M_VMS); + (tmpspec, image_name, 0, ".", + PERL_RMSEXPAND_M_VMS, NULL, NULL); if (iname != NULL) { if (cando_by_name_int (S_IXUSR,0,image_name, PERL_RMSEXPAND_M_VMS_IN)) { @@ -8861,7 +10423,7 @@ static int fillpasswd (pTHX_ const char *name, struct passwd *pwd) pwd->pw_passwd= pw_passwd; pwd->pw_gecos= owner.pw_gecos; pwd->pw_dir= defdev.pw_dir; - pwd->pw_unixdir= do_tounixpath(defdev.pw_dir, defdir.unixdir,1); + pwd->pw_unixdir= do_tounixpath(defdev.pw_dir, defdir.unixdir,1,NULL); pwd->pw_shell= defcli.pw_shell; if (pwd->pw_unixdir && pwd->pw_unixdir[0]) { int ldir; @@ -9668,7 +11230,7 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) } /* Convert to VMS format ensuring that it will fit in 255 characters */ - if (do_rmsexpand(file, vmsspec, 0, NULL, PERL_RMSEXPAND_M_VMS) == NULL) { + if (do_rmsexpand(file, vmsspec, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL) == NULL) { SETERRNO(ENOENT, LIB$_INVARG); return -1; } @@ -9820,7 +11382,7 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) * * A better method might be to use sys$device_scan on the first call, and to * search for the device, returning an index into the cached array. - * The number returned would be more intelligable. + * The number returned would be more intelligible. * This is probably not worth it, and anyway would take quite a bit longer * on the first call. */ @@ -9838,7 +11400,7 @@ static mydev_t encode_dev (pTHX_ const char *dev) #if LOCKID_MASK { struct dsc$descriptor_s dev_desc; - unsigned long int status, lockid, item = DVI$_LOCKID; + unsigned long int status, lockid = 0, item = DVI$_LOCKID; /* For cluster-mounted disks, the disk lock identifier is unique, so we can try that first. */ @@ -9846,7 +11408,16 @@ static mydev_t encode_dev (pTHX_ const char *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; /* Read only parameter */ - _ckvmssts(lib$getdvi(&item, 0, &dev_desc, &lockid, 0, 0)); + status = lib$getdvi(&item, 0, &dev_desc, &lockid, 0, 0); + if (!$VMS_STATUS_SUCCESS(status)) { + switch (status) { + case SS$_NOSUCHDEV: + SETERRNO(ENODEV, status); + return 0; + default: + _ckvmssts(status); + } + } if (lockid) return (lockid & ~LOCKID_MASK); } #endif @@ -9906,11 +11477,10 @@ static I32 Perl_cando_by_name_int (pTHX_ I32 bit, bool effective, const char *fname, int opts) { - static char usrname[L_cuserid]; - static struct dsc$descriptor_s usrdsc = + char usrname[L_cuserid]; + struct dsc$descriptor_s usrdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, usrname}; - char vmsname[NAM$C_MAXRSS+1]; - char *fileified; + char *vmsname = NULL, *fileified = NULL; unsigned long int objtyp = ACL$C_FILE, access, retsts, privused, iosb[2], flags; unsigned short int retlen, trnlnm_iter_count; struct dsc$descriptor_s namdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; @@ -9924,60 +11494,85 @@ Perl_cando_by_name_int 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}; + Stat_t st; + static int profile_context = -1; if (!fname || !*fname) return FALSE; - /* Make sure we expand logical names, since sys$check_access doesn't */ - fileified = NULL; - if ((opts & PERL_RMSEXPAND_M_VMS_IN) != 0) { - fileified = PerlMem_malloc(VMS_MAXRSS); - if (!strpbrk(fname,"/]>:")) { + /* Make sure we expand logical names, since sys$check_access doesn't */ + fileified = PerlMem_malloc(VMS_MAXRSS); + if (fileified == NULL) _ckvmssts(SS$_INSFMEM); + if (!strpbrk(fname,"/]>:")) { strcpy(fileified,fname); trnlnm_iter_count = 0; - while (!strpbrk(fileified,"/]>:>") && my_trnlnm(fileified,fileified,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_rmsexpand(fname, vmsname, 0, NULL, PERL_RMSEXPAND_M_VMS)) { + } + + vmsname = PerlMem_malloc(VMS_MAXRSS); + if (vmsname == NULL) _ckvmssts(SS$_INSFMEM); + if ( !(opts & PERL_RMSEXPAND_M_VMS_IN) ) { + /* Don't know if already in VMS format, so make sure */ + if (!do_rmsexpand(fname, vmsname, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL)) { PerlMem_free(fileified); + PerlMem_free(vmsname); return FALSE; } - retlen = namdsc.dsc$w_length = strlen(vmsname); - namdsc.dsc$a_pointer = vmsname; - if (vmsname[retlen-1] == ']' || vmsname[retlen-1] == '>' || - vmsname[retlen-1] == ':') { - if (!do_fileify_dirspec(vmsname,fileified,1)) return FALSE; - namdsc.dsc$w_length = strlen(fileified); - namdsc.dsc$a_pointer = fileified; - } } else { - retlen = namdsc.dsc$w_length = strlen(fname); - namdsc.dsc$a_pointer = (char *)fname; /* cast ok */ + strcpy(vmsname,fname); + } + + /* sys$check_access needs a file spec, not a directory spec. + * Don't use flex_stat here, as that depends on thread context + * having been initialized, and we may get here during startup. + */ + + retlen = namdsc.dsc$w_length = strlen(vmsname); + if (vmsname[retlen-1] == ']' + || vmsname[retlen-1] == '>' + || vmsname[retlen-1] == ':' + || (!stat(vmsname, (stat_t *)&st) && S_ISDIR(st.st_mode))) { + + if (!do_fileify_dirspec(vmsname,fileified,1,NULL)) { + PerlMem_free(fileified); + PerlMem_free(vmsname); + return FALSE; + } + fname = fileified; + } + else { + fname = vmsname; } + retlen = namdsc.dsc$w_length = strlen(fname); + namdsc.dsc$a_pointer = (char *)fname; + switch (bit) { case S_IXUSR: case S_IXGRP: case S_IXOTH: - access = ARM$M_EXECUTE; + access = ARM$M_EXECUTE; flags = CHP$M_READ; break; case S_IRUSR: case S_IRGRP: case S_IROTH: - access = ARM$M_READ; + access = ARM$M_READ; flags = CHP$M_READ | CHP$M_USEREADALL; break; case S_IWUSR: case S_IWGRP: case S_IWOTH: - access = ARM$M_WRITE; + access = ARM$M_WRITE; flags = CHP$M_READ | CHP$M_WRITE; break; case S_IDUSR: case S_IDGRP: case S_IDOTH: - access = ARM$M_DELETE; + access = ARM$M_DELETE; flags = CHP$M_READ | CHP$M_WRITE; break; default: if (fileified != NULL) PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return FALSE; } @@ -9996,16 +11591,16 @@ Perl_cando_by_name_int /* find out the space required for the profile */ _ckvmssts(sys$create_user_profile(&usrdsc,&usrprolst,0,0, - &usrprodsc.dsc$w_length,0)); + &usrprodsc.dsc$w_length,&profile_context)); /* allocate space for the profile and get it filled in */ usrprodsc.dsc$a_pointer = PerlMem_malloc(usrprodsc.dsc$w_length); if (usrprodsc.dsc$a_pointer == NULL) _ckvmssts(SS$_INSFMEM); _ckvmssts(sys$create_user_profile(&usrdsc,&usrprolst,0,usrprodsc.dsc$a_pointer, - &usrprodsc.dsc$w_length,0)); + &usrprodsc.dsc$w_length,&profile_context)); /* 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); + retsts = sys$check_access(&objtyp,&namdsc,0,armlst,&profile_context,0,0,&usrprodsc); PerlMem_free(usrprodsc.dsc$a_pointer); if (retsts == SS$_NOCALLPRIV) retsts = SS$_NOPRIV; /* not really 3rd party */ @@ -10024,17 +11619,23 @@ Perl_cando_by_name_int else set_errno(ENOENT); if (fileified != NULL) PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return FALSE; } if (retsts == SS$_NORMAL || retsts == SS$_ACCONFLICT) { if (fileified != NULL) PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return TRUE; } _ckvmssts(retsts); if (fileified != NULL) PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return FALSE; /* Should never get here */ } @@ -10086,7 +11687,9 @@ Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp) statbufp->st_devnam, 0, NULL, - PERL_RMSEXPAND_M_VMS | PERL_RMSEXPAND_M_VMS_IN); + PERL_RMSEXPAND_M_VMS | PERL_RMSEXPAND_M_VMS_IN, + NULL, + NULL); if (cptr == NULL) statbufp->st_devnam[0] = 0; } @@ -10171,10 +11774,20 @@ Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) * * If we are in Posix filespec mode, accept the filename as is. */ + + +#if __CRTL_VER >= 70300000 && !defined(__VAX) + /* The CRTL stat() falls down hard on multi-dot filenames in unix format unless + * DECC$EFS_CHARSET is in effect, so temporarily enable it if it isn't already. + */ + if (!decc_efs_charset) + decc$feature_set_value(decc$feature_get_index("DECC$EFS_CHARSET"),1,1); +#endif + #if __CRTL_VER >= 80200000 && !defined(__VAX) if (decc_posix_compliant_pathnames == 0) { #endif - if (do_fileify_dirspec(temp_fspec,fileified,0) != NULL) { + if (do_fileify_dirspec(temp_fspec,fileified,0,NULL) != NULL) { if (lstat_flag == 0) retval = stat(fileified,(stat_t *) statbufp); else @@ -10188,6 +11801,27 @@ Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) retval = lstat(temp_fspec,(stat_t *) statbufp); save_spec = temp_fspec; } +/* + * In debugging, on 8.3 Alpha, I found a case where stat was returning a + * file not found error for a directory named foo:[bar.t] or /foo/bar/t + * and lstat was working correctly for the same file. + * The only syntax that was working for stat was "foo:[bar]t.dir". + * + * Other directories with the same syntax worked fine. + * So work around the problem when it shows up here. + */ + if (retval) { + int save_errno = errno; + if (do_tovmsspec(fspec, temp_fspec, 0, NULL) != NULL) { + if (do_fileify_dirspec(temp_fspec, fileified, 0, NULL) != NULL) { + retval = stat(fileified, (stat_t *) statbufp); + save_spec = fileified; + } + } + /* Restore the errno value if third stat does not succeed */ + if (retval != 0) + errno = save_errno; + } #if __CRTL_VER >= 80200000 && !defined(__VAX) } else { if (lstat_flag == 0) @@ -10197,10 +11831,17 @@ Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) save_spec = temp_fspec; } #endif + +#if __CRTL_VER >= 70300000 && !defined(__VAX) + /* As you were... */ + if (!decc_efs_charset) + decc$feature_set_value(decc$feature_get_index("DECC$EFS_CHARSET"),1,0); +#endif + if (!retval) { char * cptr; cptr = do_rmsexpand - (save_spec, statbufp->st_devnam, 0, NULL, PERL_RMSEXPAND_M_VMS); + (save_spec, statbufp->st_devnam, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL); if (cptr == NULL) statbufp->st_devnam[0] = 0; @@ -10307,8 +11948,8 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates if (vmsin == NULL) _ckvmssts(SS$_INSFMEM); vmsout = PerlMem_malloc(VMS_MAXRSS); if (vmsout == NULL) _ckvmssts(SS$_INSFMEM); - if (!spec_in || !*spec_in || !do_tovmsspec(spec_in,vmsin,1) || - !spec_out || !*spec_out || !do_tovmsspec(spec_out,vmsout,1)) { + if (!spec_in || !*spec_in || !do_tovmsspec(spec_in,vmsin,1,NULL) || + !spec_out || !*spec_out || !do_tovmsspec(spec_out,vmsout,1,NULL)) { PerlMem_free(vmsin); PerlMem_free(vmsout); set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); @@ -10534,16 +12175,27 @@ rmsexpand_fromperl(pTHX_ CV *cv) dXSARGS; char *fspec, *defspec = NULL, *rslt; STRLEN n_a; + int fs_utf8, dfs_utf8; + fs_utf8 = 0; + dfs_utf8 = 0; if (!items || items > 2) Perl_croak(aTHX_ "Usage: VMS::Filespec::rmsexpand(spec[,defspec])"); fspec = SvPV(ST(0),n_a); + fs_utf8 = SvUTF8(ST(0)); if (!fspec || !*fspec) XSRETURN_UNDEF; - if (items == 2) defspec = SvPV(ST(1),n_a); - - rslt = do_rmsexpand(fspec,NULL,1,defspec,0); + if (items == 2) { + defspec = SvPV(ST(1),n_a); + dfs_utf8 = SvUTF8(ST(1)); + } + rslt = do_rmsexpand(fspec,NULL,1,defspec,0,&fs_utf8,&dfs_utf8); ST(0) = sv_newmortal(); - if (rslt != NULL) sv_usepvn(ST(0),rslt,strlen(rslt)); + if (rslt != NULL) { + sv_usepvn(ST(0),rslt,strlen(rslt)); + if (fs_utf8) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10553,11 +12205,18 @@ vmsify_fromperl(pTHX_ CV *cv) dXSARGS; char *vmsified; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::vmsify(spec)"); - vmsified = do_tovmsspec(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + vmsified = do_tovmsspec(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (vmsified != NULL) sv_usepvn(ST(0),vmsified,strlen(vmsified)); + if (vmsified != NULL) { + sv_usepvn(ST(0),vmsified,strlen(vmsified)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10567,11 +12226,18 @@ unixify_fromperl(pTHX_ CV *cv) dXSARGS; char *unixified; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::unixify(spec)"); - unixified = do_tounixspec(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + unixified = do_tounixspec(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (unixified != NULL) sv_usepvn(ST(0),unixified,strlen(unixified)); + if (unixified != NULL) { + sv_usepvn(ST(0),unixified,strlen(unixified)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10581,11 +12247,18 @@ fileify_fromperl(pTHX_ CV *cv) dXSARGS; char *fileified; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::fileify(spec)"); - fileified = do_fileify_dirspec(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + fileified = do_fileify_dirspec(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (fileified != NULL) sv_usepvn(ST(0),fileified,strlen(fileified)); + if (fileified != NULL) { + sv_usepvn(ST(0),fileified,strlen(fileified)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10595,11 +12268,18 @@ pathify_fromperl(pTHX_ CV *cv) dXSARGS; char *pathified; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::pathify(spec)"); - pathified = do_pathify_dirspec(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + pathified = do_pathify_dirspec(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (pathified != NULL) sv_usepvn(ST(0),pathified,strlen(pathified)); + if (pathified != NULL) { + sv_usepvn(ST(0),pathified,strlen(pathified)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10609,11 +12289,18 @@ vmspath_fromperl(pTHX_ CV *cv) dXSARGS; char *vmspath; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::vmspath(spec)"); - vmspath = do_tovmspath(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + vmspath = do_tovmspath(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (vmspath != NULL) sv_usepvn(ST(0),vmspath,strlen(vmspath)); + if (vmspath != NULL) { + sv_usepvn(ST(0),vmspath,strlen(vmspath)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10623,11 +12310,18 @@ unixpath_fromperl(pTHX_ CV *cv) dXSARGS; char *unixpath; STRLEN n_a; + int utf8_fl; if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::unixpath(spec)"); - unixpath = do_tounixpath(SvPV(ST(0),n_a),NULL,1); + utf8_fl = SvUTF8(ST(0)); + unixpath = do_tounixpath(SvPV(ST(0),n_a),NULL,1,&utf8_fl); ST(0) = sv_newmortal(); - if (unixpath != NULL) sv_usepvn(ST(0),unixpath,strlen(unixpath)); + if (unixpath != NULL) { + sv_usepvn(ST(0),unixpath,strlen(unixpath)); + if (utf8_fl) { + SvUTF8_on(ST(0)); + } + } XSRETURN(1); } @@ -10888,15 +12582,18 @@ Perl_vms_start_glob } } if ((tmpfp = PerlIO_tmpfile()) != NULL) { + int found = 0; Stat_t st; int stat_sts; stat_sts = PerlLIO_stat(SvPVX_const(tmpglob),&st); if (!stat_sts && S_ISDIR(st.st_mode)) { - wilddsc.dsc$a_pointer = tovmspath(SvPVX(tmpglob),vmsspec); + wilddsc.dsc$a_pointer = tovmspath_utf8(SvPVX(tmpglob),vmsspec,NULL); ok = (wilddsc.dsc$a_pointer != NULL); + /* maybe passed 'foo' rather than '[.foo]', thus not detected above */ + hasdir = 1; } else { - wilddsc.dsc$a_pointer = tovmsspec(SvPVX(tmpglob),vmsspec); + wilddsc.dsc$a_pointer = tovmsspec_utf8(SvPVX(tmpglob),vmsspec,NULL); ok = (wilddsc.dsc$a_pointer != NULL); } if (ok) @@ -10918,12 +12615,14 @@ Perl_vms_start_glob if (!$VMS_STATUS_SUCCESS(sts)) break; + found++; + /* with varying string, 1st word of buffer contains result length */ rstr[rslt->length] = '\0'; /* Find where all the components are */ v_sts = vms_split_path - (aTHX_ rstr, + (rstr, &v_spec, &v_len, &r_spec, @@ -10965,6 +12664,14 @@ Perl_vms_start_glob ok = (PerlIO_puts(tmpfp,begin) != EOF); } if (cxt) (void)lib$find_file_end(&cxt); + + if (!found) { + /* Be POSIXish: return the input pattern when no matches */ + begin = SvPVX(tmpglob); + strcat(begin,"\n"); + ok = (PerlIO_puts(tmpfp,begin) != EOF); + } + if (ok && sts != RMS$_NMF && sts != RMS$_DNF && sts != RMS_FNF) ok = 0; if (!ok) { @@ -10986,9 +12693,11 @@ Perl_vms_start_glob return fp; } + #ifdef HAS_SYMLINK static char * -mp_do_vms_realpath(pTHX_ const char *filespec, char * rslt_spec); +mp_do_vms_realpath(pTHX_ const char *filespec, char * rslt_spec, + const int *utf8_fl); void vms_realpath_fromperl(pTHX_ CV *cv) @@ -11004,7 +12713,7 @@ vms_realpath_fromperl(pTHX_ CV *cv) if (!fspec || !*fspec) XSRETURN_UNDEF; Newx(rslt_spec, VMS_MAXRSS + 1, char); - rslt = do_vms_realpath(fspec, rslt_spec); + rslt = do_vms_realpath(fspec, rslt_spec, NULL); ST(0) = sv_newmortal(); if (rslt != NULL) sv_usepvn(ST(0),rslt,strlen(rslt)); @@ -11101,17 +12810,18 @@ char *realpath(const char *file_name, char * resolved_name, ...); * on OpenVMS. */ static char * -mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf) +mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf, + const int *utf8_fl) { return realpath(filespec, outbuf); } /*}}}*/ /* External entry points */ -char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) -{ return do_vms_realpath(filespec, outbuf); } +char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl) +{ return do_vms_realpath(filespec, outbuf, utf8_fl); } #else -char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) +char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl) { return NULL; } #endif @@ -11207,7 +12917,6 @@ static int sys_crelnm return ret_val; } - /* C RTL Feature settings */ static int set_features @@ -11237,6 +12946,47 @@ static int set_features vms_debug_on_exception = 0; } + /* Create VTF-7 filenames from Unicode instead of UTF-8 */ + vms_vtf7_filenames = 0; + status = sys_trnlnm("PERL_VMS_VTF7_FILENAMES", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_vtf7_filenames = 1; + else + vms_vtf7_filenames = 0; + } + + + /* unlink all versions on unlink() or rename() */ + vms_vtf7_filenames = 0; + status = sys_trnlnm + ("PERL_VMS_UNLINK_ALL_VERSIONS", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_unlink_all_versions = 1; + else + vms_unlink_all_versions = 0; + } + + /* Dectect running under GNV Bash or other UNIX like shell */ +#if __CRTL_VER >= 70300000 && !defined(__VAX) + gnv_unix_shell = 0; + status = sys_trnlnm("GNV$UNIX_SHELL", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) { + gnv_unix_shell = 1; + set_feature_default("DECC$EFS_CASE_PRESERVE", 1); + set_feature_default("DECC$EFS_CHARSET", 1); + set_feature_default("DECC$FILENAME_UNIX_NO_VERSION", 1); + set_feature_default("DECC$FILENAME_UNIX_REPORT", 1); + set_feature_default("DECC$READDIR_DROPDOTNOTYPE", 1); + set_feature_default("DECC$DISABLE_POSIX_ROOT", 0); + vms_unlink_all_versions = 1; + } + else + gnv_unix_shell = 0; + } +#endif /* hacks to see if known bugs are still present for testing */ @@ -11442,25 +13192,19 @@ static int set_features } #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 + +/* .psect LIB$INITIALIZE, NOPIC, USR, CON, REL, GBL, NOSHR, NOEXE, RD, NOWRT, LONG */ +#if __DECC_VER >= 60560002 +#pragma extern_model strict_refdef "LIB$INITIALIZE" nopic, con, rel, gbl, noshr, noexe, nowrt, long +#else +#pragma extern_model strict_refdef "LIB$INITIALIZE" nopic, con, gbl, noshr, nowrt, long #endif +#endif /* __DECC */ + const long vms_cc_features = (const long)set_features; /*