X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/988c775cbb77355593cf99dafc219bbd3d6a62d5..2e05a54c0c3f7ee3e0363f0309bb362649aa71c4:/vms/vms.c diff --git a/vms/vms.c b/vms/vms.c index c684e7a..c3af096 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -1,15 +1,28 @@ -/* vms.c +/* vms.c * - * VMS-specific routines for perl5 - * Version: 5.7.0 + * VMS-specific routines for perl5 * - * August 2005 Convert VMS status code to UNIX status codes - * August 2000 tweaks to vms_image_init, my_flush, my_fwrite, cando_by_name, - * and Perl_cando by Craig Berry - * 29-Aug-2000 Charles Lane's piping improvements rolled in - * 20-Aug-1999 revisions by Charles Bailey bailey@newman.upenn.edu + * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + * 2002, 2003, 2004, 2005, 2006, 2007 by Charles Bailey and others. + * + * You may distribute under the terms of either the GNU General Public + * License or the Artistic License, as specified in the README file. + * + * Please see Changes*.* or the Perl Repository Browser for revision history. */ +/* + * Yet small as was their hunted band + * still fell and fearless was each hand, + * and strong deeds they wrought yet oft, + * and loved the woods, whose ways more soft + * them seemed than thralls of that black throne + * to live and languish in halls of stone. + * "The Lay of Leithian", Canto II, lines 135-40 + * + * [p.162 of _The Lays of Beleriand_] + */ + #include #include #include @@ -17,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +45,7 @@ #include #include #include +#include #if __CRTL_VER >= 70301000 && !defined(__VAX) #include #endif @@ -47,6 +62,13 @@ #include #include #include +#include +#if __CRTL_VER >= 70000000 /* FIXME to earliest version */ +#include +#define NO_EFN EFN$C_ENF +#else +#define NO_EFN 0; +#endif #if __CRTL_VER < 70301000 && __CRTL_VER >= 70300000 int decc$feature_get_index(const char *name); @@ -57,6 +79,93 @@ int decc$feature_set_value(int index, int mode, int value); #include #endif +#pragma member_alignment save +#pragma nomember_alignment longword +struct item_list_3 { + unsigned short len; + unsigned short code; + void * bufadr; + unsigned short * retadr; +}; +#pragma member_alignment restore + +/* More specific prototype than in starlet_c.h makes programming errors + more visible. + */ +#ifdef sys$getdviw +#undef sys$getdviw +int sys$getdviw + (unsigned long efn, + unsigned short chan, + const struct dsc$descriptor_s * devnam, + const struct item_list_3 * itmlst, + void * iosb, + 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) static int set_feature_default(const char *name, int value) @@ -110,6 +219,29 @@ return 0; # define RTL_USES_UTC 1 #endif +#if !defined(__VAX) && __CRTL_VER >= 80200000 +#ifdef lstat +#undef lstat +#endif +#else +#ifdef lstat +#undef lstat +#endif +#define lstat(_x, _y) stat(_x, _y) +#endif + +/* 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 */ @@ -157,22 +289,33 @@ 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_vms_realname(a,b,c) mp_do_vms_realname(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 *); + +static char * int_rmsexpand_vms( + const char * filespec, char * outbuf, unsigned opts); +static char * int_rmsexpand_tovms( + const char * filespec, char * outbuf, unsigned opts); +static char *int_tovmsspec + (const char *path, char *buf, int dir_flag, int * utf8_flag); +static char * int_fileify_dirspec(const char *dir, char *buf, int *utf8_fl); +static char * int_tounixspec(const char *spec, char *buf, int * utf8_fl); +static char * int_tovmspath(const char *path, char *buf, int * utf8_fl); /* see system service docs for $TRNLNM -- NOT the same as LNM$_MAX_INDEX */ #define PERL_LNM_MAX_ALLOWED_INDEX 127 @@ -222,20 +365,58 @@ static int decc_disable_to_vms_logname_translation = 1; static int decc_disable_posix_root = 1; int decc_efs_case_preserve = 0; static int decc_efs_charset = 0; +static int decc_efs_charset_index = -1; static int decc_filename_unix_no_version = 0; static int decc_filename_unix_only = 0; int decc_filename_unix_report = 0; int decc_posix_compliant_pathnames = 0; int decc_readdir_dropdotnotype = 0; static int vms_process_case_tolerant = 1; +int vms_vtf7_filenames = 0; +int gnv_unix_shell = 0; +static int vms_unlink_all_versions = 0; +static int vms_posix_exit = 0; /* bug workarounds if needed */ -int decc_bug_readdir_efs1 = 0; int decc_bug_devnull = 1; -int decc_bug_fgetname = 0; int decc_dir_barename = 0; +int vms_bug_stat_filename = 0; static int vms_debug_on_exception = 0; +static int vms_debug_fileify = 0; + +/* Simple logical name translation */ +static int simple_trnlnm + (const char * logname, + char * value, + int value_len) +{ + const $DESCRIPTOR(table_dsc, "LNM$FILE_DEV"); + const unsigned long attr = LNM$M_CASE_BLIND; + struct dsc$descriptor_s name_dsc; + int status; + unsigned short result; + struct itmlst_3 itlst[2] = {{value_len, LNM$_STRING, value, &result}, + {0, 0, 0, 0}}; + + name_dsc.dsc$w_length = strlen(logname); + name_dsc.dsc$a_pointer = (char *)logname; + name_dsc.dsc$b_dtype = DSC$K_DTYPE_T; + name_dsc.dsc$b_class = DSC$K_CLASS_S; + + status = sys$trnlnm(&attr, &table_dsc, &name_dsc, 0, itlst); + + if ($VMS_STATUS_SUCCESS(status)) { + + /* Null terminate and return the string */ + /*--------------------------------------*/ + value[result] = 0; + return result; + } + + return 0; +} + /* Is this a UNIX file specification? * No longer a simple check with EFS file specs @@ -267,6 +448,243 @@ 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 '^': + 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. * @@ -287,19 +705,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"); @@ -350,13 +776,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 @@ -368,7 +796,7 @@ int SYS$FILESCAN * path. */ static int vms_split_path - (pTHX_ const char * path, + (const char * path, char * * volume, int * vol_len, char * * root, @@ -462,10 +890,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) @@ -515,6 +943,37 @@ const int verspec = 7; return ret_stat; } +/* Routine to determine if the file specification ends with .dir */ +static int is_dir_ext(char * e_spec, int e_len, char * vs_spec, int vs_len) { + + /* e_len must be 4, and version must be <= 2 characters */ + if (e_len != 4 || vs_len > 2) + return 0; + + /* If a version number is present, it needs to be one */ + if ((vs_len == 2) && (vs_spec[1] != '1')) + return 0; + + /* Look for the DIR on the extension */ + if (vms_process_case_tolerant) { + if ((toupper(e_spec[1]) == 'D') && + (toupper(e_spec[2]) == 'I') && + (toupper(e_spec[3]) == 'R')) { + return 1; + } + } else { + /* Directory extensions are supposed to be in upper case only */ + /* I would not be surprised if this rule can not be enforced */ + /* if and when someone fully debugs the case sensitive mode */ + if ((e_spec[1] == 'D') && + (e_spec[2] == 'I') && + (e_spec[3] == 'R')) { + return 1; + } + } + return 0; +} + /* my_maxidx * Routine to retrieve the maximum equivalence index for an input @@ -596,7 +1055,13 @@ Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, int i; if (!environ) { ivenv = 1; - Perl_warn(aTHX_ "Can't read CRTL environ\n"); +#if defined(PERL_IMPLICIT_CONTEXT) + if (aTHX == NULL) { + fprintf(stderr, + "Can't read CRTL environ\n"); + } else +#endif + Perl_warn(aTHX_ "Can't read CRTL environ\n"); continue; } retsts = SS$_NOLOGNAM; @@ -620,7 +1085,7 @@ Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, unsigned short int deflen = LNM$C_NAMLENGTH; struct dsc$descriptor_d eqvdsc = {0,DSC$K_DTYPE_T,DSC$K_CLASS_D,0}; /* dynamic dsc to accomodate possible long value */ - _ckvmssts(lib$sget1_dd(&deflen,&eqvdsc)); + _ckvmssts_noperl(lib$sget1_dd(&deflen,&eqvdsc)); retsts = lib$get_symbol(&lnmdsc,&eqvdsc,&eqvlen,0); if (retsts & 1) { if (eqvlen > MAX_DCL_SYMBOL) { @@ -630,13 +1095,19 @@ Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, /* fully initialized, in which case either thr or PL_curcop */ /* might be bogus. We have to check, since ckWARN needs them */ /* both to be valid if running threaded */ +#if defined(PERL_IMPLICIT_CONTEXT) + if (aTHX == NULL) { + fprintf(stderr, + "Value of CLI symbol \"%s\" too long",lnm); + } else +#endif if (ckWARN(WARN_MISC)) { Perl_warner(aTHX_ packWARN(WARN_MISC),"Value of CLI symbol \"%s\" too long",lnm); } } strncpy(eqv,eqvdsc.dsc$a_pointer,eqvlen); } - _ckvmssts(lib$sfree1_dd(&eqvdsc)); + _ckvmssts_noperl(lib$sfree1_dd(&eqvdsc)); if (retsts == LIB$_INVSYMNAM) { ivsym = 1; continue; } if (retsts == LIB$_NOSUCHSYM) continue; break; @@ -686,7 +1157,7 @@ Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, retsts == SS$_NOLOGNAM) { set_errno(EINVAL); set_vaxc_errno(retsts); } - else _ckvmssts(retsts); + else _ckvmssts_noperl(retsts); return 0; } /* end of vmstrnenv */ /*}}}*/ @@ -695,13 +1166,17 @@ Perl_vmstrnenv(const char *lnm, char *eqv, unsigned long int idx, /* Define as a function so we can access statics. */ int Perl_my_trnlnm(pTHX_ const char *lnm, char *eqv, unsigned long int idx) { - return vmstrnenv(lnm,eqv,idx,fildev, + int flags = 0; + +#if defined(PERL_IMPLICIT_CONTEXT) + if (aTHX != NULL) +#endif #ifdef SECURE_INTERNAL_GETENV - (PL_curinterp ? PL_tainting : will_taint) ? PERL__TRNENV_SECURE : 0 -#else - 0 + flags = (PL_curinterp ? PL_tainting : will_taint) ? + PERL__TRNENV_SECURE : 0; #endif - ); + + return vmstrnenv(lnm, eqv, idx, fildev, flags); } /*}}}*/ @@ -808,7 +1283,7 @@ Perl_my_getenv(pTHX_ const char *lnm, bool sys) * for an optional name, and this "error" often shows up as the * (bogus) exit status for a die() call later on. */ if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr); - return success ? eqv : Nullch; + return success ? eqv : NULL; } } /* end of my_getenv() */ @@ -914,13 +1389,13 @@ Perl_my_getenv_len(pTHX_ const char *lnm, unsigned long *len, bool sys) * for an optional name, and this "error" often shows up as the * (bogus) exit status for a die() call later on. */ if (sys && vaxc$errno == SS$_NOLOGNAM) SETERRNO(saverr,savvmserr); - return *len ? buf : Nullch; + return *len ? buf : NULL; } } /* end of my_getenv_len() */ /*}}}*/ -static void create_mbx(pTHX_ unsigned short int *, struct dsc$descriptor_s *); +static void create_mbx(unsigned short int *, struct dsc$descriptor_s *); static void riseandshine(unsigned long int dummy) { sys$wake(0,0); } @@ -934,7 +1409,7 @@ prime_env_iter(void) static int primed = 0; HV *seenhv = NULL, *envhv; SV *sv = NULL; - char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = Nullch; + char cmd[LNM$C_NAMLENGTH+24], mbxnam[LNM$C_NAMLENGTH], *buf = NULL; unsigned short int chan; #ifndef CLI$M_TRUSTED # define CLI$M_TRUSTED 0x40 /* Missing from VAXC headers */ @@ -964,6 +1439,12 @@ prime_env_iter(void) if (PL_curinterp) { aTHX = PERL_GET_INTERP; } else { + /* we never get here because the NULL pointer will cause the */ + /* several of the routines called by this routine to access violate */ + + /* This routine is only called by hv.c/hv_iterinit which has a */ + /* context, so the real fix may be to pass it through instead of */ + /* the hoops above */ aTHX = NULL; } #endif @@ -979,7 +1460,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; @@ -1097,8 +1578,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 { @@ -1288,7 +1770,7 @@ Perl_vmssetenv(pTHX_ const char *lnm, const char *eqv, struct dsc$descriptor_s * case LIB$_NOSUCHSYM: case SS$_NOLOGNAM: set_errno(EINVAL); break; case SS$_NOPRIV: - set_errno(EACCES); + set_errno(EACCES); break; default: _ckvmssts(retsts); set_errno(EVMSERR); @@ -1347,6 +1829,11 @@ Perl_my_setenv(pTHX_ const char *lnm, const char *eqv) /* vmssetuserlnm * sets a user-mode logical in the process logical name table * used for redirection of sys$error + * + * Fix-me: The pTHX is not needed for this routine, however doio.c + * is calling it with one instead of using a macro. + * A macro needs to be added to vmsish.h and doio.c updated to use it. + * */ void Perl_vmssetuserlnm(pTHX_ const char *name, const char *eqv) @@ -1432,9 +1919,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 @@ -1450,6 +1937,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 @@ -1465,8 +1956,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}; @@ -1491,61 +1982,27 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) * system services won't do this by themselves, so we may miss * a file "hiding" behind a logical name or search list. */ 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 (vmsname == NULL) _ckvmssts_noperl(SS$_INSFMEM); - 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 = int_rmsexpand_tovms(name, vmsname, PERL_RMSEXPAND_M_SYMLINK); + 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); - do_pathify_dirspec(name, remove_name, 0); - if (!rmdir(remove_name)) { + /* Erase the file */ + rmsts = rms_erase(vmsname); - 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; } @@ -1553,11 +2010,12 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) * and the insert an ACE at the head of the ACL which allows us * to delete the file. */ - _ckvmssts(lib$getjpi(&jpicode,0,0,&(oldace.myace$l_ident),0,0)); - fildsc.dsc$w_length = strlen(rspec); - fildsc.dsc$a_pointer = rspec; + _ckvmssts_noperl(lib$getjpi(&jpicode,0,0,&(oldace.myace$l_ident),0,0)); + 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: @@ -1571,10 +2029,10 @@ mp_do_kill_file(pTHX_ const char *name, int dirflag) case RMS$_PRV: set_errno(EACCES); break; default: - _ckvmssts(aclsts); + _ckvmssts_noperl(aclsts); } set_vaxc_errno(aclsts); - PerlMem_free(rspec); + PerlMem_free(vmsname); return -1; } /* Grab any existing ACEs with this identifier in case we fail */ @@ -1585,23 +2043,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)) @@ -1625,11 +2072,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() */ @@ -1640,13 +2085,52 @@ 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); + /* lstat returns a VMS fileified specification of the name */ + /* that is looked up, and also lets verifies that this is a directory */ + + retval = flex_lstat(name, &st); + if (retval != 0) { + char * ret_spec; + + /* Due to a historical feature, flex_stat/lstat can not see some */ + /* Unix format file names that the rest of the CRTL can see */ + /* Fixing that feature will cause some perl tests to fail */ + /* So try this one more time. */ + + retval = lstat(name, &st.crtl_stat); + if (retval != 0) + return -1; + + /* force it to a file spec for the kill file to work. */ + ret_spec = do_fileify_dirspec(name, st.st_devnam, 0, NULL); + if (ret_spec == NULL) { + errno = EIO; + return -1; + } + } + + if (!S_ISDIR(st.st_mode)) { + errno = ENOTDIR; + retval = -1; + } + else { + dirfile = st.st_devnam; + + /* It may be possible for flex_stat to find a file and vmsify() to */ + /* fail with ODS-2 specifications. mp_do_kill_file can not deal */ + /* with that case, so fail it */ + if (dirfile[0] == 0) { + errno = EIO; + return -1; + } + + retval = mp_do_kill_file(aTHX_ dirfile, 1); + } + return retval; } /* end of do_rmdir */ @@ -1664,96 +2148,65 @@ Perl_do_rmdir(pTHX_ const char *name) int 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; + char * vmsfile; + 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. - */ - _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; + /* Convert the filename to VMS format and see if it is a directory */ + /* flex_lstat returns a vmsified file specification */ + rmsts = flex_lstat(name, &st); + if (rmsts != 0) { + + /* Due to a historical feature, flex_stat/lstat can not see some */ + /* Unix format file names that the rest of the CRTL can see when */ + /* ODS-2 file specifications are in use. */ + /* Fixing that feature will cause some perl tests to fail */ + /* [.lib.ExtUtils.t]Manifest.t is one of them */ + st.st_mode = 0; + vmsfile = (char *) name; /* cast ok */ + + } else { + vmsfile = st.st_devnam; + if (vmsfile[0] == 0) { + /* It may be possible for flex_stat to find a file and vmsify() */ + /* to fail with ODS-2 specifications. mp_do_kill_file can not */ + /* deal with that case, so fail it */ + errno = EIO; + return -1; } - } } - 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. + /* Remove() is allowed to delete directories, according to the X/Open + * specifications. + * This may need special handling to work with the ACL hacks. */ - 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; + if (S_ISDIR(st.st_mode)) { + rmsts = mp_do_kill_file(aTHX_ vmsfile, 1); + return rmsts; + } + + rmsts = mp_do_kill_file(aTHX_ vmsfile, 0); + + /* Need to delete all versions ? */ + if ((rmsts == 0) && (vms_unlink_all_versions == 1)) { + int i = 0; + + /* Just use lstat() here as do not need st_dev */ + /* and we know that the file is in VMS format or that */ + /* because of a historical bug, flex_stat can not see the file */ + while (lstat(vmsfile, (stat_t *)&st) == 0) { + rmsts = mp_do_kill_file(aTHX_ vmsfile, 0); + if (rmsts != 0) + break; + i++; + + /* Make sure that we do not loop forever */ + if (i > 32767) { + errno = EIO; + rmsts = -1; + break; + } + } } return rmsts; @@ -1810,19 +2263,68 @@ Perl_my_chdir(pTHX_ const char *dir) * null file name/type. However, it's commonplace under Unix, * so we'll allow it for a gain in portability. * - * - Preview- '/' will be valid soon on VMS + * '/' is valid when SYS$POSIX_ROOT or POSIX compliant pathnames are active. */ if ((dirlen > 1) && (dir1[dirlen-1] == '/')) { - char *newdir = savepvn(dir1,dirlen-1); - int ret = chdir(newdir); - Safefree(newdir); - return ret; + char *newdir; + int ret; + newdir = PerlMem_malloc(dirlen); + if (newdir ==NULL) + _ckvmssts_noperl(SS$_INSFMEM); + strncpy(newdir, dir1, dirlen-1); + newdir[dirlen-1] = '\0'; + ret = chdir(newdir); + PerlMem_free(newdir); + return ret; } else return chdir(dir1); } /* end of my_chdir */ /*}}}*/ +/*{{{int my_chmod(char *, mode_t)*/ +int +Perl_my_chmod(pTHX_ const char *file_spec, mode_t mode) +{ + Stat_t st; + int ret = -1; + char * changefile; + 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. + */ + changefile = (char *) file_spec; /* cast ok */ + ret = flex_lstat(file_spec, &st); + if (ret != 0) { + + /* Due to a historical feature, flex_stat/lstat can not see some */ + /* Unix format file names that the rest of the CRTL can see when */ + /* ODS-2 file specifications are in use. */ + /* Fixing that feature will cause some perl tests to fail */ + /* [.lib.ExtUtils.t]Manifest.t is one of them */ + st.st_mode = 0; + + } else { + /* It may be possible to get here with nothing in st_devname */ + /* chmod still may work though */ + if (st.st_devnam[0] != 0) { + changefile = st.st_devnam; + } + } + ret = chmod(changefile, mode); + return ret; +} /* end of my_chmod */ +/*}}}*/ + + /*{{{FILE *my_tmpfile()*/ FILE * my_tmpfile(void) @@ -1903,7 +2405,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) @@ -1931,7 +2433,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 @@ -1940,6 +2453,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 @@ -2027,7 +2546,7 @@ Perl_my_kill(int pid, int sig) case SS$_INSFMEM: set_errno(ENOMEM); break; default: - _ckvmssts(iss); + _ckvmssts_noperl(iss); set_errno(EVMSERR); } set_vaxc_errno(iss); @@ -2223,6 +2742,9 @@ int unix_status; case RMS$_WLK: /* Device write locked */ unix_status = EACCES; break; + case RMS$_MKD: /* Failed to mark for delete */ + unix_status = EPERM; + break; /* case RMS$_NMF: */ /* No more files */ } } @@ -2367,7 +2889,7 @@ int test_unix_status; static void -create_mbx(pTHX_ unsigned short int *chan, struct dsc$descriptor_s *namdsc) +create_mbx(unsigned short int *chan, struct dsc$descriptor_s *namdsc) { unsigned long int mbxbufsiz; static unsigned long int syssize = 0; @@ -2385,7 +2907,7 @@ create_mbx(pTHX_ unsigned short int *chan, struct dsc$descriptor_s *namdsc) * keep the size between 128 and MAXBUF. * */ - _ckvmssts(lib$getsyi(&syiitm, &syssize, 0, 0, 0, 0)); + _ckvmssts_noperl(lib$getsyi(&syiitm, &syssize, 0, 0, 0, 0)); } if (vmstrnenv("PERL_MBX_SIZE", csize, 0, fildev, 0)) { @@ -2396,9 +2918,10 @@ create_mbx(pTHX_ unsigned short int *chan, struct dsc$descriptor_s *namdsc) if (mbxbufsiz < 128) mbxbufsiz = 128; if (mbxbufsiz > syssize) mbxbufsiz = syssize; - _ckvmssts(sts = sys$crembx(0,chan,mbxbufsiz,mbxbufsiz,0,0,0)); + _ckvmssts_noperl(sts = sys$crembx(0,chan,mbxbufsiz,mbxbufsiz,0,0,0)); - _ckvmssts(sts = lib$getdvi(&dviitm, chan, NULL, NULL, namdsc, &namdsc->dsc$w_length)); + sts = lib$getdvi(&dviitm, chan, NULL, NULL, namdsc, &namdsc->dsc$w_length); + _ckvmssts_noperl(sts); namdsc->dsc$a_pointer[namdsc->dsc$w_length] = '\0'; } /* end of create_mbx() */ @@ -2481,6 +3004,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 @@ -2519,20 +3044,37 @@ static $DESCRIPTOR(nl_desc, "NL:"); static unsigned long int -pipe_exit_routine(pTHX) +pipe_exit_routine() { pInfo info; 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 defined(PERL_IMPLICIT_CONTEXT) + /* We need to use the Perl context of the thread that created */ + /* the pipe. */ + pTHX; + if (info->err) + aTHX = info->err->thx; + else if (info->out) + aTHX = info->out->thx; + else if (info->in) + aTHX = info->in->thx; +#endif + if (!info->useFILE +#if defined(USE_ITHREADS) + && my_perl +#endif + && PL_perlio_fd_refcnt) + PerlIO_flush(info->fp); else fflush((FILE *)info->fp); } @@ -2551,7 +3093,7 @@ pipe_exit_routine(pTHX) _ckvmssts_noperl(sys$setast(0)); if (info->in && !info->in->shut_on_empty) { _ckvmssts_noperl(sys$qio(0,info->in->chan_in,IO$_WRITEOF,0,0,0, - 0, 0, 0, 0, 0, 0)); + 0, 0, 0, 0, 0, 0)); info->waiting = 1; did_stuff = 1; } @@ -2614,12 +3156,25 @@ 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; } while(open_pipes) { + +#if defined(PERL_IMPLICIT_CONTEXT) + /* We need to use the Perl context of the thread that created */ + /* the pipe. */ + pTHX; + if (open_pipes->err) + aTHX = open_pipes->err->thx; + else if (open_pipes->out) + aTHX = open_pipes->out->thx; + else if (open_pipes->in) + aTHX = open_pipes->in->thx; +#endif if ((sts = my_pclose(open_pipes->fp)) == -1) retsts = vaxc$errno; else if (!(sts & 1)) retsts = sts; } @@ -2782,11 +3337,11 @@ pipe_tochild_setup(pTHX_ char *rmbx, char *wmbx) int j, n; n = sizeof(Pipe); - _ckvmssts(lib$get_vm(&n, &p)); + _ckvmssts_noperl(lib$get_vm(&n, &p)); - create_mbx(aTHX_ &p->chan_in , &d_mbx1); - create_mbx(aTHX_ &p->chan_out, &d_mbx2); - _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); + create_mbx(&p->chan_in , &d_mbx1); + create_mbx(&p->chan_out, &d_mbx2); + _ckvmssts_noperl(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); p->buf = 0; p->shut_on_empty = FALSE; @@ -2807,9 +3362,9 @@ pipe_tochild_setup(pTHX_ char *rmbx, char *wmbx) n = sizeof(CBuf) + p->bufsize; for (j = 0; j < INITIAL_TOCHILDQUEUE; j++) { - _ckvmssts(lib$get_vm(&n, &b)); + _ckvmssts_noperl(lib$get_vm(&n, &b)); b->buf = (char *) b + sizeof(CBuf); - _ckvmssts(lib$insqhi(b, &p->free)); + _ckvmssts_noperl(lib$insqhi(b, &p->free)); } pipe_tochild2_ast(p); @@ -2836,17 +3391,17 @@ pipe_tochild1_ast(pPipe p) if (eof) { p->shut_on_empty = TRUE; b->eof = TRUE; - _ckvmssts(sys$dassgn(p->chan_in)); + _ckvmssts_noperl(sys$dassgn(p->chan_in)); } else { - _ckvmssts(iss); + _ckvmssts_noperl(iss); } b->eof = eof; b->size = p->iosb.count; - _ckvmssts(sts = lib$insqhi(b, &p->wait)); + _ckvmssts_noperl(sts = lib$insqhi(b, &p->wait)); if (p->need_wake) { p->need_wake = FALSE; - _ckvmssts(sys$dclast(pipe_tochild2_ast,p,0)); + _ckvmssts_noperl(sys$dclast(pipe_tochild2_ast,p,0)); } } else { p->retry = 1; /* initial call */ @@ -2857,18 +3412,18 @@ pipe_tochild1_ast(pPipe p) while (1) { iss = lib$remqti(&p->free, &b); if (iss == LIB$_QUEWASEMP) return; - _ckvmssts(iss); - _ckvmssts(lib$free_vm(&n, &b)); + _ckvmssts_noperl(iss); + _ckvmssts_noperl(lib$free_vm(&n, &b)); } } iss = lib$remqti(&p->free, &b); if (iss == LIB$_QUEWASEMP) { int n = sizeof(CBuf) + p->bufsize; - _ckvmssts(lib$get_vm(&n, &b)); + _ckvmssts_noperl(lib$get_vm(&n, &b)); b->buf = (char *) b + sizeof(CBuf); } else { - _ckvmssts(iss); + _ckvmssts_noperl(iss); } p->curr = b; @@ -2877,7 +3432,7 @@ pipe_tochild1_ast(pPipe p) &p->iosb, pipe_tochild1_ast, p, b->buf, p->bufsize, 0, 0, 0, 0); if (iss == SS$_ENDOFFILE && p->shut_on_empty) iss = SS$_NORMAL; - _ckvmssts(iss); + _ckvmssts_noperl(iss); } @@ -2899,9 +3454,9 @@ pipe_tochild2_ast(pPipe p) do { if (p->type) { /* type=1 has old buffer, dispose */ if (p->shut_on_empty) { - _ckvmssts(lib$free_vm(&n, &b)); + _ckvmssts_noperl(lib$free_vm(&n, &b)); } else { - _ckvmssts(lib$insqhi(b, &p->free)); + _ckvmssts_noperl(lib$insqhi(b, &p->free)); } p->type = 0; } @@ -2910,11 +3465,11 @@ pipe_tochild2_ast(pPipe p) if (iss == LIB$_QUEWASEMP) { if (p->shut_on_empty) { if (done) { - _ckvmssts(sys$dassgn(p->chan_out)); + _ckvmssts_noperl(sys$dassgn(p->chan_out)); *p->pipe_done = TRUE; - _ckvmssts(sys$setef(pipe_ef)); + _ckvmssts_noperl(sys$setef(pipe_ef)); } else { - _ckvmssts(sys$qio(0,p->chan_out,IO$_WRITEOF, + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_WRITEOF, &p->iosb2, pipe_tochild2_ast, p, 0, 0, 0, 0, 0, 0)); } return; @@ -2922,17 +3477,17 @@ pipe_tochild2_ast(pPipe p) p->need_wake = TRUE; return; } - _ckvmssts(iss); + _ckvmssts_noperl(iss); p->type = 1; } while (done); p->curr2 = b; if (b->eof) { - _ckvmssts(sys$qio(0,p->chan_out,IO$_WRITEOF, + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_WRITEOF, &p->iosb2, pipe_tochild2_ast, p, 0, 0, 0, 0, 0, 0)); } else { - _ckvmssts(sys$qio(0,p->chan_out,IO$_WRITEVBLK, + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_WRITEVBLK, &p->iosb2, pipe_tochild2_ast, p, b->buf, b->size, 0, 0, 0, 0)); } @@ -2953,13 +3508,13 @@ pipe_infromchild_setup(pTHX_ char *rmbx, char *wmbx) unsigned int dviitm = DVI$_DEVBUFSIZ; int n = sizeof(Pipe); - _ckvmssts(lib$get_vm(&n, &p)); - create_mbx(aTHX_ &p->chan_in , &d_mbx1); - create_mbx(aTHX_ &p->chan_out, &d_mbx2); + _ckvmssts_noperl(lib$get_vm(&n, &p)); + create_mbx(&p->chan_in , &d_mbx1); + create_mbx(&p->chan_out, &d_mbx2); - _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); + _ckvmssts_noperl(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); n = p->bufsize * sizeof(char); - _ckvmssts(lib$get_vm(&n, &p->buf)); + _ckvmssts_noperl(lib$get_vm(&n, &p->buf)); p->shut_on_empty = FALSE; p->info = 0; p->type = 0; @@ -2986,7 +3541,7 @@ pipe_infromchild_ast(pPipe p) #endif if (p->info && p->info->closing && p->chan_out) { /* output shutdown */ - _ckvmssts(sys$dassgn(p->chan_out)); + _ckvmssts_noperl(sys$dassgn(p->chan_out)); p->chan_out = 0; } @@ -3000,22 +3555,22 @@ pipe_infromchild_ast(pPipe p) if (p->type == 1) { p->type = 0; if (myeof && p->chan_in) { /* input shutdown */ - _ckvmssts(sys$dassgn(p->chan_in)); + _ckvmssts_noperl(sys$dassgn(p->chan_in)); p->chan_in = 0; } if (p->chan_out) { if (myeof || kideof) { /* pass EOF to parent */ - _ckvmssts(sys$qio(0,p->chan_out,IO$_WRITEOF, &p->iosb, - pipe_infromchild_ast, p, - 0, 0, 0, 0, 0, 0)); + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_WRITEOF, &p->iosb, + pipe_infromchild_ast, p, + 0, 0, 0, 0, 0, 0)); return; } else if (eof) { /* eat EOF --- fall through to read*/ } else { /* transmit data */ - _ckvmssts(sys$qio(0,p->chan_out,IO$_WRITEVBLK,&p->iosb, - pipe_infromchild_ast,p, - p->buf, p->iosb.count, 0, 0, 0, 0)); + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_WRITEVBLK,&p->iosb, + pipe_infromchild_ast,p, + p->buf, p->iosb.count, 0, 0, 0, 0)); return; } } @@ -3025,7 +3580,7 @@ pipe_infromchild_ast(pPipe p) if (!p->chan_in && !p->chan_out) { *p->pipe_done = TRUE; - _ckvmssts(sys$setef(pipe_ef)); + _ckvmssts_noperl(sys$setef(pipe_ef)); return; } @@ -3043,13 +3598,13 @@ pipe_infromchild_ast(pPipe p) pipe_infromchild_ast,p, p->buf, p->bufsize, 0, 0, 0, 0); if (p->shut_on_empty && iss == SS$_ENDOFFILE) iss = SS$_NORMAL; - _ckvmssts(iss); + _ckvmssts_noperl(iss); } else { /* send EOFs for extra reads */ p->iosb.status = SS$_ENDOFFILE; p->iosb.dvispec = 0; - _ckvmssts(sys$qio(0,p->chan_out,IO$_SETMODE|IO$M_READATTN, - 0, 0, 0, - pipe_infromchild_ast, p, 0, 0, 0, 0)); + _ckvmssts_noperl(sys$qio(0,p->chan_out,IO$_SETMODE|IO$M_READATTN, + 0, 0, 0, + pipe_infromchild_ast, p, 0, 0, 0, 0)); } } } @@ -3068,30 +3623,59 @@ pipe_mbxtofd_setup(pTHX_ int fd, char *out) /* things like terminals and mbx's don't need this filter */ if (fd && fstat(fd,&s) == 0) { unsigned long dviitm = DVI$_DEVCHAR, devchar; - struct dsc$descriptor_s d_dev = {strlen(s.st_dev), DSC$K_DTYPE_T, - DSC$K_CLASS_S, s.st_dev}; - - _ckvmssts(lib$getdvi(&dviitm,0,&d_dev,&devchar,0,0)); - if (!(devchar & DEV$M_DIR)) { /* non directory structured...*/ - strcpy(out, s.st_dev); - return 0; - } + char device[65]; + unsigned short dev_len; + struct dsc$descriptor_s d_dev; + char * cptr; + struct item_list_3 items[3]; + int status; + unsigned short dvi_iosb[4]; + + cptr = getname(fd, out, 1); + if (cptr == NULL) _ckvmssts_noperl(SS$_NOSUCHDEV); + d_dev.dsc$a_pointer = out; + d_dev.dsc$w_length = strlen(out); + d_dev.dsc$b_dtype = DSC$K_DTYPE_T; + d_dev.dsc$b_class = DSC$K_CLASS_S; + + items[0].len = 4; + items[0].code = DVI$_DEVCHAR; + items[0].bufadr = &devchar; + items[0].retadr = NULL; + items[1].len = 64; + items[1].code = DVI$_FULLDEVNAM; + items[1].bufadr = device; + items[1].retadr = &dev_len; + items[2].len = 0; + items[2].code = 0; + + status = sys$getdviw + (NO_EFN, 0, &d_dev, items, dvi_iosb, NULL, NULL, NULL); + _ckvmssts_noperl(status); + if ($VMS_STATUS_SUCCESS(dvi_iosb[0])) { + device[dev_len] = 0; + + if (!(devchar & DEV$M_DIR)) { + strcpy(out, device); + return 0; + } + } } - _ckvmssts(lib$get_vm(&n, &p)); + _ckvmssts_noperl(lib$get_vm(&n, &p)); p->fd_out = dup(fd); - create_mbx(aTHX_ &p->chan_in, &d_mbx); - _ckvmssts(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); + create_mbx(&p->chan_in, &d_mbx); + _ckvmssts_noperl(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize)); n = (p->bufsize+1) * sizeof(char); - _ckvmssts(lib$get_vm(&n, &p->buf)); + _ckvmssts_noperl(lib$get_vm(&n, &p->buf)); p->shut_on_empty = FALSE; p->retry = 0; p->info = 0; strcpy(out, mbx); - _ckvmssts(sys$qio(0, p->chan_in, IO$_READVBLK, &p->iosb, - pipe_mbxtofd_ast, p, - p->buf, p->bufsize, 0, 0, 0, 0)); + _ckvmssts_noperl(sys$qio(0, p->chan_in, IO$_READVBLK, &p->iosb, + pipe_mbxtofd_ast, p, + p->buf, p->bufsize, 0, 0, 0, 0)); return p; } @@ -3113,7 +3697,7 @@ pipe_mbxtofd_ast(pPipe p) close(p->fd_out); sys$dassgn(p->chan_in); *p->pipe_done = TRUE; - _ckvmssts(sys$setef(pipe_ef)); + _ckvmssts_noperl(sys$setef(pipe_ef)); return; } @@ -3123,13 +3707,13 @@ pipe_mbxtofd_ast(pPipe p) if (iss2 < 0) { p->retry++; if (p->retry < MAX_RETRY) { - _ckvmssts(sys$setimr(0,delaytime,pipe_mbxtofd_ast,p)); + _ckvmssts_noperl(sys$setimr(0,delaytime,pipe_mbxtofd_ast,p)); return; } } p->retry = 0; } else if (err) { - _ckvmssts(iss); + _ckvmssts_noperl(iss); } @@ -3137,7 +3721,7 @@ pipe_mbxtofd_ast(pPipe p) pipe_mbxtofd_ast, p, p->buf, p->bufsize, 0, 0, 0, 0); if (p->shut_on_empty && (iss == SS$_ENDOFFILE)) iss = SS$_NORMAL; - _ckvmssts(iss); + _ckvmssts_noperl(iss); } @@ -3184,7 +3768,7 @@ store_pipelocs(pTHX) /* the . directory from @INC comes last */ p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); - if (p == NULL) _ckvmssts(SS$_INSFMEM); + if (p == NULL) _ckvmssts_noperl(SS$_INSFMEM); p->next = head_PLOC; head_PLOC = p; strcpy(p->dir,"./"); @@ -3192,7 +3776,7 @@ store_pipelocs(pTHX) /* get the directory from $^X */ unixdir = PerlMem_malloc(VMS_MAXRSS); - if (unixdir == NULL) _ckvmssts(SS$_INSFMEM); + if (unixdir == NULL) _ckvmssts_noperl(SS$_INSFMEM); #ifdef PERL_IMPLICIT_CONTEXT if (aTHX && PL_origargv && PL_origargv[0]) { /* maybe nul if embedded Perl */ @@ -3216,9 +3800,9 @@ store_pipelocs(pTHX) temp[1] = '\0'; } - if ((tounixpath(temp, unixdir)) != Nullch) { + if ((tounixpath_utf8(temp, unixdir, NULL)) != NULL) { p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); - if (p == NULL) _ckvmssts(SS$_INSFMEM); + if (p == NULL) _ckvmssts_noperl(SS$_INSFMEM); p->next = head_PLOC; head_PLOC = p; strncpy(p->dir,unixdir,sizeof(p->dir)-1); @@ -3239,7 +3823,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)) == NULL) continue; p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); @@ -3252,9 +3836,9 @@ 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)) != NULL) { p = (pPLOC) PerlMem_malloc(sizeof(PLOC)); - if (p == NULL) _ckvmssts(SS$_INSFMEM); + if (p == NULL) _ckvmssts_noperl(SS$_INSFMEM); p->next = head_PLOC; head_PLOC = p; strncpy(p->dir,unixdir,sizeof(p->dir)-1); @@ -3264,6 +3848,14 @@ store_pipelocs(pTHX) PerlMem_free(unixdir); } +static I32 +Perl_cando_by_name_int + (pTHX_ I32 bit, bool effective, const char *fname, int opts); +#if !defined(PERL_IMPLICIT_CONTEXT) +#define cando_by_name_int Perl_cando_by_name_int +#else +#define cando_by_name_int(a,b,c,d) Perl_cando_by_name_int(aTHX_ a,b,c,d) +#endif static char * find_vmspipe(pTHX) @@ -3274,8 +3866,9 @@ find_vmspipe(pTHX) /* already found? Check and use ... need read+execute permission */ if (vmspipe_file_status == 1) { - if (cando_by_name(S_IRUSR, 0, vmspipe_file) - && cando_by_name(S_IXUSR, 0, vmspipe_file)) { + if (cando_by_name_int(S_IRUSR, 0, vmspipe_file, PERL_RMSEXPAND_M_VMS_IN) + && cando_by_name_int + (S_IXUSR, 0, vmspipe_file, PERL_RMSEXPAND_M_VMS_IN)) { return vmspipe_file; } vmspipe_file_status = 0; @@ -3296,12 +3889,13 @@ find_vmspipe(pTHX) file[NAM$C_MAXRSS] = '\0'; p = p->next; - exp_res = do_rmsexpand - (file, vmspipe_file, 0, NULL, PERL_RMSEXPAND_M_VMS); + exp_res = int_rmsexpand_tovms(file, vmspipe_file, 0); if (!exp_res) continue; - if (cando_by_name(S_IRUSR, 0, vmspipe_file) - && cando_by_name(S_IXUSR, 0, vmspipe_file)) { + if (cando_by_name_int + (S_IRUSR, 0, vmspipe_file, PERL_RMSEXPAND_M_VMS_IN) + && cando_by_name_int + (S_IXUSR, 0, vmspipe_file, PERL_RMSEXPAND_M_VMS_IN)) { vmspipe_file_status = 1; return vmspipe_file; } @@ -3386,14 +3980,14 @@ vmspipe_tempfile(pTHX) fsync(fileno(fp)); fgetname(fp, file, 1); - fstat(fileno(fp), (struct stat *)&s0); + fstat(fileno(fp), &s0.crtl_stat); fclose(fp); if (decc_filename_unix_only) - do_tounixspec(file, file, 0); + int_tounixspec(file, file, NULL); fp = fopen(file,"r","shr=get"); if (!fp) return 0; - fstat(fileno(fp), (struct stat *)&s1); + fstat(fileno(fp), &s1.crtl_stat); cmp_result = VMS_INO_T_COMPARE(s0.crtl_stat.st_ino, s1.crtl_stat.st_ino); if ((cmp_result != 0) && (s0.st_ctime != s1.st_ctime)) { @@ -3405,11 +3999,276 @@ vmspipe_tempfile(pTHX) } +static int vms_is_syscommand_xterm(void) +{ + 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 = NULL; + 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(&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_noperl(lib$free_vm(&n, &info)); + return NULL; + } + + /* All done */ + return info->fp; +} + +static I32 my_pclose_pinfo(pTHX_ pInfo info); static PerlIO * safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) { static int handler_set_up = FALSE; + PerlIO * ret_fp; 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 @@ -3418,7 +4277,7 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) unsigned int table = LIB$K_CLI_LOCAL_SYM; int j, wait = 0, n; char *p, mode[10], symbol[MAX_DCL_SYMBOL+1], *vmspipe; - char in[512], out[512], err[512], mbx[512]; + char *in, *out, *err, mbx[512]; FILE *tpipe = 0; char tfilebuf[NAM$C_MAXRSS+1]; pInfo info = NULL; @@ -3433,7 +4292,25 @@ 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; + +#if defined(PERL_IMPLICIT_CONTEXT) + /* Can not fork an xterm with a NULL context */ + /* This probably could never happen */ + xterm_fd = NULL; + if (aTHX != NULL) +#endif + xterm_fd = create_forked_xterm(aTHX_ cmd, in_mode); + if (xterm_fd != NULL) + return xterm_fd; + } + if (!head_PLOC) store_pipelocs(aTHX); /* at least TRY to use a static vmspipe file */ /* once-per-program initialization... @@ -3447,19 +4324,19 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) */ if (!pipe_ef) { - _ckvmssts(sys$setast(0)); + _ckvmssts_noperl(sys$setast(0)); if (!pipe_ef) { unsigned long int pidcode = JPI$_PID; $DESCRIPTOR(d_delay, RETRY_DELAY); - _ckvmssts(lib$get_ef(&pipe_ef)); - _ckvmssts(lib$getjpi(&pidcode,0,0,&mypid,0,0)); - _ckvmssts(sys$bintim(&d_delay, delaytime)); + _ckvmssts_noperl(lib$get_ef(&pipe_ef)); + _ckvmssts_noperl(lib$getjpi(&pidcode,0,0,&mypid,0,0)); + _ckvmssts_noperl(sys$bintim(&d_delay, delaytime)); } if (!handler_set_up) { - _ckvmssts(sys$dclexh(&pipe_exitblock)); + _ckvmssts_noperl(sys$dclexh(&pipe_exitblock)); handler_set_up = TRUE; } - _ckvmssts(sys$setast(1)); + _ckvmssts_noperl(sys$setast(1)); } /* see if we can find a VMSPIPE.COM */ @@ -3474,7 +4351,7 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) if (ckWARN(WARN_PIPE)) { Perl_warner(aTHX_ packWARN(WARN_PIPE),"unable to find VMSPIPE.COM for i/o piping"); } - return Nullfp; + return NULL; } fgetname(tpipe,tfilebuf+1,1); } @@ -3497,19 +4374,19 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: set_errno(E2BIG); break; case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ - _ckvmssts(sts); /* fall through */ + _ckvmssts_noperl(sts); /* fall through */ default: /* SS$_DUPLNAM, SS$_CLI, resource exhaustion, etc. */ 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; - return Nullfp; + return NULL; } n = sizeof(Info); - _ckvmssts(lib$get_vm(&n, &info)); + _ckvmssts_noperl(lib$get_vm(&n, &info)); strcpy(mode,in_mode); info->mode = *mode; @@ -3519,12 +4396,22 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) info->in = 0; info->out = 0; info->err = 0; - info->fp = Nullfp; + info->fp = NULL; info->useFILE = 0; info->waiting = 0; 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_noperl(SS$_INSFMEM); + out = PerlMem_malloc(VMS_MAXRSS); + if (out == NULL) _ckvmssts_noperl(SS$_INSFMEM); + err = PerlMem_malloc(VMS_MAXRSS); + if (err == NULL) _ckvmssts_noperl(SS$_INSFMEM); + in[0] = out[0] = err[0] = '\0'; if ((p = strchr(mode,'F')) != NULL) { /* F -> use FILE* */ @@ -3545,7 +4432,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); @@ -3556,23 +4443,23 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) while (!info->out_done) { int done; - _ckvmssts(sys$setast(0)); + _ckvmssts_noperl(sys$setast(0)); done = info->out_done; - if (!done) _ckvmssts(sys$clref(pipe_ef)); - _ckvmssts(sys$setast(1)); - if (!done) _ckvmssts(sys$waitfr(pipe_ef)); + if (!done) _ckvmssts_noperl(sys$clref(pipe_ef)); + _ckvmssts_noperl(sys$setast(1)); + if (!done) _ckvmssts_noperl(sys$waitfr(pipe_ef)); } if (info->out->buf) { n = info->out->bufsize * sizeof(char); - _ckvmssts(lib$free_vm(&n, &info->out->buf)); + _ckvmssts_noperl(lib$free_vm(&n, &info->out->buf)); } n = sizeof(Pipe); - _ckvmssts(lib$free_vm(&n, &info->out)); + _ckvmssts_noperl(lib$free_vm(&n, &info->out)); n = sizeof(Info); - _ckvmssts(lib$free_vm(&n, &info)); + _ckvmssts_noperl(lib$free_vm(&n, &info)); *psts = RMS$_FNF; - return Nullfp; + return NULL; } info->err = pipe_mbxtofd_setup(aTHX_ fileno(stderr), err); @@ -3615,28 +4502,28 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) /* error cleanup */ if (!info->fp && info->in) { info->done = TRUE; - _ckvmssts(sys$qiow(0,info->in->chan_in, IO$_WRITEOF, 0, - 0, 0, 0, 0, 0, 0, 0, 0)); + _ckvmssts_noperl(sys$qiow(0,info->in->chan_in, IO$_WRITEOF, 0, + 0, 0, 0, 0, 0, 0, 0, 0)); while (!info->in_done) { int done; - _ckvmssts(sys$setast(0)); + _ckvmssts_noperl(sys$setast(0)); done = info->in_done; - if (!done) _ckvmssts(sys$clref(pipe_ef)); - _ckvmssts(sys$setast(1)); - if (!done) _ckvmssts(sys$waitfr(pipe_ef)); + if (!done) _ckvmssts_noperl(sys$clref(pipe_ef)); + _ckvmssts_noperl(sys$setast(1)); + if (!done) _ckvmssts_noperl(sys$waitfr(pipe_ef)); } if (info->in->buf) { n = info->in->bufsize * sizeof(char); - _ckvmssts(lib$free_vm(&n, &info->in->buf)); + _ckvmssts_noperl(lib$free_vm(&n, &info->in->buf)); } n = sizeof(Pipe); - _ckvmssts(lib$free_vm(&n, &info->in)); + _ckvmssts_noperl(lib$free_vm(&n, &info->in)); n = sizeof(Info); - _ckvmssts(lib$free_vm(&n, &info)); + _ckvmssts_noperl(lib$free_vm(&n, &info)); *psts = RMS$_FNF; - return Nullfp; + return NULL; } @@ -3660,15 +4547,20 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) strncpy(symbol, in, MAX_DCL_SYMBOL); d_symbol.dsc$w_length = strlen(symbol); - _ckvmssts(lib$set_symbol(&d_sym_in, &d_symbol, &table)); + _ckvmssts_noperl(lib$set_symbol(&d_sym_in, &d_symbol, &table)); strncpy(symbol, err, MAX_DCL_SYMBOL); d_symbol.dsc$w_length = strlen(symbol); - _ckvmssts(lib$set_symbol(&d_sym_err, &d_symbol, &table)); + _ckvmssts_noperl(lib$set_symbol(&d_sym_err, &d_symbol, &table)); strncpy(symbol, out, MAX_DCL_SYMBOL); d_symbol.dsc$w_length = strlen(symbol); - _ckvmssts(lib$set_symbol(&d_sym_out, &d_symbol, &table)); + _ckvmssts_noperl(lib$set_symbol(&d_sym_out, &d_symbol, &table)); + + /* Done with the names for the pipes */ + PerlMem_free(err); + PerlMem_free(out); + PerlMem_free(in); p = vmscmd->dsc$a_pointer; while (*p == ' ' || *p == '\t') p++; /* remove leading whitespace */ @@ -3681,7 +4573,7 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) strncpy(symbol, p, MAX_DCL_SYMBOL); d_symbol.dsc$w_length = strlen(symbol); - _ckvmssts(lib$set_symbol(&d_sym_cmd, &d_symbol, &table)); + _ckvmssts_noperl(lib$set_symbol(&d_sym_cmd, &d_symbol, &table)); if (strlen(p) > MAX_DCL_SYMBOL) { p += MAX_DCL_SYMBOL; @@ -3689,15 +4581,15 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) p += strlen(p); } } - _ckvmssts(sys$setast(0)); + _ckvmssts_noperl(sys$setast(0)); info->next=open_pipes; /* prepend to list */ open_pipes=info; - _ckvmssts(sys$setast(1)); + _ckvmssts_noperl(sys$setast(1)); /* Omit arg 2 (input file) so the child will get the parent's SYS$INPUT * and SYS$COMMAND. vmspipe.com will redefine SYS$INPUT, but we'll still * have SYS$COMMAND if we need it. */ - _ckvmssts(lib$spawn(&vmspipedsc, 0, &nl_desc, &flags, + _ckvmssts_noperl(lib$spawn(&vmspipedsc, 0, &nl_desc, &flags, 0, &info->pid, &info->completion, 0, popen_completion_ast,info,0,0,0)); @@ -3711,11 +4603,11 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) for (j = 0; j < 4; j++) { sprintf(cmd_sym_name,"PERL_POPEN_CMD%d",j); d_sym_cmd.dsc$w_length = strlen(cmd_sym_name); - _ckvmssts(lib$delete_symbol(&d_sym_cmd, &table)); + _ckvmssts_noperl(lib$delete_symbol(&d_sym_cmd, &table)); } - _ckvmssts(lib$delete_symbol(&d_sym_in, &table)); - _ckvmssts(lib$delete_symbol(&d_sym_err, &table)); - _ckvmssts(lib$delete_symbol(&d_sym_out, &table)); + _ckvmssts_noperl(lib$delete_symbol(&d_sym_in, &table)); + _ckvmssts_noperl(lib$delete_symbol(&d_sym_err, &table)); + _ckvmssts_noperl(lib$delete_symbol(&d_sym_out, &table)); vms_execfree(vmscmd); #ifdef PERL_IMPLICIT_CONTEXT @@ -3723,23 +4615,34 @@ safe_popen(pTHX_ const char *cmd, const char *in_mode, int *psts) #endif PL_forkprocess = info->pid; + ret_fp = info->fp; if (wait) { + dSAVEDERRNO; int done = 0; while (!done) { - _ckvmssts(sys$setast(0)); + _ckvmssts_noperl(sys$setast(0)); done = info->done; - if (!done) _ckvmssts(sys$clref(pipe_ef)); - _ckvmssts(sys$setast(1)); - if (!done) _ckvmssts(sys$waitfr(pipe_ef)); + if (!done) _ckvmssts_noperl(sys$clref(pipe_ef)); + _ckvmssts_noperl(sys$setast(1)); + if (!done) _ckvmssts_noperl(sys$waitfr(pipe_ef)); } *psts = info->completion; /* Caller thinks it is open and tries to close it. */ /* This causes some problems, as it changes the error status */ /* my_pclose(info->fp); */ + + /* If we did not have a file pointer open, then we have to */ + /* clean up here or eventually we will run out of something */ + SAVE_ERRNO; + if (info->fp == NULL) { + my_pclose_pinfo(aTHX_ info); + } + RESTORE_ERRNO; + } else { - *psts = SS$_NORMAL; + *psts = info->pid; } - return info->fp; + return ret_fp; } /* end of safe_popen */ @@ -3756,21 +4659,15 @@ Perl_my_popen(pTHX_ const char *cmd, const char *mode) /*}}}*/ -/*{{{ I32 my_pclose(PerlIO *fp)*/ -I32 Perl_my_pclose(pTHX_ PerlIO *fp) -{ - pInfo info, last = NULL; + +/* Routine to close and cleanup a pipe info structure */ + +static I32 my_pclose_pinfo(pTHX_ pInfo info) { + unsigned long int retsts; int done, iss, n; - - for (info = open_pipes; info != NULL; last = info, info = info->next) - if (info->fp == fp) break; - - if (info == NULL) { /* no such pipe open */ - set_errno(ECHILD); /* quoth POSIX */ - set_vaxc_errno(SS$_NONEXPR); - return -1; - } + int status; + pInfo next, last; /* If we were writing to a subprocess, insure that someone reading from * the mailbox gets an EOF. It looks like a simple fclose() doesn't @@ -3780,8 +4677,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); } @@ -3803,7 +4704,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); @@ -3825,8 +4730,16 @@ I32 Perl_my_pclose(pTHX_ PerlIO *fp) /* remove from list of open pipes */ _ckvmssts(sys$setast(0)); - if (last) last->next = info->next; - else open_pipes = info->next; + last = NULL; + for (next = open_pipes; next != NULL; last = next, next = next->next) { + if (next == info) + break; + } + + if (last) + last->next = info->next; + else + open_pipes = info->next; _ckvmssts(sys$setast(1)); /* free buffers and structures */ @@ -3859,19 +4772,41 @@ I32 Perl_my_pclose(pTHX_ PerlIO *fp) _ckvmssts(lib$free_vm(&n, &info)); return retsts; +} -} /* end of my_pclose() */ -#if defined(__CRTL_VER) && __CRTL_VER >= 70200000 - /* Roll our own prototype because we want this regardless of whether - * _VMS_WAIT is defined. - */ - __pid_t __vms_waitpid( __pid_t __pid, int *__stat_loc, int __options ); -#endif -/* sort-of waitpid; special handling of pipe clean-up for subprocesses - created with popen(); otherwise partially emulate waitpid() unless - we have a suitable one from the CRTL that came with VMS 7.2 and later. - Also check processes not considered by the CRTL waitpid(). +/*{{{ I32 my_pclose(PerlIO *fp)*/ +I32 Perl_my_pclose(pTHX_ PerlIO *fp) +{ + pInfo info, last = NULL; + I32 ret_status; + + /* Fixme - need ast and mutex protection here */ + for (info = open_pipes; info != NULL; last = info, info = info->next) + if (info->fp == fp) break; + + if (info == NULL) { /* no such pipe open */ + set_errno(ECHILD); /* quoth POSIX */ + set_vaxc_errno(SS$_NONEXPR); + return -1; + } + + ret_status = my_pclose_pinfo(aTHX_ info); + + return ret_status; + +} /* end of my_pclose() */ + +#if defined(__CRTL_VER) && __CRTL_VER >= 70200000 + /* Roll our own prototype because we want this regardless of whether + * _VMS_WAIT is defined. + */ + __pid_t __vms_waitpid( __pid_t __pid, int *__stat_loc, int __options ); +#endif +/* sort-of waitpid; special handling of pipe clean-up for subprocesses + created with popen(); otherwise partially emulate waitpid() unless + we have a suitable one from the CRTL that came with VMS 7.2 and later. + Also check processes not considered by the CRTL waitpid(). */ /*{{{Pid_t my_waitpid(Pid_t pid, int *statusp, int flags)*/ Pid_t @@ -4056,20 +4991,21 @@ struct NAM * nam; #define rms_nam_rsl(nam) nam.nam$b_rsl #define rms_bind_fab_nam(fab, nam) fab.fab$l_nam = &nam #define rms_set_fna(fab, nam, name, size) \ - fab.fab$b_fns = size; fab.fab$l_fna = name; + { fab.fab$b_fns = size; fab.fab$l_fna = name; } #define rms_get_fna(fab, nam) fab.fab$l_fna #define rms_set_dna(fab, nam, name, size) \ - fab.fab$b_dns = size; fab.fab$l_dna = name; -#define rms_nam_dns(fab, nam) fab.fab$b_dns; -#define rms_set_esa(fab, nam, name, size) \ - nam.nam$b_ess = size; nam.nam$l_esa = name; + { fab.fab$b_dns = size; fab.fab$l_dna = name; } +#define rms_nam_dns(fab, nam) fab.fab$b_dns +#define rms_set_esa(nam, name, size) \ + { nam.nam$b_ess = size; nam.nam$l_esa = name; } #define rms_set_esal(nam, s_name, s_size, l_name, l_size) \ - nam.nam$l_esa = s_name; nam.nam$b_ess = s_size; + { nam.nam$l_esa = s_name; nam.nam$b_ess = s_size;} #define rms_set_rsa(nam, name, size) \ - nam.nam$l_rsa = name; nam.nam$b_rss = size; + { nam.nam$l_rsa = name; nam.nam$b_rss = size; } #define rms_set_rsal(nam, s_name, s_size, l_name, l_size) \ - nam.nam$l_rsa = s_name; nam.nam$b_rss = s_size; - + { nam.nam$l_rsa = s_name; nam.nam$b_rss = s_size; } +#define rms_nam_name_type_l_size(nam) \ + (nam.nam$b_name + nam.nam$b_type) #else static int rms_free_search_context(struct FAB * fab) { @@ -4101,239 +5037,545 @@ struct NAML * nam; #define rms_nam_rsl(nam) nam.naml$b_rsl #define rms_bind_fab_nam(fab, nam) fab.fab$l_naml = &nam #define rms_set_fna(fab, nam, name, size) \ - fab.fab$b_fns = 0; fab.fab$l_fna = (char *) -1; \ + { fab.fab$b_fns = 0; fab.fab$l_fna = (char *) -1; \ nam.naml$l_long_filename_size = size; \ - nam.naml$l_long_filename = name + nam.naml$l_long_filename = name;} #define rms_get_fna(fab, nam) nam.naml$l_long_filename #define rms_set_dna(fab, nam, name, size) \ - fab.fab$b_dns = 0; fab.fab$l_dna = (char *) -1; \ + { fab.fab$b_dns = 0; fab.fab$l_dna = (char *) -1; \ nam.naml$l_long_defname_size = size; \ - nam.naml$l_long_defname = name + nam.naml$l_long_defname = name; } #define rms_nam_dns(fab, nam) nam.naml$l_long_defname_size -#define rms_set_esa(fab, nam, name, size) \ - nam.naml$b_ess = 0; nam.naml$l_esa = (char *) -1; \ +#define rms_set_esa(nam, name, size) \ + { nam.naml$b_ess = 0; nam.naml$l_esa = (char *) -1; \ nam.naml$l_long_expand_alloc = size; \ - nam.naml$l_long_expand = name + nam.naml$l_long_expand = name; } #define rms_set_esal(nam, s_name, s_size, l_name, l_size) \ - nam.naml$l_esa = s_name; nam.naml$b_ess = s_size; \ + { nam.naml$l_esa = s_name; nam.naml$b_ess = s_size; \ nam.naml$l_long_expand = l_name; \ - nam.naml$l_long_expand_alloc = l_size; + nam.naml$l_long_expand_alloc = l_size; } #define rms_set_rsa(nam, name, size) \ - nam.naml$l_rsa = NULL; nam.naml$b_rss = 0; \ + { nam.naml$l_rsa = NULL; nam.naml$b_rss = 0; \ nam.naml$l_long_result = name; \ - nam.naml$l_long_result_alloc = size; + nam.naml$l_long_result_alloc = size; } #define rms_set_rsal(nam, s_name, s_size, l_name, l_size) \ - nam.naml$l_rsa = s_name; nam.naml$b_rss = s_size; \ + { nam.naml$l_rsa = s_name; nam.naml$b_rss = s_size; \ nam.naml$l_long_result = l_name; \ - nam.naml$l_long_result_alloc = l_size; - + nam.naml$l_long_result_alloc = l_size; } +#define rms_nam_name_type_l_size(nam) \ + (nam.naml$l_long_name_size + nam.naml$l_long_type_size) #endif -/*{{{char *do_rmsexpand(char *fspec, char *out, int ts, char *def, unsigned opts)*/ -/* Shortcut for common case of simple calls to $PARSE and $SEARCH - * to expand file specification. Allows for a single default file - * specification and a simple mask of options. If outbuf is non-NULL, - * it must point to a buffer at least NAM$C_MAXRSS bytes long, into which - * the resultant file specification is placed. If outbuf is NULL, the - * resultant file specification is placed into a static buffer. - * The third argument, if non-NULL, is taken to be a default file - * specification string. The fourth argument is unused at present. - * rmesexpand() returns the address of the resultant string if - * successful, and NULL on error. - * - * New functionality for previously unused opts value: - * PERL_RMSEXPAND_M_VMS - Force output file specification to VMS format. +/* 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 char *mp_do_tounixspec(pTHX_ const char *, char *, int); - -#if defined(__VAX) || !defined(NAML$C_MAXRSS) -/* ODS-2 only version */ -static char * -mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts) +static int rms_erase(const char * vmsname) { - static char __rmsexpand_retbuf[NAM$C_MAXRSS+1]; - char vmsfspec[NAM$C_MAXRSS+1], tmpfspec[NAM$C_MAXRSS+1]; - char esa[NAM$C_MAXRSS+1], *cp, *out = NULL; + int status; struct FAB myfab = cc$rms_fab; - struct NAM mynam = cc$rms_nam; - STRLEN speclen; - unsigned long int retsts, trimver, trimtype, haslower = 0, isunix = 0; - int sts; + rms_setup_nam(mynam); - if (!filespec || !*filespec) { - set_vaxc_errno(LIB$_INVARG); set_errno(EINVAL); - return NULL; - } - if (!outbuf) { - if (ts) out = Newx(outbuf,NAM$C_MAXRSS+1,char); - else outbuf = __rmsexpand_retbuf; - } - isunix = is_unix_filespec(filespec); - if (isunix) { - if (do_tovmsspec(filespec,vmsfspec,0) == NULL) { - if (out) - Safefree(out); - return NULL; + rms_set_fna(myfab, mynam, (char *)vmsname, strlen(vmsname)); /* cast ok */ + rms_bind_fab_nam(myfab, mynam); + +#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 = int_rmsexpand_tovms(vms_src_dsc->dsc$a_pointer, + vmsname, + PERL_RMSEXPAND_M_SYMLINK); + if (rslt == NULL) { + PerlMem_free(vmsname); + return SS$_INSFMEM; } - filespec = vmsfspec; - } - myfab.fab$l_fna = (char *)filespec; /* cast ok for read only pointer */ - myfab.fab$b_fns = strlen(filespec); - myfab.fab$l_nam = &mynam; + /* 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_noperl(lib$getjpi(&jpicode,0,0,&(oldace.myace$l_ident),0,0)); - if (defspec && *defspec) { - if (strchr(defspec,'/') != NULL) { - if (do_tovmsspec(defspec,tmpfspec,0) == NULL) { - if (out) - Safefree(out); - return NULL; - } - defspec = tmpfspec; + 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; + } } - myfab.fab$l_dna = (char *)defspec; /* cast ok for read only pointer */ - myfab.fab$b_dns = strlen(defspec); - } + else + rnsts = fndsts; - mynam.nam$l_esa = esa; - mynam.nam$b_ess = NAM$C_MAXRSS; - mynam.nam$l_rsa = outbuf; - mynam.nam$b_rss = NAM$C_MAXRSS; + PerlMem_free(vmsname); + return rnsts; +} -#ifdef NAM$M_NO_SHORT_UPCASE - if (decc_efs_case_preserve) - mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; -#endif - retsts = sys$parse(&myfab,0,0); - if (!(retsts & 1)) { - mynam.nam$b_nop |= NAM$M_SYNCHK; - if (retsts == RMS$_DNF || retsts == RMS$_DIR || retsts == RMS$_DEV) { - retsts = sys$parse(&myfab,0,0); - if (retsts & 1) goto expanded; - } - mynam.nam$l_rlf = NULL; myfab.fab$b_dns = 0; - sts = sys$parse(&myfab,0,0); /* Free search context */ - if (out) Safefree(out); - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else if (retsts == RMS$_DEV) set_errno(ENODEV); - else if (retsts == RMS$_DIR) set_errno(ENOTDIR); - else set_errno(EVMSERR); - return NULL; - } - retsts = sys$search(&myfab,0,0); - if (!(retsts & 1) && retsts != RMS$_FNF) { - mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; - myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */ - if (out) Safefree(out); - set_vaxc_errno(retsts); - if (retsts == RMS$_PRV) set_errno(EACCES); - else set_errno(EVMSERR); - return NULL; - } +/*{{{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; - /* If the input filespec contained any lowercase characters, - * downcase the result for compatibility with Unix-minded code. */ - expanded: - if (!decc_efs_case_preserve) { - for (out = myfab.fab$l_fna; *out; out++) - if (islower(*out)) { haslower = 1; break; } - } - if (mynam.nam$b_rsl) { out = outbuf; speclen = mynam.nam$b_rsl; } - else { out = esa; speclen = mynam.nam$b_esl; } - out[speclen] = 0; - /* Trim off null fields added by $PARSE - * If type > 1 char, must have been specified in original or default spec - * (not true for version; $SEARCH may have added version of existing file). - */ - trimver = !(mynam.nam$l_fnb & NAM$M_EXP_VER); - trimtype = !(mynam.nam$l_fnb & NAM$M_EXP_TYPE) && - (mynam.nam$l_ver - mynam.nam$l_type == 1); - if (trimver || trimtype) { - if (defspec && *defspec) { - char defesa[NAM$C_MAXRSS]; - struct FAB deffab = cc$rms_fab; - struct NAM defnam = cc$rms_nam; - - deffab.fab$l_nam = &defnam; - /* cast below ok for read only pointer */ - deffab.fab$l_fna = (char *)defspec; deffab.fab$b_fns = myfab.fab$b_dns; - defnam.nam$l_esa = defesa; defnam.nam$b_ess = NAM$C_MAXRSS; - defnam.nam$b_nop = NAM$M_SYNCHK; -#ifdef NAM$M_NO_SHORT_UPCASE - if (decc_efs_case_preserve) - defnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; -#endif - if (sys$parse(&deffab,0,0) & 1) { - if (trimver) trimver = !(defnam.nam$l_fnb & NAM$M_EXP_VER); - if (trimtype) trimtype = !(defnam.nam$l_fnb & NAM$M_EXP_TYPE); - } + /* Validate the source file */ + src_sts = flex_lstat(src, &src_st); + if (src_sts != 0) { + + /* No source file or other problem */ + return src_sts; } - if (trimver) { - if (*mynam.nam$l_ver != '\"') - speclen = mynam.nam$l_ver - out; + if (src_st.st_devnam[0] == 0) { + /* This may be possible so fail if it is seen. */ + errno = EIO; + return -1; } - if (trimtype) { - /* If we didn't already trim version, copy down */ - if (speclen > mynam.nam$l_ver - out) - memmove(mynam.nam$l_type, mynam.nam$l_ver, - speclen - (mynam.nam$l_ver - out)); - speclen -= mynam.nam$l_ver - mynam.nam$l_type; + + 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 we just had a directory spec on input, $PARSE "helpfully" - * adds an empty name and type for us */ - if (mynam.nam$l_name == mynam.nam$l_type && - mynam.nam$l_ver == mynam.nam$l_type + 1 && - !(mynam.nam$l_fnb & NAM$M_EXP_NAME)) - speclen = mynam.nam$l_name - out; - /* Posix format specifications must have matching quotes */ - if (speclen < NAM$C_MAXRSS) { - if (decc_posix_compliant_pathnames && (out[0] == '\"')) { - if ((speclen > 1) && (out[speclen-1] != '\"')) { - out[speclen] = '\"'; - speclen++; - } + + 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_st.st_devnam, + S_ISDIR(dst_st.st_mode)); + + /* Need to delete all versions ? */ + if ((d_sts == 0) && (vms_unlink_all_versions == 1)) { + int i = 0; + + while (lstat(dst_st.st_devnam, &dst_st.crtl_stat) == 0) { + d_sts = mp_do_kill_file(aTHX_ dst_st.st_devnam, 0); + if (d_sts != 0) + break; + i++; + + /* Make sure that we do not loop forever */ + if (i > 32767) { + errno = EIO; + d_sts = -1; + break; + } + } + } + + if (d_sts != 0) + return d_sts; + + /* We killed the destination, so only errno now is EIO */ + pre_delete = 1; + } } - } - out[speclen] = '\0'; - if (haslower && !decc_efs_case_preserve) __mystrtolower(out); + /* 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; - /* Have we been working with an expanded, but not resultant, spec? */ - /* Also, convert back to Unix syntax if necessary. */ - if ((opts & PERL_RMSEXPAND_M_VMS) != 0) - isunix = 0; + { + /* 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_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_dst = PerlMem_malloc(VMS_MAXRSS); + if (vms_dst == NULL) + _ckvmssts_noperl(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_noperl(SS$_INSFMEM); + + /* 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_st.st_devnam, 1); + if (d_sts != 0) { + PerlMem_free(vms_dst); + errno = EIO; + return sts; + } + + pre_delete = 1; + } + + /* The dest must be a VMS file specification */ + ret_str = int_tovmsspec(dst, vms_dst, 0, NULL); + if (ret_str == NULL) { + 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_noperl(SS$_INSFMEM); + + ret_str = do_fileify_dirspec(vms_dst, vms_dir_file, 0, NULL); + if (ret_str == NULL) { + 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 = int_tovmspath(dst, vms_dst, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_dst); + errno = EIO; + return -1; + } + } else { + char * v_spec, * r_spec, * d_spec, * n_spec; + char * e_spec, * vs_spec; + int sts, v_len, r_len, d_len, n_len, e_len, vs_len; + + /* fileify a target VMS file specification */ + ret_str = int_tovmsspec(dst, vms_dst, 0, NULL); + if (ret_str == NULL) { + PerlMem_free(vms_dst); + errno = EIO; + return -1; + } + + sts = vms_split_path(vms_dst, &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) { + if (e_len == 0) { + /* Get rid of the version */ + if (vs_len != 0) { + *vs_spec = '\0'; + } + /* Need to specify a '.' so that the extension */ + /* is not inherited */ + strcat(vms_dst,"."); + } + } + } + } + + old_file_dsc.dsc$a_pointer = src_st.st_devnam; + old_file_dsc.dsc$w_length = strlen(src_st.st_devnam); + 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 |= 4; /* LIB$M_FIL_LONG_NAMES (bit 2) */ +#endif - if (!mynam.nam$b_rsl) { - if (isunix) { - if (do_tounixspec(esa,outbuf,0) == NULL) return NULL; + 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_dst); + if (!$VMS_STATUS_SUCCESS(sts)) { + errno = EIO; + return -1; + } + retval = 0; } - else strcpy(outbuf,esa); - } - else if (isunix) { - if (do_tounixspec(outbuf,tmpfspec,0) == NULL) return NULL; - strcpy(outbuf,tmpfspec); - } - mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL; - mynam.nam$l_rsa = NULL; - mynam.nam$b_rss = 0; - myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */ - return outbuf; + + if (vms_unlink_all_versions) { + /* Now get rid of any previous versions of the source file that + * might still exist + */ + int i = 0; + dSAVEDERRNO; + SAVE_ERRNO; + src_sts = mp_do_kill_file(aTHX_ src_st.st_devnam, + S_ISDIR(src_st.st_mode)); + while (lstat(src_st.st_devnam, &src_st.crtl_stat) == 0) { + src_sts = mp_do_kill_file(aTHX_ src_st.st_devnam, + S_ISDIR(src_st.st_mode)); + if (src_sts != 0) + break; + i++; + + /* Make sure that we do not loop forever */ + if (i > 32767) { + src_sts = -1; + break; + } + } + RESTORE_ERRNO; + } + + /* We deleted the destination, so must force the error to be EIO */ + if ((retval != 0) && (pre_delete != 0)) + errno = EIO; + + return retval; } -#else -/* ODS-5 supporting routine */ +/*}}}*/ + + +/*{{{char *do_rmsexpand(char *fspec, char *out, int ts, char *def, unsigned opts)*/ +/* Shortcut for common case of simple calls to $PARSE and $SEARCH + * to expand file specification. Allows for a single default file + * specification and a simple mask of options. If outbuf is non-NULL, + * it must point to a buffer at least NAM$C_MAXRSS bytes long, into which + * the resultant file specification is placed. If outbuf is NULL, the + * resultant file specification is placed into a static buffer. + * The third argument, if non-NULL, is taken to be a default file + * specification string. The fourth argument is unused at present. + * rmesexpand() returns the address of the resultant string if + * successful, and NULL on error. + * + * New functionality for previously unused opts value: + * 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, int *); + static char * -mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts) -{ - static char __rmsexpand_retbuf[NAML$C_MAXRSS+1]; - char * vmsfspec, *tmpfspec; - char * esa, *cp, *out = NULL; - char * tbuf; - char * esal; +int_rmsexpand + (const char *filespec, + char *outbuf, + const char *defspec, + unsigned opts, + int * fs_utf8, + int * dfs_utf8) +{ + char * ret_spec; + const char * in_spec; + char * spec_buf; + const char * def_spec; + char * vmsfspec, *vmsdefspec; + char * esa; + char * esal = NULL; char * outbufl; struct FAB myfab = cc$rms_fab; rms_setup_nam(mynam); @@ -4341,111 +5583,138 @@ 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; } - if (!outbuf) { - if (ts) out = Newx(outbuf,VMS_MAXRSS,char); - else outbuf = __rmsexpand_retbuf; - } vmsfspec = NULL; - tmpfspec = NULL; + vmsdefspec = NULL; outbufl = NULL; - isunix = is_unix_filespec(filespec); - if (isunix) { - vmsfspec = PerlMem_malloc(VMS_MAXRSS); - if (vmsfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tovmsspec(filespec,vmsfspec,0) == NULL) { - PerlMem_free(vmsfspec); - if (out) - Safefree(out); - return NULL; - } - filespec = vmsfspec; - /* Unless we are forcing to VMS format, a UNIX input means - * UNIX output, and that requires long names to be used - */ - if ((opts & PERL_RMSEXPAND_M_VMS) == 0) - opts |= PERL_RMSEXPAND_M_LONG; - else { - isunix = 0; - } + in_spec = filespec; + isunix = 0; + if ((opts & PERL_RMSEXPAND_M_VMS_IN) == 0) { + 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 this is a UNIX file spec, convert it to VMS */ + sts = vms_split_path(filespec, &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) { + isunix = 1; + char * ret_spec; + + vmsfspec = PerlMem_malloc(VMS_MAXRSS); + if (vmsfspec == NULL) _ckvmssts_noperl(SS$_INSFMEM); + ret_spec = int_tovmsspec(filespec, vmsfspec, 0, fs_utf8); + if (ret_spec == NULL) { + PerlMem_free(vmsfspec); + return NULL; + } + in_spec = (const char *)vmsfspec; + + /* Unless we are forcing to VMS format, a UNIX input means + * UNIX output, and that requires long names to be used + */ + if ((opts & PERL_RMSEXPAND_M_VMS) == 0) +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + opts |= PERL_RMSEXPAND_M_LONG; +#else + NOOP; +#endif + else + isunix = 0; + } + } - rms_set_fna(myfab, mynam, (char *)filespec, strlen(filespec)); /* cast ok */ + rms_set_fna(myfab, mynam, (char *)in_spec, strlen(in_spec)); /* cast ok */ rms_bind_fab_nam(myfab, mynam); + /* Process the default file specification if present */ + def_spec = defspec; if (defspec && *defspec) { int t_isunix; t_isunix = is_unix_filespec(defspec); if (t_isunix) { - tmpfspec = PerlMem_malloc(VMS_MAXRSS); - if (tmpfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tovmsspec(defspec,tmpfspec,0) == NULL) { - PerlMem_free(tmpfspec); - if (vmsfspec != NULL) - PerlMem_free(vmsfspec); - if (out) - Safefree(out); - return NULL; + vmsdefspec = PerlMem_malloc(VMS_MAXRSS); + if (vmsdefspec == NULL) _ckvmssts_noperl(SS$_INSFMEM); + ret_spec = int_tovmsspec(defspec, vmsdefspec, 0, dfs_utf8); + + if (ret_spec == NULL) { + /* Clean up and bail */ + PerlMem_free(vmsdefspec); + if (vmsfspec != NULL) + PerlMem_free(vmsfspec); + return NULL; + } + def_spec = (const char *)vmsdefspec; } - defspec = tmpfspec; - } - rms_set_dna(myfab, mynam, (char *)defspec, strlen(defspec)); /* cast ok */ + rms_set_dna(myfab, mynam, + (char *)def_spec, strlen(def_spec)); /* cast ok */ } + /* Now we need the expansion buffers */ esa = PerlMem_malloc(NAM$C_MAXRSS + 1); - if (esa == NULL) _ckvmssts(SS$_INSFMEM); + if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM); #if !defined(__VAX) && defined(NAML$C_MAXRSS) - esal = PerlMem_malloc(NAML$C_MAXRSS + 1); - if (esal == NULL) _ckvmssts(SS$_INSFMEM); + esal = PerlMem_malloc(VMS_MAXRSS); + if (esal == NULL) _ckvmssts_noperl(SS$_INSFMEM); #endif - rms_set_esal(mynam, esa, NAM$C_MAXRSS, esal, NAML$C_MAXRSS); + rms_set_esal(mynam, esa, NAM$C_MAXRSS, esal, VMS_MAXRSS-1); - if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { - rms_set_rsa(mynam, outbuf, (VMS_MAXRSS - 1)); - } - else { + /* If a NAML block is used RMS always writes to the long and short + * addresses unless you suppress the short name. + */ #if !defined(__VAX) && defined(NAML$C_MAXRSS) - outbufl = PerlMem_malloc(VMS_MAXRSS); - if (outbufl == NULL) _ckvmssts(SS$_INSFMEM); - rms_set_rsal(mynam, outbuf, NAM$C_MAXRSS, outbufl, (VMS_MAXRSS - 1)); -#else - rms_set_rsa(mynam, outbuf, NAM$C_MAXRSS); + outbufl = PerlMem_malloc(VMS_MAXRSS); + if (outbufl == NULL) _ckvmssts_noperl(SS$_INSFMEM); #endif - } + rms_set_rsal(mynam, outbuf, NAM$C_MAXRSS, outbufl, (VMS_MAXRSS - 1)); #ifdef NAM$M_NO_SHORT_UPCASE if (decc_efs_case_preserve) 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)) { /* Could not find the file, try as syntax only if error is not fatal */ rms_set_nam_nop(mynam, NAM$M_SYNCHK); - if (retsts == RMS$_DNF || retsts == RMS$_DIR || retsts == RMS$_DEV) { + if (retsts == RMS$_DNF || + retsts == RMS$_DIR || + retsts == RMS$_DEV || + retsts == RMS$_PRV) { retsts = sys$parse(&myfab,0,0); - if (retsts & STS$K_SUCCESS) goto expanded; + if (retsts & STS$K_SUCCESS) goto int_expanded; } /* Still could not parse the file specification */ /*----------------------------------------------*/ sts = rms_free_search_context(&myfab); /* Free search context */ - if (out) Safefree(out); - if (tmpfspec != NULL) - PerlMem_free(tmpfspec); + if (vmsdefspec != NULL) + PerlMem_free(vmsdefspec); if (vmsfspec != NULL) PerlMem_free(vmsfspec); 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); @@ -4456,15 +5725,15 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de retsts = sys$search(&myfab,0,0); if (!(retsts & STS$K_SUCCESS) && retsts != RMS$_FNF) { sts = rms_free_search_context(&myfab); /* Free search context */ - if (out) Safefree(out); - if (tmpfspec != NULL) - PerlMem_free(tmpfspec); + if (vmsdefspec != NULL) + PerlMem_free(vmsdefspec); if (vmsfspec != NULL) PerlMem_free(vmsfspec); 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); @@ -4473,35 +5742,41 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de /* If the input filespec contained any lowercase characters, * downcase the result for compatibility with Unix-minded code. */ - expanded: +int_expanded: if (!decc_efs_case_preserve) { + char * tbuf; for (tbuf = rms_get_fna(myfab, mynam); *tbuf; tbuf++) if (islower(*tbuf)) { haslower = 1; break; } } /* Is a long or a short name expected */ /*------------------------------------*/ + spec_buf = NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { if (rms_nam_rsll(mynam)) { - tbuf = outbuf; + spec_buf = outbufl; speclen = rms_nam_rsll(mynam); } else { - tbuf = esal; /* Not esa */ + spec_buf = esal; /* Not esa */ speclen = rms_nam_esll(mynam); } } else { +#endif if (rms_nam_rsl(mynam)) { - tbuf = outbuf; + spec_buf = outbuf; speclen = rms_nam_rsl(mynam); } else { - tbuf = esa; /* Not esal */ + spec_buf = esa; /* Not esal */ speclen = rms_nam_esl(mynam); } +#if !defined(__VAX) && defined(NAML$C_MAXRSS) } - tbuf[speclen] = '\0'; +#endif + spec_buf[speclen] = '\0'; /* Trim off null fields added by $PARSE * If type > 1 char, must have been specified in original or default spec @@ -4519,9 +5794,14 @@ 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); - if (defesal != NULL) { - struct FAB deffab = cc$rms_fab; + char *defesa = NULL; + defesa = PerlMem_malloc(VMS_MAXRSS + 1); + if (defesa != NULL) { + struct FAB deffab = cc$rms_fab; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + defesal = PerlMem_malloc(VMS_MAXRSS + 1); + if (defesal == NULL) _ckvmssts_noperl(SS$_INSFMEM); +#endif rms_setup_nam(defnam); rms_bind_fab_nam(deffab, defnam); @@ -4530,7 +5810,8 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de rms_set_fna (deffab, defnam, (char *)defspec, rms_nam_dns(myfab, mynam)); - rms_set_esa(deffab, defnam, defesal, VMS_MAXRSS - 1); + /* RMS needs the esa/esal as a work area if wildcards are involved */ + rms_set_esal(defnam, defesa, NAM$C_MAXRSS, defesal, VMS_MAXRSS - 1); rms_clear_nam_nop(defnam); rms_set_nam_nop(defnam, NAM$M_SYNCHK); @@ -4538,6 +5819,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); @@ -4546,35 +5831,39 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de trimtype = !rms_is_nam_fnb(defnam, NAM$M_EXP_TYPE); } } - PerlMem_free(defesal); + if (defesal != NULL) + PerlMem_free(defesal); + PerlMem_free(defesa); + } else { + _ckvmssts_noperl(SS$_INSFMEM); } } if (trimver) { if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { if (*(rms_nam_verl(mynam)) != '\"') - speclen = rms_nam_verl(mynam) - tbuf; + speclen = rms_nam_verl(mynam) - spec_buf; } else { if (*(rms_nam_ver(mynam)) != '\"') - speclen = rms_nam_ver(mynam) - tbuf; + speclen = rms_nam_ver(mynam) - spec_buf; } } if (trimtype) { /* If we didn't already trim version, copy down */ if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { - if (speclen > rms_nam_verl(mynam) - tbuf) + if (speclen > rms_nam_verl(mynam) - spec_buf) memmove (rms_nam_typel(mynam), rms_nam_verl(mynam), - speclen - (rms_nam_verl(mynam) - tbuf)); + speclen - (rms_nam_verl(mynam) - spec_buf)); speclen -= rms_nam_verl(mynam) - rms_nam_typel(mynam); } else { - if (speclen > rms_nam_ver(mynam) - tbuf) + if (speclen > rms_nam_ver(mynam) - spec_buf) memmove (rms_nam_type(mynam), rms_nam_ver(mynam), - speclen - (rms_nam_ver(mynam) - tbuf)); + speclen - (rms_nam_ver(mynam) - spec_buf)); speclen -= rms_nam_ver(mynam) - rms_nam_type(mynam); } } @@ -4584,83 +5873,180 @@ mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *de /*-------------------------------------------*/ if (vmsfspec != NULL) PerlMem_free(vmsfspec); - if (tmpfspec != NULL) - PerlMem_free(tmpfspec); + if (vmsdefspec != NULL) + PerlMem_free(vmsdefspec); /* If we just had a directory spec on input, $PARSE "helpfully" * adds an empty name and type for us */ +#if !defined(__VAX) && defined(NAML$C_MAXRSS) if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { if (rms_nam_namel(mynam) == rms_nam_typel(mynam) && rms_nam_verl(mynam) == rms_nam_typel(mynam) + 1 && !(rms_is_nam_fnb(mynam, NAM$M_EXP_NAME))) - speclen = rms_nam_namel(mynam) - tbuf; + speclen = rms_nam_namel(mynam) - spec_buf; } - else { + else +#endif + { if (rms_nam_name(mynam) == rms_nam_type(mynam) && rms_nam_ver(mynam) == rms_nam_ver(mynam) + 1 && !(rms_is_nam_fnb(mynam, NAM$M_EXP_NAME))) - speclen = rms_nam_name(mynam) - tbuf; + speclen = rms_nam_name(mynam) - spec_buf; } /* Posix format specifications must have matching quotes */ if (speclen < (VMS_MAXRSS - 1)) { - if (decc_posix_compliant_pathnames && (tbuf[0] == '\"')) { - if ((speclen > 1) && (tbuf[speclen-1] != '\"')) { - tbuf[speclen] = '\"'; + if (decc_posix_compliant_pathnames && (spec_buf[0] == '\"')) { + if ((speclen > 1) && (spec_buf[speclen-1] != '\"')) { + spec_buf[speclen] = '\"'; speclen++; } } } - tbuf[speclen] = '\0'; - if (haslower && !decc_efs_case_preserve) __mystrtolower(tbuf); + spec_buf[speclen] = '\0'; + if (haslower && !decc_efs_case_preserve) __mystrtolower(spec_buf); /* Have we been working with an expanded, but not resultant, spec? */ /* Also, convert back to Unix syntax if necessary. */ + { + int rsl; - if (!rms_nam_rsll(mynam)) { - if (isunix) { - if (do_tounixspec(esa,outbuf,0) == NULL) { - if (out) Safefree(out); - PerlMem_free(esal); - PerlMem_free(esa); - if (outbufl != NULL) - PerlMem_free(outbufl); - return NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + if ((opts & PERL_RMSEXPAND_M_LONG) != 0) { + rsl = rms_nam_rsll(mynam); + } else +#endif + { + rsl = rms_nam_rsl(mynam); + } + if (!rsl) { + /* rsl is not present, it means that spec_buf is either */ + /* esa or esal, and needs to be copied to outbuf */ + /* convert to Unix if desired */ + if (isunix) { + ret_spec = int_tounixspec(spec_buf, outbuf, fs_utf8); + } else { + /* VMS file specs are not in UTF-8 */ + if (fs_utf8 != NULL) + *fs_utf8 = 0; + strcpy(outbuf, spec_buf); + ret_spec = outbuf; } } - else strcpy(outbuf,esa); - } - else if (isunix) { - tmpfspec = PerlMem_malloc(VMS_MAXRSS); - if (tmpfspec == NULL) _ckvmssts(SS$_INSFMEM); - if (do_tounixspec(outbuf,tmpfspec,0) == NULL) { - if (out) Safefree(out); - PerlMem_free(esa); - PerlMem_free(esal); - PerlMem_free(tmpfspec); - if (outbufl != NULL) - PerlMem_free(outbufl); - return NULL; - } - strcpy(outbuf,tmpfspec); - PerlMem_free(tmpfspec); - } - + else { + /* Now spec_buf is either outbuf or outbufl */ + /* We need the result into outbuf */ + if (isunix) { + /* If we need this in UNIX, then we need another buffer */ + /* to keep things in order */ + char * src; + char * new_src = NULL; + if (spec_buf == outbuf) { + new_src = PerlMem_malloc(VMS_MAXRSS); + strcpy(new_src, spec_buf); + } else { + src = spec_buf; + } + ret_spec = int_tounixspec(src, outbuf, fs_utf8); + if (new_src) { + PerlMem_free(new_src); + } + } else { + /* VMS file specs are not in UTF-8 */ + if (fs_utf8 != NULL) + *fs_utf8 = 0; + + /* Copy the buffer if needed */ + if (outbuf != spec_buf) + strcpy(outbuf, spec_buf); + ret_spec = outbuf; + } + } + } + + /* Need to clean up the search context */ rms_set_rsal(mynam, NULL, 0, NULL, 0); sts = rms_free_search_context(&myfab); /* Free search context */ + + /* Clean up the extra buffers */ + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(esa); - PerlMem_free(esal); if (outbufl != NULL) PerlMem_free(outbufl); - return outbuf; + + /* Return the result */ + return ret_spec; +} + +/* Common simple case - Expand an already VMS spec */ +static char * +int_rmsexpand_vms(const char * filespec, char * outbuf, unsigned opts) { + opts |= PERL_RMSEXPAND_M_VMS_IN; + return int_rmsexpand(filespec, outbuf, NULL, opts, NULL, NULL); +} + +/* Common simple case - Expand to a VMS spec */ +static char * +int_rmsexpand_tovms(const char * filespec, char * outbuf, unsigned opts) { + opts |= PERL_RMSEXPAND_M_VMS; + return int_rmsexpand(filespec, outbuf, NULL, opts, NULL, NULL); +} + + +/* Entry point used by perl routines */ +static char * +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 * expanded, *ret_spec, *ret_buf; + + expanded = NULL; + ret_buf = outbuf; + if (ret_buf == NULL) { + if (ts) { + Newx(expanded, VMS_MAXRSS, char); + if (expanded == NULL) + _ckvmssts(SS$_INSFMEM); + ret_buf = expanded; + } else { + ret_buf = __rmsexpand_retbuf; + } + } + + + ret_spec = int_rmsexpand(filespec, ret_buf, defspec, + opts, fs_utf8, dfs_utf8); + + if (ret_spec == NULL) { + /* Cleanup on isle 5, if this is thread specific we need to deallocate */ + if (expanded) + Safefree(expanded); + } + + return ret_spec; } -#endif /*}}}*/ /* 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); } /* @@ -4689,6 +6075,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 @@ -4697,15 +6084,19 @@ 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 * int_fileify_dirspec[_ts](char *dir, char *buf, int * utf8_fl)*/ +static char * +int_fileify_dirspec(const char *dir, char *buf, int *utf8_fl) { - static char __fileify_retbuf[VMS_MAXRSS]; unsigned long int dirlen, retlen, addmfd = 0, hasfilename = 0; - char *retspec, *cp1, *cp2, *lastdir; + char *cp1, *cp2, *lastdir; char *trndir, *vmsdir; unsigned short int trnlnm_iter_count; + int is_vms = 0; + int is_unix = 0; int sts; + if (utf8_fl != NULL) + *utf8_fl = 0; if (!dir || !*dir) { set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; @@ -4725,12 +6116,12 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) return NULL; } trndir = PerlMem_malloc(VMS_MAXRSS + 1); - if (trndir == NULL) _ckvmssts(SS$_INSFMEM); + if (trndir == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (!strpbrk(dir+1,"/]>:") && (!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,"/]>:") && simple_trnlnm(trndir,trndir,VMS_MAXRSS-1)) { trnlnm_iter_count++; if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; } @@ -4781,20 +6172,45 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) } vmsdir = PerlMem_malloc(VMS_MAXRSS + 1); - if (vmsdir == NULL) _ckvmssts(SS$_INSFMEM); + if (vmsdir == NULL) _ckvmssts_noperl(SS$_INSFMEM); cp1 = strpbrk(trndir,"]:>"); - if (hasfilename || !cp1) { /* Unix-style path or filename */ + if (hasfilename || !cp1) { /* filename present or not VMS */ + + if (decc_efs_charset && !cp1) { + + /* EFS handling for UNIX mode */ + + /* Just remove the trailing '/' and we should be done */ + STRLEN trndir_len; + trndir_len = strlen(trndir); + + if (trndir_len > 1) { + trndir_len--; + if (trndir[trndir_len] == '/') { + trndir[trndir_len] = '\0'; + } + } + strcpy(buf, trndir); + PerlMem_free(trndir); + PerlMem_free(vmsdir); + return buf; + } + + /* For non-EFS mode, this is left for backwards compatibility */ + /* For EFS mode, this is only done for VMS format filespecs as */ + /* Perl programs generally have problems when a UNIX format spec */ + /* returns a VMS format spec */ if (trndir[0] == '.') { if (trndir[1] == '\0' || (trndir[1] == '/' && trndir[2] == '\0')) { PerlMem_free(trndir); PerlMem_free(vmsdir); - return do_fileify_dirspec("[]",buf,ts); + return int_fileify_dirspec("[]", buf, 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 int_fileify_dirspec("[-]", buf, NULL); } } if (dirlen && trndir[dirlen-1] == '/') { /* path ends with '/'; just add .dir;1 */ @@ -4809,13 +6225,13 @@ 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 (int_tovmsspec(trndir, vmsdir, 0, utf8_fl) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } if (strchr(vmsdir,'/') != NULL) { - /* If do_tovmsspec() returned it, it must have VMS syntax + /* If int_tovmsspec() returned it, it must have VMS syntax * delimiters in it, so it's a mixed VMS/Unix spec. We take * the time to check this here only so we avoid a recursion * loop; otherwise, gigo. @@ -4825,12 +6241,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 (int_fileify_dirspec(vmsdir, trndir, NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - ret_chr = do_tounixspec(trndir,buf,ts); + ret_chr = int_tounixspec(trndir, buf, utf8_fl); PerlMem_free(trndir); PerlMem_free(vmsdir); return ret_chr; @@ -4851,17 +6267,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 (int_tovmsspec(trndir, vmsdir, 0, NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) { + if (int_fileify_dirspec(vmsdir, trndir, NULL) == NULL) { PerlMem_free(trndir); PerlMem_free(vmsdir); return NULL; } - ret_chr = do_tounixspec(trndir,buf,ts); + ret_chr = int_tounixspec(trndir, buf, utf8_fl); PerlMem_free(trndir); PerlMem_free(vmsdir); return ret_chr; @@ -4871,65 +6287,101 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) if ( !(lastdir = cp1 = strrchr(trndir,'/')) && !(lastdir = cp1 = strrchr(trndir,']')) && !(lastdir = cp1 = strrchr(trndir,'>'))) cp1 = trndir; - if ((cp2 = strchr(cp1,'.'))) { /* look for explicit type */ - int ver; char *cp3; - /* For EFS or ODS-5 look for the last dot */ - if (decc_efs_charset) { - cp2 = strrchr(cp1,'.'); - } - if (vms_process_case_tolerant) { - if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ - !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - PerlMem_free(vmsdir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } - else { - if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ - !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ - !*(cp2+3) || *(cp2+3) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - PerlMem_free(vmsdir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } - dirlen = cp2 - trndir; + cp2 = strrchr(cp1,'.'); + if (cp2) { + int e_len, vs_len = 0; + int is_dir = 0; + char * cp3; + cp3 = strchr(cp2,';'); + e_len = strlen(cp2); + if (cp3) { + vs_len = strlen(cp3); + e_len = e_len - vs_len; + } + is_dir = is_dir_ext(cp2, e_len, cp3, vs_len); + if (!is_dir) { + if (!decc_efs_charset) { + /* If this is not EFS, then not a directory */ + PerlMem_free(trndir); + PerlMem_free(vmsdir); + set_errno(ENOTDIR); + set_vaxc_errno(RMS$_DIR); + return NULL; + } + } else { + /* Ok, here we have an issue, technically if a .dir shows */ + /* from inside a directory, then we should treat it as */ + /* xxx^.dir.dir. But we do not have that context at this */ + /* point unless this is totally restructured, so we remove */ + /* The .dir for now, and fix this better later */ + dirlen = cp2 - trndir; + } } + } retlen = dirlen + 6; - if (buf) retspec = buf; - else if (ts) Newx(retspec,retlen+1,char); - else retspec = __fileify_retbuf; - memcpy(retspec,trndir,dirlen); - retspec[dirlen] = '\0'; + memcpy(buf, trndir, dirlen); + buf[dirlen] = '\0'; /* We've picked up everything up to the directory file name. Now just add the type and version, and we're set. */ - if ((!decc_efs_case_preserve) && vms_process_case_tolerant) - strcat(retspec,".dir;1"); - else - strcat(retspec,".DIR;1"); + + /* We should only add type for VMS syntax, but historically Perl + has added it for UNIX style also */ + + /* Fix me - we should not be using the same routine for VMS and + UNIX format files. Things are too tangled so we need to lookup + what syntax the output is */ + + is_unix = 0; + is_vms = 0; + lastdir = strrchr(trndir,'/'); + if (lastdir) { + is_unix = 1; + } else { + lastdir = strpbrk(trndir,"]:>"); + if (lastdir) { + is_vms = 1; + } + } + + if ((is_vms == 0) && (is_unix == 0)) { + /* We still do not know? */ + is_unix = decc_filename_unix_report; + if (is_unix == 0) + is_vms = 1; + } + + if ((is_unix && !decc_efs_charset) || is_vms) { + + /* It is a bug to add a .dir to a UNIX format directory spec */ + /* However Perl on VMS may have programs that expect this so */ + /* If not using EFS character specifications allow it. */ + + if ((!decc_efs_case_preserve) && vms_process_case_tolerant) { + /* Traditionally Perl expects filenames in lower case */ + strcat(buf, ".dir"); + } else { + /* VMS expects the .DIR to be in upper case */ + strcat(buf, ".DIR"); + } + + /* It is also a bug to put a VMS format version on a UNIX file */ + /* specification. Perl self tests are looking for this */ + if (is_vms || !(decc_efs_charset || decc_filename_unix_report)) + strcat(buf, ";1"); + } PerlMem_free(trndir); PerlMem_free(vmsdir); - return retspec; + return buf; } else { /* VMS-style directory spec */ - char *esa, term, *cp; + char *esa, *esal, term, *cp; + char *my_esa; + int my_esa_len; unsigned long int sts, cmplen, haslower = 0; unsigned int nam_fnb; char * nam_type; @@ -4937,12 +6389,17 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) rms_setup_nam(savnam); rms_setup_nam(dirnam); - esa = PerlMem_malloc(VMS_MAXRSS + 1); - if (esa == NULL) _ckvmssts(SS$_INSFMEM); + esa = PerlMem_malloc(NAM$C_MAXRSS + 1); + if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM); + esal = NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + esal = PerlMem_malloc(VMS_MAXRSS); + if (esal == NULL) _ckvmssts_noperl(SS$_INSFMEM); +#endif rms_set_fna(dirfab, dirnam, trndir, strlen(trndir)); rms_bind_fab_nam(dirfab, dirnam); rms_set_dna(dirfab, dirnam, ".DIR;1", 6); - rms_set_esa(dirfab, dirnam, esa, (VMS_MAXRSS - 1)); + rms_set_esal(dirnam, esa, NAM$C_MAXRSS, esal, (VMS_MAXRSS - 1)); #ifdef NAM$M_NO_SHORT_UPCASE if (decc_efs_case_preserve) rms_set_nam_nop(dirnam, NAM$M_NO_SHORT_UPCASE); @@ -4951,12 +6408,16 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) for (cp = trndir; *cp; cp++) if (islower(*cp)) { haslower = 1; break; } if (!((sts = sys$parse(&dirfab)) & STS$K_SUCCESS)) { - if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) { - rms_set_nam_nop(dirnam, NAM$M_SYNCHK); - sts = sys$parse(&dirfab) & STS$K_SUCCESS; + if ((dirfab.fab$l_sts == RMS$_DIR) || + (dirfab.fab$l_sts == RMS$_DNF) || + (dirfab.fab$l_sts == RMS$_PRV)) { + rms_set_nam_nop(dirnam, NAM$M_SYNCHK); + sts = sys$parse(&dirfab); } if (!sts) { PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(trndir); PerlMem_free(vmsdir); set_errno(EVMSERR); @@ -4969,7 +6430,7 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) /* Does the file really exist? */ if (sys$search(&dirfab)& STS$K_SUCCESS) { /* Yes; fake the fnb bits so we'll check type below */ - rms_set_nam_fnb(dirnam, (NAM$M_EXP_TYPE | NAM$M_EXP_VER)); + rms_set_nam_fnb(dirnam, (NAM$M_EXP_TYPE | NAM$M_EXP_VER)); } else { /* No; just work with potential name */ if (dirfab.fab$l_sts == RMS$_FNF) dirnam = savnam; @@ -4978,6 +6439,8 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) fab_sts = dirfab.fab$l_sts; sts = rms_free_search_context(&dirfab); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(trndir); PerlMem_free(vmsdir); set_errno(EVMSERR); set_vaxc_errno(fab_sts); @@ -4985,12 +6448,26 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) } } } + + /* Make sure we are using the right buffer */ +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + if (esal != NULL) { + my_esa = esal; + my_esa_len = rms_nam_esll(dirnam); + } else { +#endif + my_esa = esa; + my_esa_len = rms_nam_esl(dirnam); +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + } +#endif + my_esa[my_esa_len] = '\0'; if (!rms_is_nam_fnb(dirnam, (NAM$M_EXP_DEV | NAM$M_EXP_DIR))) { - cp1 = strchr(esa,']'); - if (!cp1) cp1 = strchr(esa,'>'); + cp1 = strchr(my_esa,']'); + if (!cp1) cp1 = strchr(my_esa,'>'); if (cp1) { /* Should always be true */ - rms_nam_esll(dirnam) -= cp1 - esa - 1; - memmove(esa,cp1 + 1, rms_nam_esll(dirnam)); + my_esa_len -= cp1 - my_esa - 1; + memmove(my_esa, cp1 + 1, my_esa_len); } } if (rms_is_nam_fnb(dirnam, NAM$M_EXP_TYPE)) { /* Was type specified? */ @@ -5000,6 +6477,8 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) /* Something other than .DIR[;1]. Bzzt. */ sts = rms_free_search_context(&dirfab); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(trndir); PerlMem_free(vmsdir); set_errno(ENOTDIR); @@ -5007,57 +6486,55 @@ 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() */ - else if (ts) Newx(retspec, rms_nam_esll(dirnam)+1, char); - else retspec = __fileify_retbuf; - strcpy(retspec,esa); + strcpy(buf, my_esa); sts = rms_free_search_context(&dirfab); PerlMem_free(trndir); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(vmsdir); - return retspec; + return buf; } if ((cp1 = strstr(esa,".][000000]")) != NULL) { for (cp2 = cp1 + 9; *cp2; cp1++,cp2++) *cp1 = *cp2; *cp1 = '\0'; - rms_nam_esll(dirnam) -= 9; + my_esa_len -= 9; } - if ((cp1 = strrchr(esa,']')) == NULL) cp1 = strrchr(esa,'>'); + if ((cp1 = strrchr(my_esa,']')) == NULL) cp1 = strrchr(my_esa,'>'); if (cp1 == NULL) { /* should never happen */ sts = rms_free_search_context(&dirfab); PerlMem_free(trndir); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(vmsdir); return NULL; } term = *cp1; *cp1 = '\0'; - retlen = strlen(esa); - cp1 = strrchr(esa,'.'); + retlen = strlen(my_esa); + cp1 = strrchr(my_esa,'.'); /* ODS-5 directory specifications can have extra "." in them. */ /* Fix-me, can not scan EFS file specifications backwards */ while (cp1 != NULL) { - if ((cp1-1 == esa) || (*(cp1-1) != '^')) + if ((cp1-1 == my_esa) || (*(cp1-1) != '^')) break; else { cp1--; - while ((cp1 > esa) && (*cp1 != '.')) + while ((cp1 > my_esa) && (*cp1 != '.')) cp1--; } - if (cp1 == esa) + if (cp1 == my_esa) cp1 = NULL; } if ((cp1) != NULL) { /* There's more than one directory in the path. Just roll back. */ *cp1 = term; - if (buf) retspec = buf; - else if (ts) Newx(retspec,retlen+7,char); - else retspec = __fileify_retbuf; - strcpy(retspec,esa); + strcpy(buf, my_esa); } else { if (rms_is_nam_fnb(dirnam, NAM$M_ROOT_DIR)) { @@ -5070,25 +6547,32 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) if (!(sys$parse(&dirfab) & STS$K_SUCCESS)) { sts = rms_free_search_context(&dirfab); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(trndir); PerlMem_free(vmsdir); set_errno(EVMSERR); set_vaxc_errno(dirfab.fab$l_sts); return NULL; } - retlen = rms_nam_esll(dirnam) - 9; /* esa - '][' - '].DIR;1' */ - if (buf) retspec = buf; - else if (ts) Newx(retspec,retlen+16,char); - else retspec = __fileify_retbuf; - cp1 = strstr(esa,"]["); - if (!cp1) cp1 = strstr(esa,"]<"); - dirlen = cp1 - esa; - memcpy(retspec,esa,dirlen); + + /* This changes the length of the string of course */ + if (esal != NULL) { + my_esa_len = rms_nam_esll(dirnam); + } else { + my_esa_len = rms_nam_esl(dirnam); + } + + retlen = my_esa_len - 9; /* esa - '][' - '].DIR;1' */ + cp1 = strstr(my_esa,"]["); + if (!cp1) cp1 = strstr(my_esa,"]<"); + dirlen = cp1 - my_esa; + memcpy(buf, my_esa, dirlen); if (!strncmp(cp1+2,"000000]",7)) { - retspec[dirlen-1] = '\0'; + buf[dirlen-1] = '\0'; /* fix-me Not full ODS-5, just extra dots in directories for now */ - cp1 = retspec + dirlen - 1; - while (cp1 > retspec) + cp1 = buf + dirlen - 1; + while (cp1 > buf) { if (*cp1 == '[') break; @@ -5100,36 +6584,33 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) } if (*cp1 == '.') *cp1 = ']'; else { - memmove(cp1+8,cp1+1,retspec+dirlen-cp1); + memmove(cp1+8, cp1+1, buf+dirlen-cp1); memmove(cp1+1,"000000]",7); } } else { - memmove(retspec+dirlen,cp1+2,retlen-dirlen); - retspec[retlen] = '\0'; + memmove(buf+dirlen, cp1+2, retlen-dirlen); + buf[retlen] = '\0'; /* Convert last '.' to ']' */ - cp1 = retspec+retlen-1; + cp1 = buf+retlen-1; while (*cp != '[') { cp1--; if (*cp1 == '.') { /* Do not trip on extra dots in ODS-5 directories */ - if ((cp1 == retspec) || (*(cp1-1) != '^')) + if ((cp1 == buf) || (*(cp1-1) != '^')) break; } } if (*cp1 == '.') *cp1 = ']'; else { - memmove(cp1+8,cp1+1,retspec+dirlen-cp1); + memmove(cp1+8, cp1+1, buf+dirlen-cp1); memmove(cp1+1,"000000]",7); } } } else { /* This is a top-level dir. Add the MFD to the path. */ - if (buf) retspec = buf; - else if (ts) Newx(retspec,retlen+16,char); - else retspec = __fileify_retbuf; - cp1 = esa; - cp2 = retspec; + cp1 = my_esa; + cp2 = buf; while ((*cp1 != ':') && (*cp1 != '\0')) *(cp2++) = *(cp1++); strcpy(cp2,":[000000]"); cp1 += 2; @@ -5139,293 +6620,516 @@ static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts) sts = rms_free_search_context(&dirfab); /* We've set up the string up through the filename. Add the type and version, and we're done. */ - strcat(retspec,".DIR;1"); + strcat(buf,".DIR;1"); /* $PARSE may have upcased filespec, so convert output to lower * case if input contained any lowercase characters. */ - if (haslower && !decc_efs_case_preserve) __mystrtolower(retspec); + if (haslower && !decc_efs_case_preserve) __mystrtolower(buf); PerlMem_free(trndir); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(vmsdir); - return retspec; + return buf; + } +} /* end of int_fileify_dirspec() */ + + +/*{{{ 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]; + char * fileified, *ret_spec, *ret_buf; + + fileified = NULL; + ret_buf = buf; + if (ret_buf == NULL) { + if (ts) { + Newx(fileified, VMS_MAXRSS, char); + if (fileified == NULL) + _ckvmssts(SS$_INSFMEM); + ret_buf = fileified; + } else { + ret_buf = __fileify_retbuf; + } + } + + ret_spec = int_fileify_dirspec(dir, ret_buf, utf8_fl); + + if (ret_spec == NULL) { + /* Cleanup on isle 5, if this is thread specific we need to deallocate */ + if (fileified) + Safefree(fileified); } + + return ret_spec; } /* end of do_fileify_dirspec() */ /*}}}*/ + /* 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); } + +static char * int_pathify_dirspec_simple(const char * dir, char * buf, + char * v_spec, int v_len, char * r_spec, int r_len, + char * d_spec, int d_len, char * n_spec, int n_len, + char * e_spec, int e_len, char * vs_spec, int vs_len) { + + /* VMS specification - Try to do this the simple way */ + if ((v_len + r_len > 0) || (d_len > 0)) { + int is_dir; + + /* No name or extension component, already a directory */ + if ((n_len + e_len + vs_len) == 0) { + strcpy(buf, dir); + return buf; + } -/*{{{ char *pathify_dirspec[_ts](char *path, char *buf)*/ -static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts) + /* Special case, we may get [.foo]bar instead of [.foo]bar.dir */ + /* This results from catfile() being used instead of catdir() */ + /* So even though it should not work, we need to allow it */ + + /* If this is .DIR;1 then do a simple conversion */ + is_dir = is_dir_ext(e_spec, e_len, vs_spec, vs_len); + if (is_dir || (e_len == 0) && (d_len > 0)) { + int len; + len = v_len + r_len + d_len - 1; + char dclose = d_spec[d_len - 1]; + strncpy(buf, dir, len); + buf[len] = '.'; + len++; + strncpy(&buf[len], n_spec, n_len); + len += n_len; + buf[len] = dclose; + buf[len + 1] = '\0'; + return buf; + } + +#ifdef HAS_SYMLINK + else if (d_len > 0) { + /* In the olden days, a directory needed to have a .DIR */ + /* extension to be a valid directory, but now it could */ + /* be a symbolic link */ + int len; + len = v_len + r_len + d_len - 1; + char dclose = d_spec[d_len - 1]; + strncpy(buf, dir, len); + buf[len] = '.'; + len++; + strncpy(&buf[len], n_spec, n_len); + len += n_len; + if (e_len > 0) { + if (decc_efs_charset) { + buf[len] = '^'; + len++; + strncpy(&buf[len], e_spec, e_len); + len += e_len; + } else { + set_vaxc_errno(RMS$_DIR); + set_errno(ENOTDIR); + return NULL; + } + } + buf[len] = dclose; + buf[len + 1] = '\0'; + return buf; + } +#else + else { + set_vaxc_errno(RMS$_DIR); + set_errno(ENOTDIR); + return NULL; + } +#endif + } + set_vaxc_errno(RMS$_DIR); + set_errno(ENOTDIR); + return NULL; +} + + +/* Internal routine to make sure or convert a directory to be in a */ +/* path specification. No utf8 flag because it is not changed or used */ +static char *int_pathify_dirspec(const char *dir, char *buf) { - static char __pathify_retbuf[VMS_MAXRSS]; - unsigned long int retlen; - char *retpath, *cp1, *cp2, *trndir; + 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; + char * exp_spec, *ret_spec; + char * trndir; unsigned short int trnlnm_iter_count; STRLEN trnlen; - int sts; + int need_to_lower; + + if (vms_debug_fileify) { + if (dir == NULL) + fprintf(stderr, "int_pathify_dirspec: dir = NULL\n"); + else + fprintf(stderr, "int_pathify_dirspec: dir = %s\n", dir); + } + + /* We may need to lower case the result if we translated */ + /* a logical name or got the current working directory */ + need_to_lower = 0; if (!dir || !*dir) { - set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL; + set_errno(EINVAL); + set_vaxc_errno(SS$_BADPARAM); + return NULL; } trndir = PerlMem_malloc(VMS_MAXRSS); - if (trndir == NULL) _ckvmssts(SS$_INSFMEM); - if (*dir) strcpy(trndir,dir); - else getcwd(trndir,VMS_MAXRSS - 1); + if (trndir == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + /* If no directory specified use the current default */ + if (*dir) + strcpy(trndir, dir); + else { + getcwd(trndir, VMS_MAXRSS - 1); + need_to_lower = 1; + } + + /* now deal with bare names that could be logical names */ trnlnm_iter_count = 0; while (!strpbrk(trndir,"/]:>") && !no_translate_barewords - && my_trnlnm(trndir,trndir,0)) { - trnlnm_iter_count++; - if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; - trnlen = strlen(trndir); - - /* Trap simple rooted lnms, and return lnm:[000000] */ - if (!strcmp(trndir+trnlen-2,".]")) { - if (buf) retpath = buf; - else if (ts) Newx(retpath,strlen(dir)+10,char); - else retpath = __pathify_retbuf; - strcpy(retpath,dir); - strcat(retpath,":[000000]"); - PerlMem_free(trndir); - return retpath; - } + && simple_trnlnm(trndir, trndir, VMS_MAXRSS)) { + trnlnm_iter_count++; + need_to_lower = 1; + if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) + break; + trnlen = strlen(trndir); + + /* Trap simple rooted lnms, and return lnm:[000000] */ + if (!strcmp(trndir+trnlen-2,".]")) { + strcpy(buf, dir); + strcat(buf, ":[000000]"); + PerlMem_free(trndir); + + if (vms_debug_fileify) { + fprintf(stderr, "int_pathify_dirspec: buf = %s\n", buf); + } + return buf; + } } - /* At this point we do not work with *dir, but the copy in - * *trndir that is modifiable. - */ + /* At this point we do not work with *dir, but the copy in *trndir */ - if (!strpbrk(trndir,"]:>")) { /* Unix-style path or plain name */ - if (*trndir == '.' && (*(trndir+1) == '\0' || - (*(trndir+1) == '.' && *(trndir+2) == '\0'))) - retlen = 2 + (*(trndir+1) != '\0'); - else { - if ( !(cp1 = strrchr(trndir,'/')) && - !(cp1 = strrchr(trndir,']')) && - !(cp1 = strrchr(trndir,'>')) ) cp1 = trndir; - if ((cp2 = strchr(cp1,'.')) != NULL && - (*(cp2-1) != '/' || /* Trailing '.', '..', */ - !(*(cp2+1) == '\0' || /* or '...' are dirs. */ - (*(cp2+1) == '.' && *(cp2+2) == '\0') || - (*(cp2+1) == '.' && *(cp2+2) == '.' && *(cp2+3) == '\0')))) { - int ver; char *cp3; - - /* For EFS or ODS-5 look for the last dot */ - if (decc_efs_charset) { - cp2 = strrchr(cp1,'.'); - } - if (vms_process_case_tolerant) { - if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ - !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } - else { - if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ - !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ - !*(cp2+3) || *(cp2+3) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } - retlen = cp2 - trndir + 1; - } - else { /* No file type present. Treat the filename as a directory. */ - retlen = strlen(trndir) + 1; + if (need_to_lower && !decc_efs_case_preserve) { + /* Legacy mode, lower case the returned value */ + __mystrtolower(trndir); + } + + + /* Some special cases, '..', '.' */ + sts = 0; + if ((trndir[0] == '.') && ((trndir[1] == '.') || (trndir[1] == '\0'))) { + /* Force UNIX filespec */ + sts = 1; + + } else { + /* Is this Unix or VMS format? */ + sts = vms_split_path(trndir, &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) { + + /* Just a filename? */ + if ((v_len + r_len + d_len) == 0) { + + /* Now we have a problem, this could be Unix or VMS */ + /* We have to guess. .DIR usually means VMS */ + + /* In UNIX report mode, the .DIR extension is removed */ + /* if one shows up, it is for a non-directory or a directory */ + /* in EFS charset mode */ + + /* So if we are in Unix report mode, assume that this */ + /* is a relative Unix directory specification */ + + sts = 1; + if (!decc_filename_unix_report && decc_efs_charset) { + int is_dir; + is_dir = is_dir_ext(e_spec, e_len, vs_spec, vs_len); + + if (is_dir) { + /* Traditional mode, assume .DIR is directory */ + buf[0] = '['; + buf[1] = '.'; + strncpy(&buf[2], n_spec, n_len); + buf[n_len + 2] = ']'; + buf[n_len + 3] = '\0'; + PerlMem_free(trndir); + if (vms_debug_fileify) { + fprintf(stderr, + "int_pathify_dirspec: buf = %s\n", + buf); + } + return buf; + } + } + } } - } - if (buf) retpath = buf; - else if (ts) Newx(retpath,retlen+1,char); - else retpath = __pathify_retbuf; - strncpy(retpath, trndir, retlen-1); - if (retpath[retlen-2] != '/') { /* If the path doesn't already end */ - retpath[retlen-1] = '/'; /* with '/', add it. */ - retpath[retlen] = '\0'; - } - else retpath[retlen-1] = '\0'; } - else { /* VMS-style directory spec */ - char *esa, *cp; - unsigned long int sts, cmplen, haslower; - struct FAB dirfab = cc$rms_fab; - int dirlen; - rms_setup_nam(savnam); - rms_setup_nam(dirnam); + if (sts == 0) { + ret_spec = int_pathify_dirspec_simple(trndir, buf, + 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 (ret_spec != NULL) { + PerlMem_free(trndir); + if (vms_debug_fileify) { + fprintf(stderr, + "int_pathify_dirspec: ret_spec = %s\n", ret_spec); + } + return ret_spec; + } - /* If we've got an explicit filename, we can just shuffle the string. */ - if ( ( (cp1 = strrchr(trndir,']')) != NULL || - (cp1 = strrchr(trndir,'>')) != NULL ) && *(cp1+1)) { - if ((cp2 = strchr(cp1,'.')) != NULL) { - int ver; char *cp3; - if (vms_process_case_tolerant) { - if (!*(cp2+1) || toupper(*(cp2+1)) != 'D' || /* Wrong type. */ - !*(cp2+2) || toupper(*(cp2+2)) != 'I' || /* Bzzt. */ - !*(cp2+3) || toupper(*(cp2+3)) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } - else { - if (!*(cp2+1) || *(cp2+1) != 'D' || /* Wrong type. */ - !*(cp2+2) || *(cp2+2) != 'I' || /* Bzzt. */ - !*(cp2+3) || *(cp2+3) != 'R' || - (*(cp2+4) && ((*(cp2+4) != ';' && *(cp2+4) != '.') || - (*(cp2+5) && ((ver = strtol(cp2+5,&cp3,10)) != 1 && - (ver || *cp3)))))) { - PerlMem_free(trndir); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; - } - } + /* Simple way did not work, which means that a logical name */ + /* was present for the directory specification. */ + /* Need to use an rmsexpand variant to decode it completely */ + exp_spec = PerlMem_malloc(VMS_MAXRSS); + if (exp_spec == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + ret_spec = int_rmsexpand_vms(trndir, exp_spec, PERL_RMSEXPAND_M_LONG); + if (ret_spec != NULL) { + sts = vms_split_path(exp_spec, &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) { + ret_spec = int_pathify_dirspec_simple( + exp_spec, buf, 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 ((ret_spec != NULL) && (!decc_efs_case_preserve)) { + /* Legacy mode, lower case the returned value */ + __mystrtolower(ret_spec); + } + } else { + set_vaxc_errno(RMS$_DIR); + set_errno(ENOTDIR); + ret_spec = NULL; + } } - else { /* No file type, so just draw name into directory part */ - for (cp2 = cp1; *cp2; cp2++) ; + PerlMem_free(exp_spec); + PerlMem_free(trndir); + if (vms_debug_fileify) { + if (ret_spec == NULL) + fprintf(stderr, "int_pathify_dirspec: ret_spec = NULL\n"); + else + fprintf(stderr, + "int_pathify_dirspec: ret_spec = %s\n", ret_spec); } - *cp2 = *cp1; - *(cp2+1) = '\0'; /* OK; trndir is guaranteed to be long enough */ - *cp1 = '.'; - /* We've now got a VMS 'path'; fall through */ - } + return ret_spec; - dirlen = strlen(trndir); - if (trndir[dirlen-1] == ']' || - trndir[dirlen-1] == '>' || - trndir[dirlen-1] == ':') { /* It's already a VMS 'path' */ - if (buf) retpath = buf; - else if (ts) Newx(retpath,strlen(trndir)+1,char); - else retpath = __pathify_retbuf; - strcpy(retpath,trndir); - PerlMem_free(trndir); - return retpath; - } - rms_set_fna(dirfab, dirnam, trndir, dirlen); - esa = PerlMem_malloc(VMS_MAXRSS); - if (esa == NULL) _ckvmssts(SS$_INSFMEM); - rms_set_dna(dirfab, dirnam, ".DIR;1", 6); - rms_bind_fab_nam(dirfab, dirnam); - rms_set_esa(dirfab, dirnam, esa, VMS_MAXRSS - 1); -#ifdef NAM$M_NO_SHORT_UPCASE - if (decc_efs_case_preserve) - rms_set_nam_nop(dirnam, NAM$M_NO_SHORT_UPCASE); -#endif + } else { + /* Unix specification, Could be trivial conversion */ + STRLEN dir_len; + dir_len = strlen(trndir); + + /* If the extended file character set is in effect */ + /* then pathify is simple */ + + if (!decc_efs_charset) { + /* Have to deal with traiing '.dir' or extra '.' */ + /* that should not be there in legacy mode, but is */ + + char * lastdot; + char * lastslash; + int is_dir; + + lastslash = strrchr(trndir, '/'); + if (lastslash == NULL) + lastslash = trndir; + else + lastslash++; + + lastdot = NULL; + + /* '..' or '.' are valid directory components */ + is_dir = 0; + if (lastslash[0] == '.') { + if (lastslash[1] == '\0') { + is_dir = 1; + } else if (lastslash[1] == '.') { + if (lastslash[2] == '\0') { + is_dir = 1; + } else { + /* And finally allow '...' */ + if ((lastslash[2] == '.') && (lastslash[3] == '\0')) { + is_dir = 1; + } + } + } + } - for (cp = trndir; *cp; cp++) - if (islower(*cp)) { haslower = 1; break; } + if (!is_dir) { + lastdot = strrchr(lastslash, '.'); + } + if (lastdot != NULL) { + STRLEN e_len; + + /* '.dir' is discarded, and any other '.' is invalid */ + e_len = strlen(lastdot); + + is_dir = is_dir_ext(lastdot, e_len, NULL, 0); + + if (is_dir) { + dir_len = dir_len - 4; - if (!(sts = (sys$parse(&dirfab)& STS$K_SUCCESS))) { - if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) { - rms_set_nam_nop(dirnam, NAM$M_SYNCHK); - sts = sys$parse(&dirfab) & STS$K_SUCCESS; + } + } } - if (!sts) { - PerlMem_free(trndir); - PerlMem_free(esa); - set_errno(EVMSERR); - set_vaxc_errno(dirfab.fab$l_sts); - return NULL; + + strcpy(buf, trndir); + if (buf[dir_len - 1] != '/') { + buf[dir_len] = '/'; + buf[dir_len + 1] = '\0'; } - } - else { - savnam = dirnam; - /* Does the file really exist? */ - if (!(sys$search(&dirfab)&STS$K_SUCCESS)) { - if (dirfab.fab$l_sts != RMS$_FNF) { - int sts1; - sts1 = rms_free_search_context(&dirfab); - PerlMem_free(trndir); - PerlMem_free(esa); - set_errno(EVMSERR); - set_vaxc_errno(dirfab.fab$l_sts); - return NULL; - } - dirnam = savnam; /* No; just work with potential name */ + + /* Under ODS-2 rules, '.' becomes '_', so fix it up */ + if (!decc_efs_charset) { + int dir_start = 0; + char * str = buf; + if (str[0] == '.') { + char * dots = str; + int cnt = 1; + while ((dots[cnt] == '.') && (cnt < 3)) + cnt++; + if (cnt <= 3) { + if ((dots[cnt] == '\0') || (dots[cnt] == '/')) { + dir_start = 1; + str += cnt; + } + } + } + for (; *str; ++str) { + while (*str == '/') { + dir_start = 1; + *str++; + } + if (dir_start) { + + /* Have to skip up to three dots which could be */ + /* directories, 3 dots being a VMS extension for Perl */ + char * dots = str; + int cnt = 0; + while ((dots[cnt] == '.') && (cnt < 3)) { + cnt++; + } + if (dots[cnt] == '\0') + break; + if ((cnt > 1) && (dots[cnt] != '/')) { + dir_start = 0; + } else { + str += cnt; + } + + /* too many dots? */ + if ((cnt == 0) || (cnt > 3)) { + dir_start = 0; + } + } + if (!dir_start && (*str == '.')) { + *str = '_'; + } + } } - } - if (rms_is_nam_fnb(dirnam, NAM$M_EXP_TYPE)) { /* Was type specified? */ - /* Yep; check version while we're at it, if it's there. */ - cmplen = rms_is_nam_fnb(dirnam, NAM$M_EXP_VER) ? 6 : 4; - if (strncmp(rms_nam_typel(dirnam),".DIR;1",cmplen)) { - int sts2; - /* Something other than .DIR[;1]. Bzzt. */ - sts2 = rms_free_search_context(&dirfab); - PerlMem_free(trndir); - PerlMem_free(esa); - set_errno(ENOTDIR); - set_vaxc_errno(RMS$_DIR); - return NULL; + PerlMem_free(trndir); + ret_spec = buf; + if (vms_debug_fileify) { + if (ret_spec == NULL) + fprintf(stderr, "int_pathify_dirspec: ret_spec = NULL\n"); + else + fprintf(stderr, + "int_pathify_dirspec: ret_spec = %s\n", ret_spec); } - } - /* OK, the type was fine. Now pull any file name into the - directory path. */ - if ((cp1 = strrchr(esa,']'))) *(rms_nam_typel(dirnam)) = ']'; - else { - cp1 = strrchr(esa,'>'); - *(rms_nam_typel(dirnam)) = '>'; - } - *cp1 = '.'; - *(rms_nam_typel(dirnam) + 1) = '\0'; - retlen = (rms_nam_typel(dirnam)) - esa + 2; - if (buf) retpath = buf; - else if (ts) Newx(retpath,retlen,char); - else retpath = __pathify_retbuf; - strcpy(retpath,esa); - PerlMem_free(esa); - sts = rms_free_search_context(&dirfab); - /* $PARSE may have upcased filespec, so convert output to lower - * case if input contained any lowercase characters. */ - if (haslower && !decc_efs_case_preserve) __mystrtolower(retpath); + return ret_spec; + } +} + +/*{{{ char *pathify_dirspec[_ts](char *path, char *buf)*/ +static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts, int * utf8_fl) +{ + static char __pathify_retbuf[VMS_MAXRSS]; + char * pathified, *ret_spec, *ret_buf; + + pathified = NULL; + ret_buf = buf; + if (ret_buf == NULL) { + if (ts) { + Newx(pathified, VMS_MAXRSS, char); + if (pathified == NULL) + _ckvmssts(SS$_INSFMEM); + ret_buf = pathified; + } else { + ret_buf = __pathify_retbuf; + } + } + + ret_spec = int_pathify_dirspec(dir, ret_buf); + + if (ret_spec == NULL) { + /* Cleanup on isle 5, if this is thread specific we need to deallocate */ + if (pathified) + Safefree(pathified); } - PerlMem_free(trndir); - return retpath; + return ret_spec; + } /* end of do_pathify_dirspec() */ -/*}}}*/ + + /* 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) +/* Internal tounixspec routine that does not use a thread context */ +/*{{{ char *int_tounixspec[_ts](char *spec, char *buf, int *)*/ +static char *int_tounixspec(const char *spec, char *rslt, int * utf8_fl) { - static char __tounixspec_retbuf[VMS_MAXRSS]; - char *dirend, *rslt, *cp1, *cp3, *tmp; + char *dirend, *cp1, *cp3, *tmp; const char *cp2; int devlen, dirlen, retlen = VMS_MAXRSS; 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; - if (buf) rslt = buf; - else if (ts) { - Newx(rslt, VMS_MAXRSS, char); + if (vms_debug_fileify) { + if (spec == NULL) + fprintf(stderr, "int_tounixspec: spec = NULL\n"); + else + fprintf(stderr, "int_tounixspec: spec = %s\n", spec); + } + + + if (spec == NULL) { + set_errno(EINVAL); + set_vaxc_errno(SS$_BADPARAM); + return NULL; + } + if (strlen(spec) > (VMS_MAXRSS-1)) { + set_errno(E2BIG); + set_vaxc_errno(SS$_BUFFEROVF); + return NULL; } - else rslt = __tounixspec_retbuf; /* New VMS specific format needs translation * glob passes filenames with trailing '\n' and expects this preserved. @@ -5438,7 +7142,7 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) int nl_flag; tunix = PerlMem_malloc(VMS_MAXRSS); - if (tunix == NULL) _ckvmssts(SS$_INSFMEM); + if (tunix == NULL) _ckvmssts_noperl(SS$_INSFMEM); strcpy(tunix, spec); tunix_len = strlen(tunix); nl_flag = 0; @@ -5499,6 +7203,9 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) /* This is already UNIX or at least nothing VMS understands */ if (cmp_rslt) { strcpy(rslt,spec); + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = %s\n", rslt); + } return rslt; } @@ -5509,6 +7216,9 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) if (dirend == NULL) dirend = strchr(spec,':'); if (dirend == NULL) { strcpy(rslt,spec); + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = %s\n", rslt); + } return rslt; } @@ -5551,11 +7261,11 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) cmp_rslt = strncasecmp(spec,"SYS$SCRATCH:", 12); #endif tmp = PerlMem_malloc(VMS_MAXRSS); - if (tmp == NULL) _ckvmssts(SS$_INSFMEM); + if (tmp == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (cmp_rslt == 0) { int islnm; - islnm = my_trnlnm(tmp, "TMP", 0); + islnm = simple_trnlnm("TMP", tmp, VMS_MAXRSS-1); if (!islnm) { strcpy(rslt, "/tmp"); cp1 = cp1 + 4; @@ -5580,8 +7290,10 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } else if ( *cp2 != '^' && *cp2 != '.' && *cp2 != '-') { /* add the implied device */ if (getcwd(tmp, VMS_MAXRSS-1 ,1) == NULL) { - if (ts) Safefree(rslt); PerlMem_free(tmp); + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = NULL\n"); + } return NULL; } trnlnm_iter_count = 0; @@ -5593,18 +7305,18 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) trnlnm_iter_count++; if (trnlnm_iter_count >= PERL_LNM_MAX_ITER+1) break; } while (vmstrnenv(tmp,tmp,0,fildev,0)); - if (ts && !buf && - ((devlen = strlen(tmp)) + (dirlen = strlen(cp2)) + 1 > retlen)) { - retlen = devlen + dirlen; - Renew(rslt,retlen+1+2*expand,char); - cp1 = rslt; - } + cp1 = rslt; cp3 = tmp; *(cp1++) = '/'; while (*cp3) { *(cp1++) = *(cp3++); - if (cp1 - rslt > (VMS_MAXRSS - 1) && !ts && !buf) { + if (cp1 - rslt > (VMS_MAXRSS - 1)) { PerlMem_free(tmp); + set_errno(ENAMETOOLONG); + set_vaxc_errno(SS$_BUFFEROVF); + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = NULL\n"); + } return NULL; /* No room */ } } @@ -5612,7 +7324,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 == '.') { @@ -5627,13 +7339,14 @@ 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++) = '/'; - if (*(cp2+1) == '[') cp2++; + if (*(cp2+1) == '[' || *(cp2+1) == '<') cp2++; } else if (*cp2 == ']' || *cp2 == '>') { if (*(cp1-1) != '/') *(cp1++) = '/'; /* Don't double after ellipsis */ @@ -5658,8 +7371,11 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) *(cp1++) = '.'; *(cp1++) = '.'; *(cp1++) = '/'; } if (*cp2 != '.' && *cp2 != ']' && *cp2 != '>') { /* we don't allow */ - if (ts) Safefree(rslt); /* filespecs like */ + /* filespecs like */ set_errno(EINVAL); set_vaxc_errno(RMS$_SYN); /* [fred.--foo.bar] */ + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = NULL\n"); + } return NULL; } } @@ -5667,7 +7383,78 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } else *(cp1++) = *cp2; } - while (*cp2) *(cp1++) = *(cp2++); + /* Translate the rest of the filename. */ + while (*cp2) { + int dot_seen; + dot_seen = 0; + switch(*cp2) { + /* Fixme - for compatibility with the CRTL we should be removing */ + /* spaces from the file specifications, but this may show that */ + /* some tests that were appearing to pass are not really passing */ + case '%': + cp2++; + *(cp1++) = '?'; + break; + case '^': + /* Fix me hex expansions not implemented */ + cp2++; /* '^.' --> '.' and other. */ + if (*cp2) { + if (*cp2 == '_') { + cp2++; + *(cp1++) = ' '; + } else { + *(cp1++) = *(cp2++); + } + } + break; + case ';': + if (decc_filename_unix_no_version) { + /* Easy, drop the version */ + while (*cp2) + cp2++; + break; + } else { + /* Punt - passing the version as a dot will probably */ + /* break perl in weird ways, but so did passing */ + /* through the ; as a version. Follow the CRTL and */ + /* hope for the best. */ + cp2++; + *(cp1++) = '.'; + } + break; + case '.': + if (dot_seen) { + /* We will need to fix this properly later */ + /* As Perl may be installed on an ODS-5 volume, but not */ + /* have the EFS_CHARSET enabled, it still may encounter */ + /* filenames with extra dots in them, and a precedent got */ + /* set which allowed them to work, that we will uphold here */ + /* If extra dots are present in a name and no ^ is on them */ + /* VMS assumes that the first one is the extension delimiter */ + /* the rest have an implied ^. */ + + /* this is also a conflict as the . is also a version */ + /* delimiter in VMS, */ + + *(cp1++) = *(cp2++); + break; + } + dot_seen = 1; + /* This is an extension */ + if (decc_readdir_dropdotnotype) { + cp2++; + if ((!*cp2) || (*cp2 == ';') || (*cp2 == '.')) { + /* Drop the dot for the extension */ + break; + } else { + *(cp1++) = '.'; + } + break; + } + default: + *(cp1++) = *(cp2++); + } + } *cp1 = '\0'; /* This still leaves /000000/ when working with a @@ -5692,75 +7479,199 @@ static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts) } } + if (vms_debug_fileify) { + fprintf(stderr, "int_tounixspec: rslt = %s\n", rslt); + } return rslt; +} /* end of int_tounixspec() */ + + +/*{{{ 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 * unixspec, *ret_spec, *ret_buf; + + unixspec = NULL; + ret_buf = buf; + if (ret_buf == NULL) { + if (ts) { + Newx(unixspec, VMS_MAXRSS, char); + if (unixspec == NULL) + _ckvmssts(SS$_INSFMEM); + ret_buf = unixspec; + } else { + ret_buf = __tounixspec_retbuf; + } + } + + ret_spec = int_tounixspec(spec, ret_buf, utf8_fl); + + if (ret_spec == NULL) { + /* Cleanup on isle 5, if this is thread specific we need to deallocate */ + if (unixspec) + Safefree(unixspec); + } + + return ret_spec; + } /* 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. -static int posix_to_vmsspec - (char *vmspath, int vmspath_len, const char *unixpath) { + 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. + + 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; +rms_setup_nam(mynam); struct dsc$descriptor_s dvidsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; - struct dsc$descriptor_s specdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; -char *esa; +struct dsc$descriptor_s specdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; +char * esa, * esal, * rsa, * rsal; char *vms_delim; int dir_flag; int unixlen; - /* If not a posix spec already, convert it */ - dir_flag = 0; - unixlen = strlen(unixpath); - if (unixlen == 0) { + dir_flag = 0; vmspath[0] = '\0'; - return SS$_NORMAL; - } - if (strncmp(unixpath,"\"^UP^",5) != 0) { - sprintf(vmspath,"\"^UP^%s\"",unixpath); + unixlen = strlen(unixpath); + if (unixlen == 0) { + return RMS$_FNF; + } + +#if __CRTL_VER >= 80200000 + /* If not a posix spec already, convert it */ + 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] == '/') dir_flag = 1; - esa = PerlMem_malloc(VMS_MAXRSS); + esal = PerlMem_malloc(VMS_MAXRSS); + if (esal == NULL) _ckvmssts_noperl(SS$_INSFMEM); + esa = PerlMem_malloc(NAM$C_MAXRSS + 1); if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM); - myfab.fab$l_fna = vmspath; - myfab.fab$b_fns = strlen(vmspath); - myfab.fab$l_naml = &mynam; - mynam.naml$l_esa = NULL; - mynam.naml$b_ess = 0; - mynam.naml$l_long_expand = esa; - mynam.naml$l_long_expand_alloc = (unsigned char) VMS_MAXRSS - 1; - mynam.naml$l_rsa = NULL; - mynam.naml$b_rss = 0; + rsal = PerlMem_malloc(VMS_MAXRSS); + if (rsal == NULL) _ckvmssts_noperl(SS$_INSFMEM); + rsa = PerlMem_malloc(NAM$C_MAXRSS + 1); + if (rsa == NULL) _ckvmssts_noperl(SS$_INSFMEM); + rms_set_fna(myfab, mynam, (char *) vmspath, strlen(vmspath)); /* cast ok */ + rms_bind_fab_nam(myfab, mynam); + rms_set_esal(mynam, esa, NAM$C_MAXRSS, esal, VMS_MAXRSS - 1); + rms_set_rsal(mynam, rsa, NAM$C_MAXRSS, rsal, VMS_MAXRSS - 1); 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); /* It failed! Try again as a UNIX filespec */ if (!(sts & 1)) { + PerlMem_free(esal); PerlMem_free(esa); + PerlMem_free(rsal); + PerlMem_free(rsa); return sts; } /* get the Device ID and the FID */ sts = sys$search(&myfab); + + /* These are no longer needed */ + PerlMem_free(esa); + PerlMem_free(rsal); + PerlMem_free(rsa); + /* on any failure, returned the POSIX ^UP^ filespec */ if (!(sts & 1)) { - PerlMem_free(esa); + PerlMem_free(esal); return sts; } specdsc.dsc$a_pointer = vmspath; @@ -5834,16 +7745,60 @@ int unixlen; } } } - PerlMem_free(esa); + PerlMem_free(esal); 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; @@ -5852,7 +7807,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; @@ -5869,9 +7828,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) @@ -5900,20 +7870,169 @@ int quoted; /* if (unixptr < lastslash) then we are in a directory */ dir_start = 0; - quoted = 0; vmsptr = vmspath; vmslen = 0; - /* This could have a "^UP^ on the front */ - if (strncmp(unixptr,"\"^UP^",5) == 0) { - quoted = 1; - unixptr+= 5; - } - /* Start with the UNIX path */ if (*unixptr != '/') { /* relative paths */ + + /* If 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; + } + + + 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; + } + } + + } + + + /* must be dev/directory - ignore version */ + if ((n_len + e_len) != 0) + break; + + /* 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); + } + if (lastslash > unixptr) { int dotdir_seen; @@ -5933,11 +8052,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) { @@ -5953,14 +8072,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++ = ']'; @@ -5990,37 +8109,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; @@ -6045,9 +8190,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 */ @@ -6063,9 +8226,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 (!islnm && (add_6zero == 0) && (*nextslash == '/') && + (&nextslash[1] == unixend)) { /* No real directory present */ add_6zero = 1; } @@ -6101,8 +8268,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; @@ -6111,7 +8280,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; @@ -6128,7 +8298,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) @@ -6141,7 +8311,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; @@ -6216,7 +8386,7 @@ int quoted; } /* All done? */ - if (*unixptr == '\0') + if (unixptr >= unixend) break; /* Normal characters - More EFS work probably needed */ @@ -6247,56 +8417,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; } } @@ -6325,8 +8489,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 != '.') && (*vmsptr2 != ':')) { *vmsptr++ = '.'; vmslen++; } @@ -6337,10 +8502,37 @@ int quoted; } #endif -/*{{{ char *tovmsspec[_ts](char *path, char *buf)*/ -static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { - static char __tovmsspec_retbuf[VMS_MAXRSS]; - char *rslt, *dirend; + /* 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 *int_tovmsspec + (const char *path, char *rslt, int dir_flag, int * utf8_flag) { + char *dirend; char *lastdot; char *vms_delim; register char *cp1; @@ -6348,83 +8540,150 @@ 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; + if (vms_debug_fileify) { + if (path == NULL) + fprintf(stderr, "int_tovmsspec: path = NULL\n"); + else + fprintf(stderr, "int_tovmsspec: path = %s\n", path); + } + + if (path == NULL) { + /* If we fail, we should be setting errno */ + set_errno(EINVAL); + set_vaxc_errno(SS$_BADPARAM); + 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 */ + /*--------------------------------------------------*/ +#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, dir_flag, utf8_flag); + return rslt; + } } +#endif + + /* 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. + */ - /* Posix specifications are now a native VMS format */ - /*--------------------------------------------------*/ -#if __CRTL_VER >= 80200000 && !defined(__VAX) - if (decc_posix_compliant_pathnames) { - if (strncmp(path,"\"^UP^",5) == 0) { - posix_to_vmsspec_hardway(rslt, rslt_len, path); + /* 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); + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } 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. + + So in the case of ambiguity, leave the specification alone. + */ + + + /* 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); + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } + return rslt; } -#endif - vms_delim = strpbrk(path,"]:>"); + dirend = strrchr(path,'/'); - if ((vms_delim != NULL) || - ((dirend = strrchr(path,'/')) == NULL)) { + if (dirend == NULL) { + char *macro_start; + int has_macro; - /* VMS special characters found! */ + /* 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 shell macros passed + through AS-IS, - if (path[0] == '.') { - if (path[1] == '\0') strcpy(rslt,"[]"); - else if (path[1] == '.' && path[2] == '\0') - strcpy(rslt,"[-]"); + utf8 flag setting needs to be preserved. + */ + hasdir = 0; - /* 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 + has_macro = 0; + macro_start = strchr(path,'$'); + if (macro_start != NULL) { + if (macro_start[1] == '(') { + has_macro = 1; + } } - } - 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); + if ((decc_efs_charset == 0) || (has_macro)) { + strcpy(rslt, path); + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } + return rslt; } -#else - strcpy(rslt,path); /* probably garbage */ -#endif - } - return rslt; } -/* If POSIX mode active, handle the conversion */ +/* If EFS charset 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); + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } return rslt; } #endif @@ -6432,7 +8691,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; @@ -6451,13 +8712,18 @@ 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; + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } return rslt; } while (*(++cp2) != '/' && *cp2) *(cp1++) = *cp2; *cp1 = '\0'; trndev = PerlMem_malloc(VMS_MAXRSS); - if (trndev == NULL) _ckvmssts(SS$_INSFMEM); - islnm = my_trnlnm(rslt,trndev,0); + if (trndev == NULL) _ckvmssts_noperl(SS$_INSFMEM); + islnm = simple_trnlnm(rslt,trndev,VMS_MAXRSS-1); /* DECC special handling */ if (!islnm) { @@ -6465,21 +8731,21 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { strcpy(rslt,"sys$system"); cp1 = rslt + 10; *cp1 = 0; - islnm = my_trnlnm(rslt,trndev,0); + islnm = simple_trnlnm(rslt,trndev,VMS_MAXRSS-1); } else if (strcmp(rslt,"tmp") == 0) { strcpy(rslt,"sys$scratch"); cp1 = rslt + 11; *cp1 = 0; - islnm = my_trnlnm(rslt,trndev,0); + islnm = simple_trnlnm(rslt,trndev,VMS_MAXRSS-1); } else if (!decc_disable_posix_root) { strcpy(rslt, "sys$posix_root"); - cp1 = rslt + 13; + cp1 = rslt + 14; *cp1 = 0; cp2 = path; while (*(cp2+1) == '/') cp2++; /* Skip multiple /s */ - islnm = my_trnlnm(rslt,trndev,0); + islnm = simple_trnlnm(rslt,trndev,VMS_MAXRSS-1); } else if (strcmp(rslt,"dev") == 0) { if (strncmp(cp2,"/null", 5) == 0) { @@ -6488,7 +8754,7 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { cp1 = rslt + 4; *cp1 = 0; cp2 = cp2 + 5; - islnm = my_trnlnm(rslt,trndev,0); + islnm = simple_trnlnm(rslt,trndev,VMS_MAXRSS-1); } } } @@ -6614,7 +8880,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)++ = '^'; @@ -6639,6 +8908,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 '`': @@ -6646,6 +8947,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 ')': @@ -6694,16 +9003,86 @@ static char *mp_do_tovmsspec(pTHX_ const char *path, char *buf, int ts) { } *cp1 = '\0'; + if (utf8_flag != NULL) + *utf8_flag = 0; + if (vms_debug_fileify) { + fprintf(stderr, "int_tovmsspec: rslt = %s\n", rslt); + } return rslt; -} /* end of do_tovmsspec() */ +} /* end of int_tovmsspec() */ + + +/*{{{ 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 * vmsspec, *ret_spec, *ret_buf; + + vmsspec = NULL; + ret_buf = buf; + if (ret_buf == NULL) { + if (ts) { + Newx(vmsspec, VMS_MAXRSS, char); + if (vmsspec == NULL) + _ckvmssts(SS$_INSFMEM); + ret_buf = vmsspec; + } else { + ret_buf = __tovmsspec_retbuf; + } + } + + ret_spec = int_tovmsspec(path, ret_buf, 0, utf8_flag); + + if (ret_spec == NULL) { + /* Cleanup on isle 5, if this is thread specific we need to deallocate */ + if (vmsspec) + Safefree(vmsspec); + } + + return ret_spec; + +} /* end of mp_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 *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 *int_tovmspath(char *path, char *buf, const int *)*/ +/* Internal routine for use with out an explict context present */ +static char * int_tovmspath(const char *path, char *buf, int * utf8_fl) { + + char * ret_spec, *pathified; + + if (path == NULL) + return NULL; + + pathified = PerlMem_malloc(VMS_MAXRSS); + if (pathified == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + ret_spec = int_pathify_dirspec(path, pathified); + + if (ret_spec == NULL) { + PerlMem_free(pathified); + return NULL; + } + + ret_spec = int_tovmsspec(pathified, buf, 0, utf8_fl); + + PerlMem_free(pathified); + return ret_spec; -/*{{{ char *tovmspath[_ts](char *path, char *buf)*/ -static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) { +} + +/*{{{ 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; @@ -6711,7 +9090,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 (int_pathify_dirspec(path, pathified) == NULL) { PerlMem_free(pathified); return NULL; } @@ -6719,7 +9098,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; @@ -6745,12 +9124,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; @@ -6758,7 +9143,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 (int_pathify_dirspec(path, pathified) == NULL) { PerlMem_free(pathified); return NULL; } @@ -6767,7 +9152,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; @@ -6793,24 +9178,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) * ***************************************************************************** */ @@ -6826,7 +9217,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 { @@ -7027,7 +9418,7 @@ mp_getredirection(pTHX_ int *ac, char ***av) /* Input from a pipe, reopen it in binary mode to disable */ /* carriage control processing. */ - fgetname(stdin, mbxname); + fgetname(stdin, mbxname, 1); mbxnam.dsc$a_pointer = mbxname; mbxnam.dsc$w_length = strlen(mbxnam.dsc$a_pointer); lib$getdvi(&dvi_item, 0, &mbxnam, &bufsize, 0, 0); @@ -7161,7 +9552,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 = int_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); @@ -7320,7 +9711,7 @@ pipe_and_fork(pTHX_ char **cmargv) *p = '\0'; fp = safe_popen(aTHX_ subcmd,"wbF",&sts); - if (fp == Nullfp) { + if (fp == NULL) { PerlIO_printf(Perl_debug_log,"Can't open output pipe (status %d)",sts); } } @@ -7386,6 +9777,7 @@ int len; void vms_image_init(int *argcp, char ***argvp) { + int status; char eqv[LNM$C_NAMLENGTH+1] = ""; unsigned int len, tabct = 8, tabidx = 0; unsigned long int *mask, iosb[2], i, rlst[128], rsz; @@ -7404,6 +9796,38 @@ vms_image_init(int *argcp, char ***argvp) Perl_csighandler_init(); #endif +#if __CRTL_VER >= 70300000 && !defined(__VAX) + /* This was moved from the pre-image init handler because on threaded */ + /* Perl it was always returning 0 for the default value. */ + status = simple_trnlnm("SYS$POSIX_ROOT", eqv, LNM$C_NAMLENGTH); + if (status > 0) { + int s; + s = decc$feature_get_index("DECC$DISABLE_POSIX_ROOT"); + if (s > 0) { + int initial; + initial = decc$feature_get_value(s, 4); + if (initial > 0) { + /* initial is: 0 if nothing has set the feature */ + /* -1 if initialized to default */ + /* 1 if set by logical name */ + /* 2 if set by decc$feature_set_value */ + decc_disable_posix_root = decc$feature_get_value(s, 1); + + /* If the value is not valid, force the feature off */ + if (decc_disable_posix_root < 0) { + decc$feature_set_value(s, 1, 1); + decc_disable_posix_root = 1; + } + } + else { + /* Nothing has asked for it explicitly, so use our own default. */ + decc_disable_posix_root = 1; + decc$feature_set_value(s, 1, 1); + } + } + } +#endif + _ckvmssts_noperl(sys$getjpiw(0,NULL,NULL,jpilist,iosb,NULL,NULL)); _ckvmssts_noperl(iosb[0]); for (i = 0; i < sizeof iprv / sizeof(unsigned long int); i++) { @@ -7569,12 +9993,13 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) *template, *base, *end, *cp1, *cp2; register int tmplen, reslen = 0, dirs = 0; - unixwild = PerlMem_malloc(VMS_MAXRSS); - if (unixwild == NULL) _ckvmssts(SS$_INSFMEM); if (!wildspec || !fspec) return 0; + + unixwild = PerlMem_malloc(VMS_MAXRSS); + if (unixwild == NULL) _ckvmssts_noperl(SS$_INSFMEM); template = unixwild; if (strpbrk(wildspec,"]>:") != NULL) { - if (do_tounixspec(wildspec,unixwild,0) == NULL) { + if (int_tounixspec(wildspec, unixwild, NULL) == NULL) { PerlMem_free(unixwild); return 0; } @@ -7584,9 +10009,9 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) unixwild[VMS_MAXRSS-1] = 0; } unixified = PerlMem_malloc(VMS_MAXRSS); - if (unixified == NULL) _ckvmssts(SS$_INSFMEM); + if (unixified == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (strpbrk(fspec,"]>:") != NULL) { - if (do_tounixspec(fspec,unixified,0) == NULL) { + if (int_tounixspec(fspec, unixified, NULL) == NULL) { PerlMem_free(unixwild); PerlMem_free(unixified); return 0; @@ -7638,7 +10063,7 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) totells = ells; for (cp1 = ellipsis+4; *cp1; cp1++) if (*cp1 == '/') dirs++; tpl = PerlMem_malloc(VMS_MAXRSS); - if (tpl == NULL) _ckvmssts(SS$_INSFMEM); + if (tpl == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (ellipsis == template && opts & 1) { /* Template begins with an ellipsis. Since we can't tell how many * directory names at the front of the resultant to keep for an @@ -7674,7 +10099,7 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) if (*front == '/' && !dirs--) { front++; break; } } lcres = PerlMem_malloc(VMS_MAXRSS); - if (lcres == NULL) _ckvmssts(SS$_INSFMEM); + if (lcres == NULL) _ckvmssts_noperl(SS$_INSFMEM); for (cp1=template,cp2=lcres; *cp1 && cp2 <= lcres + (VMS_MAXRSS - 1); cp1++,cp2++) { if (!decc_efs_case_preserve) { @@ -7757,10 +10182,10 @@ Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts) char def[NAM$C_MAXRSS+1], *st; if (getcwd(def, sizeof def,0) == NULL) { - Safefree(unixified); - Safefree(unixwild); - Safefree(lcres); - Safefree(tpl); + PerlMem_free(unixified); + PerlMem_free(unixwild); + PerlMem_free(lcres); + PerlMem_free(tpl); return 0; } if (!decc_efs_case_preserve) { @@ -7826,22 +10251,16 @@ 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 (int_tovmspath(name, dir, NULL) == NULL) { Safefree(dir); return NULL; } /* Check access before stat; otherwise stat does not * accurately report whether it's a directory. */ - if (!cando_by_name(S_IRUSR,0,dir)) { + if (!cando_by_name_int(S_IRUSR,0,dir,PERL_RMSEXPAND_M_VMS_IN)) { /* cando_by_name has already set errno */ Safefree(dir); return NULL; @@ -7862,8 +10281,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; @@ -8021,20 +10444,17 @@ Perl_readdir(pTHX_ DIR *dd) } dd->count++; /* Force the buffer to end with a NUL, and downcase name to match C convention. */ + buff[res.dsc$w_length] = '\0'; + p = buff + res.dsc$w_length; + while (--p >= buff) if (!isspace(*p)) break; + *p = '\0'; if (!decc_efs_case_preserve) { - buff[VMS_MAXRSS - 1] = '\0'; for (p = buff; *p; p++) *p = _tolower(*p); } - else { - /* we don't want to force to lowercase, just null terminate */ - buff[res.dsc$w_length] = '\0'; - } - while (--p >= buff) if (!isspace(*p)) break; /* Do we really need this? */ - *p = '\0'; /* Skip any directory component and just copy the name. */ sts = vms_split_path - (aTHX_ buff, + (buff, &v_spec, &v_len, &r_spec, @@ -8048,11 +10468,28 @@ Perl_readdir(pTHX_ DIR *dd) &vs_spec, &vs_len); - /* Drop NULL extensions on UNIX file specification */ - if ((dd->flags & PERL_VMSDIR_M_UNIXSPECS && - (e_len == 1) && decc_readdir_dropdotnotype)) { - e_len = 0; - e_spec[0] = '\0'; + if (dd->flags & PERL_VMSDIR_M_UNIXSPECS) { + + /* In Unix report mode, remove the ".dir;1" from the name */ + /* if it is a real directory. */ + if (decc_filename_unix_report || decc_efs_charset) { + if (is_dir_ext(e_spec, e_len, vs_spec, vs_len)) { + Stat_t statbuf; + int ret_sts; + + ret_sts = flex_lstat(buff, &statbuf); + if ((ret_sts == 0) && S_ISDIR(statbuf.st_mode)) { + e_len = 0; + e_spec[0] = 0; + } + } + } + + /* Drop NULL extensions on UNIX file specification */ + if ((e_len == 1) && decc_readdir_dropdotnotype) { + e_len = 0; + e_spec[0] = '\0'; + } } strncpy(dd->entry.d_name, n_spec, n_len + e_len); @@ -8063,25 +10500,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); } } @@ -8172,8 +10609,8 @@ Perl_seekdir(pTHX_ DIR *dd, long count) * * Note on command arguments to perl 'exec' and 'system': When handled * in 'VMSish fashion' (i.e. not after a call to vfork) The args - * are concatenated to form a DCL command string. If the first arg - * begins with '$' (i.e. the perl script had "\$ Type" or some such), + * are concatenated to form a DCL command string. If the first non-numeric + * arg begins with '$' (i.e. the perl script had "\$ Type" or some such), * the command string is handed off to DCL directly. Otherwise, * the first token of the command is taken as the filespec of an image * to run. The filespec is expanded using a default type of '.EXE' and @@ -8210,7 +10647,7 @@ vms_execfree(struct dsc$descriptor_s *vmscmd) static char * setup_argstr(pTHX_ SV *really, SV **mark, SV **sp) { - char *junk, *tmps = Nullch; + char *junk, *tmps = NULL; register size_t cmdlen = 0; size_t rlen; register SV **idx; @@ -8255,12 +10692,13 @@ static unsigned long int setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, struct dsc$descriptor_s **pvmscmd) { - char vmsspec[NAM$C_MAXRSS+1], resspec[NAM$C_MAXRSS+1]; + char * vmsspec; + char * resspec; char image_name[NAM$C_MAXRSS+1]; char image_argv[NAM$C_MAXRSS+1]; $DESCRIPTOR(defdsc,".EXE"); $DESCRIPTOR(defdsc2,"."); - $DESCRIPTOR(resdsc,resspec); + struct dsc$descriptor_s resdsc; struct dsc$descriptor_s *vmscmd; struct dsc$descriptor_s imgdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; unsigned long int cxt = 0, flags = 1, retsts = SS$_NORMAL; @@ -8270,17 +10708,31 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, register int isdcl; vmscmd = PerlMem_malloc(sizeof(struct dsc$descriptor_s)); - if (vmscmd == NULL) _ckvmssts(SS$_INSFMEM); + if (vmscmd == NULL) _ckvmssts_noperl(SS$_INSFMEM); + + /* vmsspec is a DCL command buffer, not just a filename */ + vmsspec = PerlMem_malloc(MAX_DCL_LINE_LENGTH + 1); + if (vmsspec == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + resspec = PerlMem_malloc(VMS_MAXRSS); + if (resspec == NULL) + _ckvmssts_noperl(SS$_INSFMEM); /* Make a copy for modification */ cmdlen = strlen(incmd); cmd = PerlMem_malloc(cmdlen+1); - if (cmd == NULL) _ckvmssts(SS$_INSFMEM); + if (cmd == NULL) _ckvmssts_noperl(SS$_INSFMEM); strncpy(cmd, incmd, cmdlen); cmd[cmdlen] = 0; image_name[0] = 0; image_argv[0] = 0; + resdsc.dsc$a_pointer = resspec; + resdsc.dsc$b_dtype = DSC$K_DTYPE_T; + resdsc.dsc$b_class = DSC$K_CLASS_S; + resdsc.dsc$w_length = VMS_MAXRSS - 1; + vmscmd->dsc$a_pointer = NULL; vmscmd->dsc$b_dtype = DSC$K_DTYPE_T; vmscmd->dsc$b_class = DSC$K_CLASS_S; @@ -8291,6 +10743,8 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, if (strlen(cmd) > MAX_DCL_LINE_LENGTH) { PerlMem_free(cmd); + PerlMem_free(vmsspec); + PerlMem_free(resspec); return CLI$_BUFOVF; /* continuation lines currently unsupported */ } @@ -8306,14 +10760,27 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, if (*rest == '.' || *rest == '/') { char *cp2; for (cp2 = resspec; - *rest && !isspace(*rest) && cp2 - resspec < sizeof resspec; + *rest && !isspace(*rest) && cp2 - resspec < (VMS_MAXRSS - 1); rest++, cp2++) *cp2 = *rest; *cp2 = '\0'; - if (do_tovmsspec(resspec,cp,0)) { + if (int_tovmsspec(resspec, cp, 0, NULL)) { s = vmsspec; + + /* When a UNIX spec with no file type is translated to VMS, */ + /* A trailing '.' is appended under ODS-5 rules. */ + /* Here we do not want that trailing "." as it prevents */ + /* Looking for a implied ".exe" type. */ + if (decc_efs_charset) { + int i; + i = strlen(vmsspec); + if (vmsspec[i-1] == '.') { + vmsspec[i-1] = '\0'; + } + } + if (*rest) { for (cp2 = vmsspec + strlen(vmsspec); - *rest && cp2 - vmsspec < sizeof vmsspec; + *rest && cp2 - vmsspec < MAX_DCL_LINE_LENGTH; rest++, cp2++) *cp2 = *rest; *cp2 = '\0'; } @@ -8344,19 +10811,19 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, imgdsc.dsc$w_length = wordbreak - s; retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,&rsts,&flags); if (!(retsts&1)) { - _ckvmssts(lib$find_file_end(&cxt)); + _ckvmssts_noperl(lib$find_file_end(&cxt)); retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,&rsts,&flags); if (!(retsts & 1) && *s == '$') { - _ckvmssts(lib$find_file_end(&cxt)); + _ckvmssts_noperl(lib$find_file_end(&cxt)); imgdsc.dsc$a_pointer++; imgdsc.dsc$w_length--; retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,&rsts,&flags); if (!(retsts&1)) { - _ckvmssts(lib$find_file_end(&cxt)); + _ckvmssts_noperl(lib$find_file_end(&cxt)); retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,&rsts,&flags); } } } - _ckvmssts(lib$find_file_end(&cxt)); + _ckvmssts_noperl(lib$find_file_end(&cxt)); if (retsts & 1) { FILE *fp; @@ -8428,20 +10895,24 @@ 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); + iname = int_rmsexpand + (tmpspec, image_name, ".exe", + PERL_RMSEXPAND_M_VMS, NULL, NULL); if (iname != NULL) { - if (cando_by_name(S_IXUSR,0,image_name)) { + if (cando_by_name_int + (S_IXUSR,0,image_name,PERL_RMSEXPAND_M_VMS_IN)) { /* MCR prefix needed */ isdcl = 0; } else { /* Try again with a null type */ /*----------------------------*/ - iname = do_rmsexpand - (tmpspec, image_name, 0, ".", PERL_RMSEXPAND_M_VMS); + iname = int_rmsexpand + (tmpspec, image_name, ".", + PERL_RMSEXPAND_M_VMS, NULL, NULL); if (iname != NULL) { - if (cando_by_name(S_IXUSR,0,image_name)) { + if (cando_by_name_int + (S_IXUSR,0,image_name, PERL_RMSEXPAND_M_VMS_IN)) { /* MCR prefix needed */ isdcl = 0; } @@ -8470,11 +10941,16 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, } fclose(fp); } - if (check_img && isdcl) return RMS$_FNF; + if (check_img && isdcl) { + PerlMem_free(cmd); + PerlMem_free(resspec); + PerlMem_free(vmsspec); + return RMS$_FNF; + } if (cando_by_name(S_IXUSR,0,resspec)) { vmscmd->dsc$a_pointer = PerlMem_malloc(MAX_DCL_LINE_LENGTH); - if (vmscmd->dsc$a_pointer == NULL) _ckvmssts(SS$_INSFMEM); + if (vmscmd->dsc$a_pointer == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (!isdcl) { strcpy(vmscmd->dsc$a_pointer,"$ MCR "); if (image_name[0] != 0) { @@ -8514,6 +10990,8 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, } vmscmd->dsc$w_length = strlen(vmscmd->dsc$a_pointer); PerlMem_free(cmd); + PerlMem_free(vmsspec); + PerlMem_free(resspec); return (vmscmd->dsc$w_length > MAX_DCL_LINE_LENGTH ? CLI$_BUFOVF : retsts); } else @@ -8528,6 +11006,8 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, vmscmd->dsc$a_pointer[vmscmd->dsc$w_length] = 0; PerlMem_free(cmd); + PerlMem_free(resspec); + PerlMem_free(vmsspec); /* check if it's a symbol (for quoting purposes) */ if (suggest_quote && !*suggest_quote) { @@ -8544,7 +11024,7 @@ setup_cmddsc(pTHX_ const char *incmd, int check_img, int *suggest_quote, if (retsts == RMS$_FNF || retsts == RMS$_DNF || retsts == RMS$_PRV || retsts == RMS$_DEV || retsts == RMS$_DIR || retsts == RMS$_SYN || (retsts & STS$M_CODE) == (SHR$_NOWILD & STS$M_CODE)) return retsts; - else { _ckvmssts(retsts); } + else { _ckvmssts_noperl(retsts); } } return (vmscmd->dsc$w_length > MAX_DCL_LINE_LENGTH ? CLI$_BUFOVF : retsts); @@ -8616,7 +11096,7 @@ Perl_vms_do_exec(pTHX_ const char *cmd) case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: set_errno(E2BIG); break; case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ - _ckvmssts(retsts); /* fall through */ + _ckvmssts_noperl(retsts); /* fall through */ default: /* SS$_DUPLNAM, SS$_CLI, resource exhaustion, etc. */ set_errno(EVMSERR); } @@ -8633,18 +11113,34 @@ Perl_vms_do_exec(pTHX_ const char *cmd) } /* end of vms_do_exec() */ /*}}}*/ -unsigned long int Perl_do_spawn(pTHX_ const char *); +int do_spawn2(pTHX_ const char *, int); -/* {{{ unsigned long int do_aspawn(void *really,void **mark,void **sp) */ -unsigned long int -Perl_do_aspawn(pTHX_ void *really,void **mark,void **sp) +int +Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp) { unsigned long int sts; char * cmd; +int flags = 0; if (sp > mark) { - cmd = setup_argstr(aTHX_ (SV *)really,(SV **)mark,(SV **)sp); - sts = do_spawn(cmd); + + /* We'll copy the (undocumented?) Win32 behavior and allow a + * numeric first argument. But the only value we'll support + * through do_aspawn is a value of 1, which means spawn without + * waiting for completion -- other values are ignored. + */ + if (SvNIOKp(*(mark+1)) && !SvPOKp(*(mark+1))) { + ++mark; + flags = SvIVx(*mark); + } + + if (flags && flags == 1) /* the Win32 P_NOWAIT value */ + flags = CLI$M_NOWAIT; + else + flags = 0; + + cmd = setup_argstr(aTHX_ really, mark, sp); + sts = do_spawn2(aTHX_ cmd, flags); /* pp_sys will clean up cmd */ return sts; } @@ -8652,9 +11148,30 @@ char * cmd; } /* end of do_aspawn() */ /*}}}*/ -/* {{{unsigned long int do_spawn(char *cmd) */ -unsigned long int -Perl_do_spawn(pTHX_ const char *cmd) + +/* {{{int do_spawn(char* cmd) */ +int +Perl_do_spawn(pTHX_ char* cmd) +{ + PERL_ARGS_ASSERT_DO_SPAWN; + + return do_spawn2(aTHX_ cmd, 0); +} +/*}}}*/ + +/* {{{int do_spawn_nowait(char* cmd) */ +int +Perl_do_spawn_nowait(pTHX_ char* cmd) +{ + PERL_ARGS_ASSERT_DO_SPAWN_NOWAIT; + + return do_spawn2(aTHX_ cmd, CLI$M_NOWAIT); +} +/*}}}*/ + +/* {{{int do_spawn2(char *cmd) */ +int +do_spawn2(pTHX_ const char *cmd, int flags) { unsigned long int sts, substs; @@ -8664,7 +11181,7 @@ Perl_do_spawn(pTHX_ const char *cmd) TAINT_ENV(); TAINT_PROPER("spawn"); if (!cmd || !*cmd) { - sts = lib$spawn(0,0,0,0,0,0,&substs,0,0,0,0,0,0); + sts = lib$spawn(0,0,0,&flags,0,0,&substs,0,0,0,0,0,0); if (!(sts & 1)) { switch (sts) { case RMS$_FNF: case RMS$_DNF: @@ -8680,7 +11197,7 @@ Perl_do_spawn(pTHX_ const char *cmd) case CLI$_BUFOVF: case RMS$_RTB: case CLI$_TKNOVF: case CLI$_RSLOVF: set_errno(E2BIG); break; case LIB$_INVARG: case LIB$_INVSTRDES: case SS$_ACCVIO: /* shouldn't happen */ - _ckvmssts(sts); /* fall through */ + _ckvmssts_noperl(sts); /* fall through */ default: /* SS$_DUPLNAM, SS$_CLI, resource exhaustion, etc. */ set_errno(EVMSERR); } @@ -8693,13 +11210,20 @@ Perl_do_spawn(pTHX_ const char *cmd) sts = substs; } else { + char mode[3]; PerlIO * fp; - fp = safe_popen(aTHX_ cmd, "nW", (int *)&sts); + if (flags & CLI$M_NOWAIT) + strcpy(mode, "n"); + else + strcpy(mode, "nW"); + + fp = safe_popen(aTHX_ cmd, mode, (int *)&sts); if (fp != NULL) my_pclose(fp); + /* sts will be the pid in the nowait case */ } return sts; -} /* end of do_spawn() */ +} /* end of do_spawn2() */ /*}}}*/ @@ -8725,7 +11249,7 @@ FILE *my_fdopen(int fd, const char *mode) memset(sockflags+sockflagsize,0,fdoff + 2 - sockflagsize); sockflagsize = fdoff + 2; } - if (fstat(fd, (struct stat *)&sbuf) == 0 && S_ISSOCK(sbuf.st_mode)) + if (fstat(fd, &sbuf.crtl_stat) == 0 && S_ISSOCK(sbuf.st_mode)) sockflags[fdoff] |= 1 << (fd % sizeof(unsigned int)); } return fp; @@ -8745,7 +11269,7 @@ int my_fclose(FILE *fp) { unsigned int fd = fileno(fp); unsigned int fdoff = fd / sizeof(unsigned int); - if (sockflagsize && fdoff <= sockflagsize) + if (sockflagsize && fdoff < sockflagsize) sockflags[fdoff] &= ~(1 << fd % sizeof(unsigned int)); } return fclose(fp); @@ -8765,7 +11289,8 @@ int my_fclose(FILE *fp) { int my_fwrite(const void *src, size_t itmsz, size_t nitm, FILE *dest) { - register char *cp, *end, *cpd, *data; + register char *cp, *end, *cpd; + char *data; register unsigned int fd = fileno(dest); register unsigned int fdoff = fd / sizeof(unsigned int); int retval; @@ -8807,7 +11332,7 @@ Perl_my_flush(pTHX_ FILE *fp) if ((res = fflush(fp)) == 0 && fp) { #ifdef VMS_DO_SOCKETS Stat_t s; - if (Fstat(fileno(fp), &s) == 0 && !S_ISSOCK(s.st_mode)) + if (fstat(fileno(fp), &s.crtl_stat) == 0 && !S_ISSOCK(s.st_mode)) #endif res = fsync(fileno(fp)); } @@ -8822,6 +11347,34 @@ Perl_my_flush(pTHX_ FILE *fp) } /*}}}*/ +/* fgetname() is not returning the correct file specifications when + * decc_filename_unix_report mode is active. So we have to have it + * aways return filenames in VMS mode and convert it ourselves. + */ + +/*{{{ char * my_fgetname(FILE *fp, buf)*/ +char * +Perl_my_fgetname(FILE *fp, char * buf) { + char * retname; + char * vms_name; + + retname = fgetname(fp, buf, 1); + + /* If we are in VMS mode, then we are done */ + if (!decc_filename_unix_report || (retname == NULL)) { + return retname; + } + + /* Convert this to Unix format */ + vms_name = PerlMem_malloc(VMS_MAXRSS + 1); + strcpy(vms_name, retname); + retname = int_tounixspec(vms_name, buf, NULL); + PerlMem_free(vms_name); + + return retname; +} +/*}}}*/ + /* * Here are replacements for the following Unix routines in the VMS environment: * getpwuid Get information for a particular UIC or UID @@ -8946,7 +11499,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,15 +12221,23 @@ Perl_my_localtime(pTHX_ const time_t *timep) #define time(t) my_time(t) -/* my_utime - update modification time of a file - * calling sequence is identical to POSIX utime(), but under - * VMS only the modification time is changed; ODS-2 does not - * maintain access times. Restrictions differ from the POSIX +/* my_utime - update modification/access time of a file + * + * VMS 7.3 and later implementation + * Only the UTC translation is home-grown. The rest is handled by the + * CRTL utime(), which will take into account the relevant feature + * logicals and ODS-5 volume characteristics for true access times. + * + * pre VMS 7.3 implementation: + * The calling sequence is identical to POSIX utime(), but under + * VMS with ODS-2, only the modification time is changed; ODS-2 does + * not maintain access times. Restrictions differ from the POSIX * definition in that the time can be changed as long as the * caller has permission to execute the necessary IO$_MODIFY $QIO; * no separate checks are made to insure that the caller is the * owner of the file or has special privs enabled. * Code here is based on Joe Meadows' FILE utility. + * */ /* Adjustment from Unix epoch (01-JAN-1970 00:00:00.00) @@ -9688,6 +12249,29 @@ static const long int utime_baseadjust[2] = { 0x4beb4000, 0x7c9567 }; /*{{{int my_utime(const char *path, const struct utimbuf *utimes)*/ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) { +#if __CRTL_VER >= 70300000 + struct utimbuf utc_utimes, *utc_utimesp; + + if (utimes != NULL) { + utc_utimes.actime = utimes->actime; + utc_utimes.modtime = utimes->modtime; +# ifdef VMSISH_TIME + /* If input was local; convert to UTC for sys svc */ + if (VMSISH_TIME) { + utc_utimes.actime = _toutc(utimes->actime); + utc_utimes.modtime = _toutc(utimes->modtime); + } +# endif + utc_utimesp = &utc_utimes; + } + else { + utc_utimesp = NULL; + } + + return utime(file, utc_utimesp); + +#else /* __CRTL_VER < 70300000 */ + register int i; int sts; long int bintime[2], len = 2, lowbit, unixtime, @@ -9715,33 +12299,17 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) struct dsc$descriptor fibdsc = {sizeof(myfib), DSC$K_DTYPE_Z, DSC$K_CLASS_S,(char *) &myfib}, devdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}, fnmdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0}; - - if (decc_efs_charset != 0) { - struct utimbuf utc_utimes; - - utc_utimes.actime = utimes->actime; - utc_utimes.modtime = utimes->modtime; -# ifdef VMSISH_TIME - /* If input was local; convert to UTC for sys svc */ - if (VMSISH_TIME) { - utc_utimes.actime = _toutc(utimes->actime); - utc_utimes.modtime = _toutc(utimes->modtime); - } -# endif - sts = utime(file, &utc_utimes); - return sts; - } if (file == NULL || *file == '\0') { - set_errno(ENOENT); - set_vaxc_errno(LIB$_INVARG); + SETERRNO(ENOENT, LIB$_INVARG); return -1; } /* Convert to VMS format ensuring that it will fit in 255 characters */ - if (do_rmsexpand(file, vmsspec, 0, NULL, PERL_RMSEXPAND_M_VMS) == NULL) - return -1; - + if (int_rmsexpand_tovms(file, vmsspec, 0) == NULL) { + SETERRNO(ENOENT, LIB$_INVARG); + return -1; + } if (utimes != NULL) { /* Convert Unix time (seconds since 01-JAN-1970 00:00:00.00) * to VMS quadword time (100 nsec intervals since 01-JAN-1858 00:00:00.00). @@ -9758,14 +12326,12 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) unixtime >>= 1; secscale <<= 1; retsts = lib$emul(&secscale, &unixtime, &lowbit, bintime); if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); + SETERRNO(EVMSERR, retsts); return -1; } retsts = lib$addx(bintime,utime_baseadjust,bintime,&len); if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); + SETERRNO(EVMSERR, retsts); return -1; } } @@ -9773,8 +12339,7 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) /* Just get the current time in VMS format directly */ retsts = sys$gettim(bintime); if (!(retsts & 1)) { - set_errno(EVMSERR); - set_vaxc_errno(retsts); + SETERRNO(EVMSERR, retsts); return -1; } } @@ -9856,6 +12421,9 @@ int Perl_my_utime(pTHX_ const char *file, const struct utimbuf *utimes) } return 0; + +#endif /* #if __CRTL_VER >= 70300000 */ + } /* end of my_utime() */ /*}}}*/ @@ -9890,7 +12458,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. */ @@ -9908,7 +12476,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. */ @@ -9916,7 +12484,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 @@ -9942,6 +12519,11 @@ static mydev_t encode_dev (pTHX_ const char *dev) return (enc | LOCKID_MASK); /* May have already overflowed into bit 31 */ } /* end of encode_dev() */ +#define VMS_DEVICE_ENCODE(device_no, devname, new_dev_no) \ + device_no = encode_dev(aTHX_ devname) +#else +#define VMS_DEVICE_ENCODE(device_no, devname, new_dev_no) \ + device_no = new_dev_no #endif static int @@ -9966,76 +12548,111 @@ is_null_device(name) return (*name++ == ':') && (*name != ':'); } -/* Do the permissions allow some operation? Assumes PL_statcache already set. */ -/* Do this via $Check_Access on VMS, since the CRTL stat() returns only a - * subset of the applicable information. - */ -bool -Perl_cando(pTHX_ Mode_t bit, bool effective, const Stat_t *statbufp) -{ - return cando_by_name(bit,effective, statbufp->st_devnam); -} /* end of cando() */ -/*}}}*/ +static int +Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag); +#define flex_stat_int(a,b,c) Perl_flex_stat_int(aTHX_ a,b,c) -/*{{{I32 cando_by_name(I32 bit, bool effective, char *fname)*/ -I32 -Perl_cando_by_name(pTHX_ I32 bit, bool effective, const char *fname) +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; - unsigned long int objtyp = ACL$C_FILE, access, retsts, privused, iosb[2]; + 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}; union prvdef curprv; - struct itmlst_3 armlst[3] = {{sizeof access, CHP$_ACCESS, &access, &retlen}, - {sizeof privused, CHP$_PRIVUSED, &privused, &retlen},{0,0,0,0}}; + struct itmlst_3 armlst[4] = {{sizeof access, CHP$_ACCESS, &access, &retlen}, + {sizeof privused, CHP$_PRIVUSED, &privused, &retlen}, + {sizeof flags, CHP$_FLAGS, &flags, &retlen},{0,0,0,0}}; struct itmlst_3 jpilst[3] = {{sizeof curprv, JPI$_CURPRIV, &curprv, &retlen}, {sizeof usrname, JPI$_USERNAME, &usrname, &usrdsc.dsc$w_length}, {0,0,0,0}}; struct itmlst_3 usrprolst[2] = {{sizeof curprv, CHP$_PRIV, &curprv, &retlen}, {0,0,0,0}}; struct dsc$descriptor_s usrprodsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + 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 = PerlMem_malloc(VMS_MAXRSS); + if (fileified == NULL) _ckvmssts_noperl(SS$_INSFMEM); if (!strpbrk(fname,"/]>:")) { - strcpy(fileified,fname); - trnlnm_iter_count = 0; - while (!strpbrk(fileified,"/]>:>") && my_trnlnm(fileified,fileified,0)) { + strcpy(fileified,fname); + trnlnm_iter_count = 0; + while (!strpbrk(fileified,"/]>:") && my_trnlnm(fileified,fileified,0)) { trnlnm_iter_count++; if (trnlnm_iter_count >= PERL_LNM_MAX_ITER) break; + } + fname = fileified; + } + + vmsname = PerlMem_malloc(VMS_MAXRSS); + if (vmsname == NULL) _ckvmssts_noperl(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; } - fname = fileified; } - if (!do_rmsexpand(fname, vmsname, 0, NULL, PERL_RMSEXPAND_M_VMS)) { - PerlMem_free(fileified); - return FALSE; + else { + strcpy(vmsname,fname); } + + /* sys$check_access needs a file spec, not a directory spec. + * flex_stat now will handle a null thread context during startup. + */ + 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; + if (vmsname[retlen-1] == ']' + || vmsname[retlen-1] == '>' + || vmsname[retlen-1] == ':' + || (!flex_stat_int(vmsname, &st, 1) && + S_ISDIR(st.st_mode))) { + + if (!int_fileify_dirspec(vmsname, fileified, 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; break; + access = ARM$M_EXECUTE; + flags = CHP$M_READ; + break; case S_IRUSR: case S_IRGRP: case S_IROTH: - access = ARM$M_READ; break; + 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; break; + 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; break; + access = ARM$M_DELETE; + flags = CHP$M_READ | CHP$M_WRITE; + break; default: - PerlMem_free(fileified); + if (fileified != NULL) + PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return FALSE; } @@ -10047,23 +12664,23 @@ Perl_cando_by_name(pTHX_ I32 bit, bool effective, const char *fname) */ /* get current process privs and username */ - _ckvmssts(sys$getjpiw(0,0,0,jpilst,iosb,0,0)); - _ckvmssts(iosb[0]); + _ckvmssts_noperl(sys$getjpiw(0,0,0,jpilst,iosb,0,0)); + _ckvmssts_noperl(iosb[0]); #if defined(__VMS_VER) && __VMS_VER >= 60000000 /* find out the space required for the profile */ - _ckvmssts(sys$create_user_profile(&usrdsc,&usrprolst,0,0, - &usrprodsc.dsc$w_length,0)); + _ckvmssts_noperl(sys$create_user_profile(&usrdsc,&usrprolst,0,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)); + if (usrprodsc.dsc$a_pointer == NULL) _ckvmssts_noperl(SS$_INSFMEM); + _ckvmssts_noperl(sys$create_user_profile(&usrdsc,&usrprolst,0,usrprodsc.dsc$a_pointer, + &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 */ @@ -10080,17 +12697,47 @@ Perl_cando_by_name(pTHX_ I32 bit, bool effective, const char *fname) if (retsts == SS$_NOPRIV) set_errno(EACCES); else if (retsts == SS$_INVFILFOROP) set_errno(EINVAL); else set_errno(ENOENT); - PerlMem_free(fileified); + if (fileified != NULL) + PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return FALSE; } if (retsts == SS$_NORMAL || retsts == SS$_ACCONFLICT) { - PerlMem_free(fileified); + if (fileified != NULL) + PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); return TRUE; } - _ckvmssts(retsts); + _ckvmssts_noperl(retsts); + + if (fileified != NULL) + PerlMem_free(fileified); + if (vmsname != NULL) + PerlMem_free(vmsname); + return FALSE; /* Should never get here */ + +} + +/* Do the permissions allow some operation? Assumes PL_statcache already set. */ +/* Do this via $Check_Access on VMS, since the CRTL stat() returns only a + * subset of the applicable information. + */ +bool +Perl_cando(pTHX_ Mode_t bit, bool effective, const Stat_t *statbufp) +{ + return cando_by_name_int + (bit, effective, statbufp->st_devnam, PERL_RMSEXPAND_M_VMS_IN); +} /* end of cando() */ +/*}}}*/ - PerlMem_free(fileified); - return FALSE; /* Should never get here */ + +/*{{{I32 cando_by_name(I32 bit, bool effective, char *fname)*/ +I32 +Perl_cando_by_name(pTHX_ I32 bit, bool effective, const char *fname) +{ + return cando_by_name_int(bit, effective, fname, 0); } /* end of cando_by_name() */ /*}}}*/ @@ -10100,7 +12747,7 @@ Perl_cando_by_name(pTHX_ I32 bit, bool effective, const char *fname) int Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp) { - if (!fstat(fd,(stat_t *) statbufp)) { + if (!fstat(fd, &statbufp->crtl_stat)) { char *cptr; char *vms_filename; vms_filename = PerlMem_malloc(VMS_MAXRSS); @@ -10115,21 +12762,18 @@ Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp) } else { /* Make sure that the saved name fits in 255 characters */ - cptr = do_rmsexpand + cptr = int_rmsexpand_vms (vms_filename, statbufp->st_devnam, - 0, - NULL, - PERL_RMSEXPAND_M_VMS); + 0); if (cptr == NULL) statbufp->st_devnam[0] = 0; } PerlMem_free(vms_filename); VMS_INO_T_COPY(statbufp->st_ino, statbufp->crtl_stat.st_ino); -#ifndef _USE_STD_STAT - statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam); -#endif + VMS_DEVICE_ENCODE + (statbufp->st_dev, statbufp->st_devnam, statbufp->crtl_stat.st_dev); # ifdef RTL_USES_UTC # ifdef VMSISH_TIME @@ -10157,36 +12801,26 @@ Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp) } /* end of flex_fstat() */ /*}}}*/ -#if !defined(__VAX) && __CRTL_VER >= 80200000 -#ifdef lstat -#undef lstat -#endif -#else -#ifdef lstat -#undef lstat -#endif -#define lstat(_x, _y) stat(_x, _y) -#endif - -#define flex_stat_int(a,b,c) Perl_flex_stat_int(aTHX_ a,b,c) - static int Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) { - char fileified[VMS_MAXRSS]; - char temp_fspec[VMS_MAXRSS]; - char *save_spec; + char *fileified; + char *temp_fspec; + const char *save_spec; + char *ret_spec; int retval = -1; - int saved_errno, saved_vaxc_errno; + int efs_hack = 0; + dSAVEDERRNO; - if (!fspec) return retval; - saved_errno = errno; saved_vaxc_errno = vaxc$errno; - strcpy(temp_fspec, fspec); + if (!fspec) { + errno = EINVAL; + return retval; + } if (decc_bug_devnull != 0) { - if (is_null_device(temp_fspec)) { /* Fake a stat() for the null device */ + if (is_null_device(fspec)) { /* Fake a stat() for the null device */ memset(statbufp,0,sizeof *statbufp); - statbufp->st_dev = encode_dev(aTHX_ "_NLA0:"); + VMS_DEVICE_ENCODE(statbufp->st_dev, "_NLA0:", 0); statbufp->st_mode = S_IFBLK | S_IREAD | S_IWRITE | S_IEXEC; statbufp->st_uid = 0x00010001; statbufp->st_gid = 0x0001; @@ -10206,43 +12840,128 @@ 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. */ + + + fileified = PerlMem_malloc(VMS_MAXRSS); + if (fileified == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + temp_fspec = PerlMem_malloc(VMS_MAXRSS); + if (temp_fspec == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + strcpy(temp_fspec, fspec); + + SAVE_ERRNO; + #if __CRTL_VER >= 80200000 && !defined(__VAX) if (decc_posix_compliant_pathnames == 0) { #endif - if (do_fileify_dirspec(temp_fspec,fileified,0) != NULL) { - if (lstat_flag == 0) - retval = stat(fileified,(stat_t *) statbufp); - else - retval = lstat(fileified,(stat_t *) statbufp); - save_spec = fileified; + + /* We may be able to optimize this, but in order for fileify_dirspec to + * always return a usuable answer, we have to call vmspath first to + * make sure that it is in VMS directory format, as stat/lstat on 8.3 + * can not handle directories in unix format that it does not have read + * access to. Vmspath handles the case where a bare name which could be + * a logical name gets passed. + */ + ret_spec = int_tovmspath(fspec, temp_fspec, NULL); + if (ret_spec != NULL) { + ret_spec = int_fileify_dirspec(temp_fspec, fileified, NULL); + if (ret_spec != NULL) { + if (lstat_flag == 0) + retval = stat(fileified, &statbufp->crtl_stat); + else + retval = lstat(fileified, &statbufp->crtl_stat); + save_spec = fileified; + } + } + + if (retval && vms_bug_stat_filename) { + + /* We should try again as a vmsified file specification */ + /* However Perl traditionally has not done this, which */ + /* causes problems with existing tests */ + + ret_spec = int_tovmsspec(fspec, temp_fspec, 0, NULL); + if (ret_spec != NULL) { + if (lstat_flag == 0) + retval = stat(temp_fspec, &statbufp->crtl_stat); + else + retval = lstat(temp_fspec, &statbufp->crtl_stat); + save_spec = temp_fspec; + } } + if (retval) { - if (lstat_flag == 0) - retval = stat(temp_fspec,(stat_t *) statbufp); - else - retval = lstat(temp_fspec,(stat_t *) statbufp); - save_spec = temp_fspec; + /* Last chance - allow multiple dots with out EFS CHARSET */ + /* 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 __CRTL_VER >= 70300000 && !defined(__VAX) + if (!decc_efs_charset && (decc_efs_charset_index > 0)) + decc$feature_set_value(decc_efs_charset_index, 1, 1); +#endif + if (lstat_flag == 0) + retval = stat(fspec, &statbufp->crtl_stat); + else + retval = lstat(fspec, &statbufp->crtl_stat); + save_spec = fspec; +#if __CRTL_VER >= 70300000 && !defined(__VAX) + if (!decc_efs_charset && (decc_efs_charset_index > 0)) { + decc$feature_set_value(decc_efs_charset_index, 1, 0); + efs_hack = 1; + } +#endif } + #if __CRTL_VER >= 80200000 && !defined(__VAX) } else { if (lstat_flag == 0) - retval = stat(temp_fspec,(stat_t *) statbufp); + retval = stat(temp_fspec, &statbufp->crtl_stat); else - retval = lstat(temp_fspec,(stat_t *) statbufp); + retval = lstat(temp_fspec, &statbufp->crtl_stat); 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); + int rmsex_flags = PERL_RMSEXPAND_M_VMS; + + /* If this is an lstat, do not follow the link */ + if (lstat_flag) + rmsex_flags |= PERL_RMSEXPAND_M_SYMLINK; + +#if __CRTL_VER >= 70300000 && !defined(__VAX) + /* If we used the efs_hack above, we must also use it here for */ + /* perl_cando to work */ + if (efs_hack && (decc_efs_charset_index > 0)) { + decc$feature_set_value(decc_efs_charset_index, 1, 1); + } +#endif + cptr = int_rmsexpand_tovms(save_spec, statbufp->st_devnam, rmsex_flags); +#if __CRTL_VER >= 70300000 && !defined(__VAX) + if (efs_hack && (decc_efs_charset_index > 0)) { + decc$feature_set_value(decc_efs_charset, 1, 0); + } +#endif + + /* Fix me: If this is NULL then stat found a file, and we could */ + /* not convert the specification to VMS - Should never happen */ if (cptr == NULL) statbufp->st_devnam[0] = 0; VMS_INO_T_COPY(statbufp->st_ino, statbufp->crtl_stat.st_ino); -#ifndef _USE_STD_STAT - statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam); -#endif + VMS_DEVICE_ENCODE + (statbufp->st_dev, statbufp->st_devnam, statbufp->crtl_stat.st_dev); # ifdef RTL_USES_UTC # ifdef VMSISH_TIME if (VMSISH_TIME) { @@ -10264,7 +12983,7 @@ Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag) # endif } /* If we were successful, leave errno where we found it */ - if (retval == 0) { errno = saved_errno; vaxc$errno = saved_vaxc_errno; } + if (retval == 0) RESTORE_ERRNO; return retval; } /* end of flex_stat_int() */ @@ -10323,196 +13042,28 @@ my_getlogin(void) * of each may be found in the Perl standard distribution. */ /* FIXME */ /*{{{int rmscopy(char *src, char *dst, int preserve_dates)*/ -#if defined(__VAX) || !defined(NAML$C_MAXRSS) -int -Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates) -{ - char vmsin[NAM$C_MAXRSS+1], vmsout[NAM$C_MAXRSS+1], esa[NAM$C_MAXRSS], - rsa[NAM$C_MAXRSS], ubf[32256]; - unsigned long int i, sts, sts2; - struct FAB fab_in, fab_out; - struct RAB rab_in, rab_out; - struct NAM nam; - struct XABDAT xabdat; - struct XABFHC xabfhc; - struct XABRDT xabrdt; - struct XABSUM xabsum; - - if (!spec_in || !*spec_in || !do_tovmsspec(spec_in,vmsin,1) || - !spec_out || !*spec_out || !do_tovmsspec(spec_out,vmsout,1)) { - set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - return 0; - } - - fab_in = cc$rms_fab; - fab_in.fab$l_fna = vmsin; - fab_in.fab$b_fns = strlen(vmsin); - fab_in.fab$b_shr = FAB$M_SHRPUT | FAB$M_UPI; - fab_in.fab$b_fac = FAB$M_BIO | FAB$M_GET; - fab_in.fab$l_fop = FAB$M_SQO; - fab_in.fab$l_nam = &nam; - fab_in.fab$l_xab = (void *) &xabdat; - - nam = cc$rms_nam; - nam.nam$l_rsa = rsa; - nam.nam$b_rss = sizeof(rsa); - nam.nam$l_esa = esa; - nam.nam$b_ess = sizeof (esa); - nam.nam$b_esl = nam.nam$b_rsl = 0; -#ifdef NAM$M_NO_SHORT_UPCASE - if (decc_efs_case_preserve) - nam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE; -#endif - - xabdat = cc$rms_xabdat; /* To get creation date */ - xabdat.xab$l_nxt = (void *) &xabfhc; - - xabfhc = cc$rms_xabfhc; /* To get record length */ - xabfhc.xab$l_nxt = (void *) &xabsum; - - xabsum = cc$rms_xabsum; /* To get key and area information */ - - if (!((sts = sys$open(&fab_in)) & 1)) { - set_vaxc_errno(sts); - switch (sts) { - case RMS$_FNF: case RMS$_DNF: - set_errno(ENOENT); break; - case RMS$_DIR: - set_errno(ENOTDIR); break; - case RMS$_DEV: - set_errno(ENODEV); break; - case RMS$_SYN: - set_errno(EINVAL); break; - case RMS$_PRV: - set_errno(EACCES); break; - default: - set_errno(EVMSERR); - } - return 0; - } - - fab_out = fab_in; - fab_out.fab$w_ifi = 0; - fab_out.fab$b_fac = FAB$M_BIO | FAB$M_PUT; - fab_out.fab$b_shr = FAB$M_SHRGET | FAB$M_UPI; - fab_out.fab$l_fop = FAB$M_SQO; - fab_out.fab$l_fna = vmsout; - fab_out.fab$b_fns = strlen(vmsout); - fab_out.fab$l_dna = nam.nam$l_name; - fab_out.fab$b_dns = nam.nam$l_name ? nam.nam$b_name + nam.nam$b_type : 0; - - if (preserve_dates == 0) { /* Act like DCL COPY */ - nam.nam$b_nop |= NAM$M_SYNCHK; - fab_out.fab$l_xab = NULL; /* Don't disturb data from input file */ - if (!((sts = sys$parse(&fab_out)) & 1)) { - set_errno(sts == RMS$_SYN ? EINVAL : EVMSERR); - set_vaxc_errno(sts); - return 0; - } - fab_out.fab$l_xab = (void *) &xabdat; - if (nam.nam$l_fnb & (NAM$M_EXP_NAME | NAM$M_EXP_TYPE)) preserve_dates = 1; - } - fab_out.fab$l_nam = (void *) 0; /* Done with NAM block */ - if (preserve_dates < 0) /* Clear all bits; we'll use it as a */ - preserve_dates =0; /* bitmask from this point forward */ - - if (!(preserve_dates & 1)) fab_out.fab$l_xab = (void *) &xabfhc; - if (!((sts = sys$create(&fab_out)) & 1)) { - set_vaxc_errno(sts); - switch (sts) { - case RMS$_DNF: - set_errno(ENOENT); break; - case RMS$_DIR: - set_errno(ENOTDIR); break; - case RMS$_DEV: - set_errno(ENODEV); break; - case RMS$_SYN: - set_errno(EINVAL); break; - case RMS$_PRV: - set_errno(EACCES); break; - default: - set_errno(EVMSERR); - } - return 0; - } - fab_out.fab$l_fop |= FAB$M_DLT; /* in case we have to bail out */ - if (preserve_dates & 2) { - /* sys$close() will process xabrdt, not xabdat */ - xabrdt = cc$rms_xabrdt; -#ifndef __GNUC__ - xabrdt.xab$q_rdt = xabdat.xab$q_rdt; -#else - /* gcc doesn't like the assignment, since its prototype for xab$q_rdt - * is unsigned long[2], while DECC & VAXC use a struct */ - memcpy(xabrdt.xab$q_rdt,xabdat.xab$q_rdt,sizeof xabrdt.xab$q_rdt); -#endif - fab_out.fab$l_xab = (void *) &xabrdt; - } - - rab_in = cc$rms_rab; - rab_in.rab$l_fab = &fab_in; - rab_in.rab$l_rop = RAB$M_BIO; - rab_in.rab$l_ubf = ubf; - rab_in.rab$w_usz = sizeof ubf; - if (!((sts = sys$connect(&rab_in)) & 1)) { - sys$close(&fab_in); sys$close(&fab_out); - set_errno(EVMSERR); set_vaxc_errno(sts); - return 0; - } - - rab_out = cc$rms_rab; - rab_out.rab$l_fab = &fab_out; - rab_out.rab$l_rbf = ubf; - if (!((sts = sys$connect(&rab_out)) & 1)) { - sys$close(&fab_in); sys$close(&fab_out); - set_errno(EVMSERR); set_vaxc_errno(sts); - return 0; - } - - while ((sts = sys$read(&rab_in))) { /* always true */ - if (sts == RMS$_EOF) break; - rab_out.rab$w_rsz = rab_in.rab$w_rsz; - if (!(sts & 1) || !((sts = sys$write(&rab_out)) & 1)) { - sys$close(&fab_in); sys$close(&fab_out); - set_errno(EVMSERR); set_vaxc_errno(sts); - return 0; - } - } - - fab_out.fab$l_fop &= ~FAB$M_DLT; /* We got this far; keep the output */ - sys$close(&fab_in); sys$close(&fab_out); - sts = (fab_in.fab$l_sts & 1) ? fab_out.fab$l_sts : fab_in.fab$l_sts; - if (!(sts & 1)) { - set_errno(EVMSERR); set_vaxc_errno(sts); - return 0; - } - - return 1; - -} /* end of rmscopy() */ -#else -/* ODS-5 support version */ int Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates) { - char *vmsin, * vmsout, *esa, *esa_out, - *rsa, *ubf; + char *vmsin, * vmsout, *esa, *esal, *esa_out, *esal_out, + *rsa, *rsal, *rsa_out, *rsal_out, *ubf; unsigned long int i, sts, sts2; + int dna_len; struct FAB fab_in, fab_out; struct RAB rab_in, rab_out; - struct NAML nam; - struct NAML nam_out; + rms_setup_nam(nam); + rms_setup_nam(nam_out); struct XABDAT xabdat; struct XABFHC xabfhc; struct XABRDT xabrdt; struct XABSUM xabsum; vmsin = PerlMem_malloc(VMS_MAXRSS); - if (vmsin == NULL) _ckvmssts(SS$_INSFMEM); + if (vmsin == NULL) _ckvmssts_noperl(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 (vmsout == NULL) _ckvmssts_noperl(SS$_INSFMEM); + if (!spec_in || !*spec_in || !int_tovmsspec(spec_in, vmsin, 1, NULL) || + !spec_out || !*spec_out || !int_tovmsspec(spec_out, vmsout, 1, NULL)) { PerlMem_free(vmsin); PerlMem_free(vmsout); set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); @@ -10520,35 +13071,36 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates } esa = PerlMem_malloc(VMS_MAXRSS); - if (esa == NULL) _ckvmssts(SS$_INSFMEM); - nam = cc$rms_naml; + if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM); + esal = NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + esal = PerlMem_malloc(VMS_MAXRSS); + if (esal == NULL) _ckvmssts_noperl(SS$_INSFMEM); +#endif fab_in = cc$rms_fab; - fab_in.fab$l_fna = (char *) -1; - fab_in.fab$b_fns = 0; - nam.naml$l_long_filename = vmsin; - nam.naml$l_long_filename_size = strlen(vmsin); + rms_set_fna(fab_in, nam, vmsin, strlen(vmsin)); fab_in.fab$b_shr = FAB$M_SHRPUT | FAB$M_UPI; fab_in.fab$b_fac = FAB$M_BIO | FAB$M_GET; fab_in.fab$l_fop = FAB$M_SQO; - fab_in.fab$l_naml = &nam; + rms_bind_fab_nam(fab_in, nam); fab_in.fab$l_xab = (void *) &xabdat; rsa = PerlMem_malloc(VMS_MAXRSS); - if (rsa == NULL) _ckvmssts(SS$_INSFMEM); - nam.naml$l_rsa = NULL; - nam.naml$b_rss = 0; - nam.naml$l_long_result = rsa; - nam.naml$l_long_result_alloc = VMS_MAXRSS - 1; - nam.naml$l_esa = NULL; - nam.naml$b_ess = 0; - nam.naml$l_long_expand = esa; - nam.naml$l_long_expand_alloc = VMS_MAXRSS - 1; - nam.naml$b_esl = nam.naml$b_rsl = 0; - nam.naml$l_long_expand_size = 0; - nam.naml$l_long_result_size = 0; + if (rsa == NULL) _ckvmssts_noperl(SS$_INSFMEM); + rsal = NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + rsal = PerlMem_malloc(VMS_MAXRSS); + if (rsal == NULL) _ckvmssts_noperl(SS$_INSFMEM); +#endif + rms_set_rsal(nam, rsa, NAM$C_MAXRSS, rsal, (VMS_MAXRSS - 1)); + rms_set_esal(nam, esa, NAM$C_MAXRSS, esal, (VMS_MAXRSS - 1)); + rms_nam_esl(nam) = 0; + rms_nam_rsl(nam) = 0; + rms_nam_esll(nam) = 0; + rms_nam_rsll(nam) = 0; #ifdef NAM$M_NO_SHORT_UPCASE if (decc_efs_case_preserve) - nam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE; + rms_set_nam_nop(nam, NAM$M_NO_SHORT_UPCASE); #endif xabdat = cc$rms_xabdat; /* To get creation date */ @@ -10563,7 +13115,11 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates PerlMem_free(vmsin); PerlMem_free(vmsout); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); set_vaxc_errno(sts); switch (sts) { case RMS$_FNF: case RMS$_DNF: @@ -10588,55 +13144,70 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates fab_out.fab$b_fac = FAB$M_BIO | FAB$M_PUT; fab_out.fab$b_shr = FAB$M_SHRGET | FAB$M_UPI; fab_out.fab$l_fop = FAB$M_SQO; - fab_out.fab$l_naml = &nam_out; - fab_out.fab$l_fna = (char *) -1; - fab_out.fab$b_fns = 0; - nam_out.naml$l_long_filename = vmsout; - nam_out.naml$l_long_filename_size = strlen(vmsout); - fab_out.fab$l_dna = (char *) -1; - fab_out.fab$b_dns = 0; - nam_out.naml$l_long_defname = nam.naml$l_long_name; - nam_out.naml$l_long_defname_size = - nam.naml$l_long_name ? - nam.naml$l_long_name_size + nam.naml$l_long_type_size : 0; - - esa_out = PerlMem_malloc(VMS_MAXRSS); - if (esa_out == NULL) _ckvmssts(SS$_INSFMEM); - nam_out.naml$l_rsa = NULL; - nam_out.naml$b_rss = 0; - nam_out.naml$l_long_result = NULL; - nam_out.naml$l_long_result_alloc = 0; - nam_out.naml$l_esa = NULL; - nam_out.naml$b_ess = 0; - nam_out.naml$l_long_expand = esa_out; - nam_out.naml$l_long_expand_alloc = VMS_MAXRSS - 1; + rms_bind_fab_nam(fab_out, nam_out); + rms_set_fna(fab_out, nam_out, vmsout, strlen(vmsout)); + dna_len = rms_nam_namel(nam) ? rms_nam_name_type_l_size(nam) : 0; + rms_set_dna(fab_out, nam_out, rms_nam_namel(nam), dna_len); + esa_out = PerlMem_malloc(NAM$C_MAXRSS + 1); + if (esa_out == NULL) _ckvmssts_noperl(SS$_INSFMEM); + rsa_out = PerlMem_malloc(NAM$C_MAXRSS + 1); + if (rsa_out == NULL) _ckvmssts_noperl(SS$_INSFMEM); + esal_out = NULL; + rsal_out = NULL; +#if !defined(__VAX) && defined(NAML$C_MAXRSS) + esal_out = PerlMem_malloc(VMS_MAXRSS); + if (esal_out == NULL) _ckvmssts_noperl(SS$_INSFMEM); + rsal_out = PerlMem_malloc(VMS_MAXRSS); + if (rsal_out == NULL) _ckvmssts_noperl(SS$_INSFMEM); +#endif + rms_set_rsal(nam_out, rsa_out, NAM$C_MAXRSS, rsal_out, (VMS_MAXRSS - 1)); + rms_set_esal(nam_out, esa_out, NAM$C_MAXRSS, esal_out, (VMS_MAXRSS - 1)); if (preserve_dates == 0) { /* Act like DCL COPY */ - nam_out.naml$b_nop |= NAM$M_SYNCHK; + rms_set_nam_nop(nam_out, NAM$M_SYNCHK); fab_out.fab$l_xab = NULL; /* Don't disturb data from input file */ - if (!((sts = sys$parse(&fab_out)) & 1)) { + if (!((sts = sys$parse(&fab_out)) & STS$K_SUCCESS)) { PerlMem_free(vmsin); PerlMem_free(vmsout); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); set_errno(sts == RMS$_SYN ? EINVAL : EVMSERR); set_vaxc_errno(sts); return 0; } fab_out.fab$l_xab = (void *) &xabdat; - if (nam.naml$l_fnb & (NAM$M_EXP_NAME | NAM$M_EXP_TYPE)) preserve_dates = 1; + if (rms_is_nam_fnb(nam, NAM$M_EXP_NAME | NAM$M_EXP_TYPE)) + preserve_dates = 1; } if (preserve_dates < 0) /* Clear all bits; we'll use it as a */ preserve_dates =0; /* bitmask from this point forward */ if (!(preserve_dates & 1)) fab_out.fab$l_xab = (void *) &xabfhc; - if (!((sts = sys$create(&fab_out)) & 1)) { + if (!((sts = sys$create(&fab_out)) & STS$K_SUCCESS)) { PerlMem_free(vmsin); PerlMem_free(vmsout); PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); set_vaxc_errno(sts); switch (sts) { case RMS$_DNF: @@ -10669,7 +13240,7 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates } ubf = PerlMem_malloc(32256); - if (ubf == NULL) _ckvmssts(SS$_INSFMEM); + if (ubf == NULL) _ckvmssts_noperl(SS$_INSFMEM); rab_in = cc$rms_rab; rab_in.rab$l_fab = &fab_in; rab_in.rab$l_rop = RAB$M_BIO; @@ -10679,10 +13250,19 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates sys$close(&fab_in); sys$close(&fab_out); PerlMem_free(vmsin); PerlMem_free(vmsout); - PerlMem_free(esa); PerlMem_free(ubf); + PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); set_errno(EVMSERR); set_vaxc_errno(sts); return 0; } @@ -10694,10 +13274,19 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates sys$close(&fab_in); sys$close(&fab_out); PerlMem_free(vmsin); PerlMem_free(vmsout); - PerlMem_free(esa); PerlMem_free(ubf); + PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); set_errno(EVMSERR); set_vaxc_errno(sts); return 0; } @@ -10709,10 +13298,19 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates sys$close(&fab_in); sys$close(&fab_out); PerlMem_free(vmsin); PerlMem_free(vmsout); - PerlMem_free(esa); PerlMem_free(ubf); + PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); set_errno(EVMSERR); set_vaxc_errno(sts); return 0; } @@ -10722,27 +13320,31 @@ Perl_rmscopy(pTHX_ const char *spec_in, const char *spec_out, int preserve_dates fab_out.fab$l_fop &= ~FAB$M_DLT; /* We got this far; keep the output */ sys$close(&fab_in); sys$close(&fab_out); sts = (fab_in.fab$l_sts & 1) ? fab_out.fab$l_sts : fab_in.fab$l_sts; - if (!(sts & 1)) { - PerlMem_free(vmsin); - PerlMem_free(vmsout); - PerlMem_free(esa); - PerlMem_free(ubf); - PerlMem_free(rsa); - PerlMem_free(esa_out); - set_errno(EVMSERR); set_vaxc_errno(sts); - return 0; - } PerlMem_free(vmsin); PerlMem_free(vmsout); - PerlMem_free(esa); PerlMem_free(ubf); + PerlMem_free(esa); + if (esal != NULL) + PerlMem_free(esal); PerlMem_free(rsa); + if (rsal != NULL) + PerlMem_free(rsal); PerlMem_free(esa_out); + if (esal_out != NULL) + PerlMem_free(esal_out); + PerlMem_free(rsa_out); + if (rsal_out != NULL) + PerlMem_free(rsal_out); + + if (!(sts & 1)) { + set_errno(EVMSERR); set_vaxc_errno(sts); + return 0; + } + return 1; } /* end of rmscopy() */ -#endif /*}}}*/ @@ -10761,16 +13363,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); } @@ -10780,11 +13393,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); } @@ -10794,11 +13414,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); } @@ -10808,11 +13435,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); } @@ -10822,11 +13456,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); } @@ -10836,11 +13477,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); } @@ -10850,11 +13498,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); } @@ -10916,7 +13571,7 @@ rmscopy_fromperl(pTHX_ CV *cv) if (SvTYPE(mysv) == SVt_PVGV) { if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),inspec)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &PL_sv_no; + ST(0) = sv_2mortal(newSViv(0)); Safefree(inspec); XSRETURN(1); } @@ -10925,7 +13580,7 @@ rmscopy_fromperl(pTHX_ CV *cv) else { if (mysv != ST(0) || !(inp = SvPV(mysv,n_a)) || !*inp) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &PL_sv_no; + ST(0) = sv_2mortal(newSViv(0)); Safefree(inspec); XSRETURN(1); } @@ -10935,7 +13590,7 @@ rmscopy_fromperl(pTHX_ CV *cv) if (SvTYPE(mysv) == SVt_PVGV) { if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),outspec)) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &PL_sv_no; + ST(0) = sv_2mortal(newSViv(0)); Safefree(inspec); Safefree(outspec); XSRETURN(1); @@ -10945,7 +13600,7 @@ rmscopy_fromperl(pTHX_ CV *cv) else { if (mysv != ST(1) || !(outp = SvPV(mysv,n_a)) || !*outp) { set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG); - ST(0) = &PL_sv_no; + ST(0) = sv_2mortal(newSViv(0)); Safefree(inspec); Safefree(outspec); XSRETURN(1); @@ -10953,7 +13608,7 @@ rmscopy_fromperl(pTHX_ CV *cv) } date_flag = (items == 3) ? SvIV(ST(2)) : 0; - ST(0) = boolSV(rmscopy(inp,outp,date_flag)); + ST(0) = sv_2mortal(newSViv(rmscopy(inp,outp,date_flag))); Safefree(inspec); Safefree(outspec); XSRETURN(1); @@ -10987,8 +13642,7 @@ mod2fname(pTHX_ CV *cv) if (counter) { strcat(work_name, "__"); } - strcat(work_name, SvPV(*av_fetch(in_array, counter, FALSE), - PL_na)); + strcat(work_name, SvPV_nolen(*av_fetch(in_array, counter, FALSE))); } /* Check to see if we actually have to bother...*/ @@ -11069,6 +13723,14 @@ Perl_vms_start_glob unsigned long hasver = 0, isunix = 0; unsigned long int lff_flags = 0; int rms_sts; + int vms_old_glob = 1; + + if (!SvOK(tmpglob)) { + SETERRNO(ENOENT,RMS$_FNF); + return NULL; + } + + vms_old_glob = !decc_filename_unix_report; #ifdef VMS_LONGNAME_SUPPORT lff_flags = LIB$M_FIL_LONG_NAMES; @@ -11114,16 +13776,50 @@ Perl_vms_start_glob break; } } + + /* In UNIX report mode, assume UNIX unless VMS directory delimiters seen */ + if ((hasdir == 0) && decc_filename_unix_report) { + isunix = 1; + } + if ((tmpfp = PerlIO_tmpfile()) != NULL) { + char * wv_spec, * wr_spec, * wd_spec, * wn_spec, * we_spec, * wvs_spec; + int wv_sts, wv_len, wr_len, wd_len, wn_len, we_len, wvs_len; + int wildstar = 0; + int wildquery = 0; + 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); - ok = (wilddsc.dsc$a_pointer != NULL); + char * vms_dir; + const char * fname; + STRLEN fname_len; + + /* Test to see if SvPVX_const(tmpglob) ends with a VMS */ + /* path delimiter of ':>]', if so, then the old behavior has */ + /* obviously been specificially requested */ + + fname = SvPVX_const(tmpglob); + fname_len = strlen(fname); + vms_dir = strpbrk(&fname[fname_len - 1], ":>]"); + if (vms_old_glob || (vms_dir != NULL)) { + 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 { + /* Operate just on the directory, the special stat/fstat for */ + /* leaves the fileified specification in the st_devnam */ + /* member. */ + wilddsc.dsc$a_pointer = st.st_devnam; + ok = 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) @@ -11131,15 +13827,37 @@ Perl_vms_start_glob /* If not extended character set, replace ? with % */ /* With extended character set, ? is a wildcard single character */ - if (!decc_efs_case_preserve) { - for (cp=wilddsc.dsc$a_pointer; ok && cp && *cp; cp++) - if (*cp == '?') *cp = '%'; + for (cp=wilddsc.dsc$a_pointer; ok && cp && *cp; cp++) { + if (*cp == '?') { + wildquery = 1; + if (!decc_efs_case_preserve) + *cp = '%'; + } else if (*cp == '%') { + wildquery = 1; + } else if (*cp == '*') { + wildstar = 1; + } } + + if (ok) { + wv_sts = vms_split_path( + wilddsc.dsc$a_pointer, &wv_spec, &wv_len, &wr_spec, &wr_len, + &wd_spec, &wd_len, &wn_spec, &wn_len, &we_spec, &we_len, + &wvs_spec, &wvs_len); + } else { + wn_spec = NULL; + wn_len = 0; + we_spec = NULL; + we_len = 0; + } + sts = SS$_NORMAL; while (ok && $VMS_STATUS_SUCCESS(sts)) { char * v_spec, * r_spec, * d_spec, * n_spec, * e_spec, * vs_spec; int v_sts, v_len, r_len, d_len, n_len, e_len, vs_len; + int valid_find; + valid_find = 0; sts = lib$find_file(&wilddsc,&rsdsc,&cxt, &dfltdsc,NULL,&rms_sts,&lff_flags); if (!$VMS_STATUS_SUCCESS(sts)) @@ -11150,7 +13868,7 @@ Perl_vms_start_glob /* Find where all the components are */ v_sts = vms_split_path - (aTHX_ rstr, + (rstr, &v_spec, &v_len, &r_spec, @@ -11168,9 +13886,28 @@ Perl_vms_start_glob if (!hasver && (vs_len > 0)) { *vs_spec = '\0'; vs_len = 0; + } + + if (isunix) { + + /* In Unix report mode, remove the ".dir;1" from the name */ + /* if it is a real directory */ + if (decc_filename_unix_report || decc_efs_charset) { + if (is_dir_ext(e_spec, e_len, vs_spec, vs_len)) { + Stat_t statbuf; + int ret_sts; + + ret_sts = flex_lstat(rstr, &statbuf); + if ((ret_sts == 0) && + S_ISDIR(statbuf.st_mode)) { + e_len = 0; + e_spec[0] = 0; + } + } + } /* No version & a null extension on UNIX handling */ - if (isunix && (e_len == 1) && decc_readdir_dropdotnotype) { + if ((e_len == 1) && decc_readdir_dropdotnotype) { e_len = 0; *e_spec = '\0'; } @@ -11180,18 +13917,55 @@ Perl_vms_start_glob for (cp = rstr; *cp; cp++) *cp = _tolower(*cp); } - if (hasdir) { - if (isunix) trim_unixpath(rstr,SvPVX(tmpglob),1); - begin = rstr; - } - else { - /* Start with the name */ - begin = n_spec; - } - strcat(begin,"\n"); - ok = (PerlIO_puts(tmpfp,begin) != EOF); + /* Find File treats a Null extension as return all extensions */ + /* This is contrary to Perl expectations */ + + if (wildstar || wildquery || vms_old_glob) { + /* really need to see if the returned file name matched */ + /* but for now will assume that it matches */ + valid_find = 1; + } else { + /* Exact Match requested */ + /* How are directories handled? - like a file */ + if ((e_len == we_len) && (n_len == wn_len)) { + int t1; + t1 = e_len; + if (t1 > 0) + t1 = strncmp(e_spec, we_spec, e_len); + if (t1 == 0) { + t1 = n_len; + if (t1 > 0) + t1 = strncmp(n_spec, we_spec, n_len); + if (t1 == 0) + valid_find = 1; + } + } + } + + if (valid_find) { + found++; + + if (hasdir) { + if (isunix) trim_unixpath(rstr,SvPVX(tmpglob),1); + begin = rstr; + } + else { + /* Start with the name */ + begin = n_spec; + } + strcat(begin,"\n"); + 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 */ + strcpy(rstr,SvPVX(tmpglob)); + strcat(rstr,"\n"); + ok = (PerlIO_puts(tmpfp,rstr) != EOF); + } + if (ok && sts != RMS$_NMF && sts != RMS$_DNF && sts != RMS_FNF) ok = 0; if (!ok) { @@ -11213,53 +13987,130 @@ 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, + int *utf8_fl); void -vms_realpath_fromperl(pTHX_ CV *cv) +unixrealpath_fromperl(pTHX_ CV *cv) { - dXSARGS; - char *fspec, *rslt_spec, *rslt; - STRLEN n_a; + dXSARGS; + char *fspec, *rslt_spec, *rslt; + STRLEN n_a; - if (!items || items != 1) - Perl_croak(aTHX_ "Usage: VMS::Filespec::vms_realpath(spec)"); + if (!items || items != 1) + Perl_croak(aTHX_ "Usage: VMS::Filespec::unixrealpath(spec)"); - fspec = SvPV(ST(0),n_a); - if (!fspec || !*fspec) XSRETURN_UNDEF; + fspec = SvPV(ST(0),n_a); + if (!fspec || !*fspec) XSRETURN_UNDEF; - Newx(rslt_spec, VMS_MAXRSS + 1, char); - rslt = do_vms_realpath(fspec, rslt_spec); - ST(0) = sv_newmortal(); - if (rslt != NULL) - sv_usepvn(ST(0),rslt,strlen(rslt)); - else - Safefree(rslt_spec); - XSRETURN(1); + Newx(rslt_spec, VMS_MAXRSS + 1, char); + rslt = do_vms_realpath(fspec, rslt_spec, NULL); + + ST(0) = sv_newmortal(); + if (rslt != NULL) + sv_usepvn(ST(0),rslt,strlen(rslt)); + else + Safefree(rslt_spec); + XSRETURN(1); } -#endif -#if __CRTL_VER >= 70301000 && !defined(__VAX) +static char * +mp_do_vms_realname(pTHX_ const char *filespec, char * rslt_spec, + int *utf8_fl); + +void +vmsrealpath_fromperl(pTHX_ CV *cv) +{ + dXSARGS; + char *fspec, *rslt_spec, *rslt; + STRLEN n_a; + + if (!items || items != 1) + Perl_croak(aTHX_ "Usage: VMS::Filespec::vmsrealpath(spec)"); + + fspec = SvPV(ST(0),n_a); + if (!fspec || !*fspec) XSRETURN_UNDEF; + + Newx(rslt_spec, VMS_MAXRSS + 1, char); + rslt = do_vms_realname(fspec, rslt_spec, NULL); + + ST(0) = sv_newmortal(); + if (rslt != NULL) + sv_usepvn(ST(0),rslt,strlen(rslt)); + else + Safefree(rslt_spec); + XSRETURN(1); +} + +#ifdef HAS_SYMLINK +/* + * A thin wrapper around decc$symlink to make sure we follow the + * standard and do not create a symlink with a zero-length name. + * + * Also in ODS-2 mode, existing tests assume that the link target + * will be converted to UNIX format. + */ +/*{{{ int my_symlink(pTHX_ const char *contents, const char *link_name)*/ +int Perl_my_symlink(pTHX_ const char *contents, const char *link_name) { + if (!link_name || !*link_name) { + SETERRNO(ENOENT, SS$_NOSUCHFILE); + return -1; + } + + if (decc_efs_charset) { + return symlink(contents, link_name); + } else { + int sts; + char * utarget; + + /* Unless we are in ODS-5 mode, convert the symlink target to UNIX */ + /* because in order to work, the symlink target must be in UNIX format */ + + /* As symbolic links can hold things other than files, we will only do */ + /* the conversion in in ODS-2 mode */ + + utarget = PerlMem_malloc(VMS_MAXRSS + 1); + if (int_tounixspec(contents, utarget, NULL) == NULL) { + + /* This should not fail, as an untranslatable filename */ + /* should be passed through */ + utarget = (char *)contents; + } + sts = symlink(utarget, link_name); + PerlMem_free(utarget); + return sts; + } + +} +/*}}}*/ + +#endif /* HAS_SYMLINK */ + int do_vms_case_tolerant(void); void -vms_case_tolerant_fromperl(pTHX_ CV *cv) +case_tolerant_process_fromperl(pTHX_ CV *cv) { dXSARGS; ST(0) = boolSV(do_vms_case_tolerant()); XSRETURN(1); } -#endif + +#ifdef USE_ITHREADS void Perl_sys_intern_dup(pTHX_ struct interp_intern *src, struct interp_intern *dst) { + PERL_ARGS_ASSERT_SYS_INTERN_DUP; + memcpy(dst,src,sizeof(struct interp_intern)); } +#endif + void Perl_sys_intern_clear(pTHX) { @@ -11273,9 +14124,7 @@ Perl_sys_intern_init(pTHX) VMSISH_HUSHED = 0; - /* fix me later to track running under GNV */ - /* this allows some limited testing */ - MY_POSIX_EXIT = decc_filename_unix_report; + MY_POSIX_EXIT = vms_posix_exit; x = (float)ix; MY_INV_RAND_MAX = 1./x; @@ -11303,20 +14152,16 @@ init_os_extras(void) newXSproto("DynaLoader::mod2fname", mod2fname, file, "$"); newXS("File::Copy::rmscopy",rmscopy_fromperl,file); newXSproto("vmsish::hushed",hushexit_fromperl,file,";$"); -#ifdef HAS_SYMLINK - newXSproto("VMS::Filespec::vms_realpath",vms_realpath_fromperl,file,"$;$"); -#endif -#if __CRTL_VER >= 70301000 && !defined(__VAX) - newXSproto("VMS::Filespec::case_tolerant",vms_case_tolerant_fromperl,file,"$;$"); -#endif + newXSproto("VMS::Filespec::unixrealpath",unixrealpath_fromperl,file,"$;$"); + newXSproto("VMS::Filespec::vmsrealpath",vmsrealpath_fromperl,file,"$;$"); + newXSproto("VMS::Filespec::case_tolerant_process", + case_tolerant_process_fromperl,file,""); store_pipelocs(aTHX); /* will redo any earlier attempts */ return; } -#ifdef HAS_SYMLINK - #if __CRTL_VER == 80200000 /* This missed getting in to the DECC SDK for 8.2 */ char *realpath(const char *file_name, char * resolved_name, ...); @@ -11327,23 +14172,393 @@ char *realpath(const char *file_name, char * resolved_name, ...); * The perl fallback routine to provide realpath() is not as efficient * on OpenVMS. */ + +/* Hack, use old stat() as fastest way of getting ino_t and device */ +int decc$stat(const char *name, void * statbuf); +#if !defined(__VAX) && __CRTL_VER >= 80200000 +int decc$lstat(const char *name, void * statbuf); +#else +#define decc$lstat decc$stat +#endif + + +/* Realpath is fragile. In 8.3 it does not work if the feature + * DECC$POSIX_COMPLIANT_PATHNAMES is not enabled, even though symbolic + * links are implemented in RMS, not the CRTL. It also can fail if the + * user does not have read/execute access to some of the directories. + * So in order for Do What I Mean mode to work, if realpath() fails, + * fall back to looking up the filename by the device name and FID. + */ + +int vms_fid_to_name(char * outname, int outlen, + const char * name, int lstat_flag, mode_t * mode) +{ +#pragma message save +#pragma message disable MISALGNDSTRCT +#pragma message disable MISALGNDMEM +#pragma member_alignment save +#pragma nomember_alignment +struct statbuf_t { + char * st_dev; + unsigned short st_ino[3]; + unsigned short old_st_mode; + unsigned long padl[30]; /* plenty of room */ +} statbuf; +#pragma message restore +#pragma member_alignment restore + + int sts; + struct dsc$descriptor_s dvidsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + struct dsc$descriptor_s specdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0}; + char *fileified; + char *temp_fspec; + char *ret_spec; + + /* Need to follow the mostly the same rules as flex_stat_int, or we may get + * unexpected answers + */ + + fileified = PerlMem_malloc(VMS_MAXRSS); + if (fileified == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + temp_fspec = PerlMem_malloc(VMS_MAXRSS); + if (temp_fspec == NULL) + _ckvmssts_noperl(SS$_INSFMEM); + + sts = -1; + /* First need to try as a directory */ + ret_spec = int_tovmspath(name, temp_fspec, NULL); + if (ret_spec != NULL) { + ret_spec = int_fileify_dirspec(temp_fspec, fileified, NULL); + if (ret_spec != NULL) { + if (lstat_flag == 0) + sts = decc$stat(fileified, &statbuf); + else + sts = decc$lstat(fileified, &statbuf); + } + } + + /* Then as a VMS file spec */ + if (sts != 0) { + ret_spec = int_tovmsspec(name, temp_fspec, 0, NULL); + if (ret_spec != NULL) { + if (lstat_flag == 0) { + sts = decc$stat(temp_fspec, &statbuf); + } else { + sts = decc$lstat(temp_fspec, &statbuf); + } + } + } + + if (sts) { + /* Next try - allow multiple dots with out EFS CHARSET */ + /* 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 __CRTL_VER >= 70300000 && !defined(__VAX) + if (!decc_efs_charset && (decc_efs_charset_index > 0)) + decc$feature_set_value(decc_efs_charset_index, 1, 1); +#endif + ret_spec = int_tovmspath(name, temp_fspec, NULL); + if (lstat_flag == 0) { + sts = decc$stat(name, &statbuf); + } else { + sts = decc$lstat(name, &statbuf); + } +#if __CRTL_VER >= 70300000 && !defined(__VAX) + if (!decc_efs_charset && (decc_efs_charset_index > 0)) + decc$feature_set_value(decc_efs_charset_index, 1, 0); +#endif + } + + + /* and then because the Perl Unix to VMS conversion is not perfect */ + /* Specifically the CRTL removes spaces and possibly other illegal ODS-2 */ + /* characters from filenames so we need to try it as-is */ + if (sts) { + if (lstat_flag == 0) { + sts = decc$stat(name, &statbuf); + } else { + sts = decc$lstat(name, &statbuf); + } + } + + if (sts == 0) { + int vms_sts; + + dvidsc.dsc$a_pointer=statbuf.st_dev; + dvidsc.dsc$w_length=strlen(statbuf.st_dev); + + specdsc.dsc$a_pointer = outname; + specdsc.dsc$w_length = outlen-1; + + vms_sts = lib$fid_to_name + (&dvidsc, statbuf.st_ino, &specdsc, &specdsc.dsc$w_length); + if ($VMS_STATUS_SUCCESS(vms_sts)) { + outname[specdsc.dsc$w_length] = 0; + + /* Return the mode */ + if (mode) { + *mode = statbuf.old_st_mode; + } + return 0; + } + } + return sts; +} + + + +static char * +mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf, + int *utf8_fl) +{ + char * rslt = NULL; + +#ifdef HAS_SYMLINK + if (decc_posix_compliant_pathnames > 0 ) { + /* realpath currently only works if posix compliant pathnames are + * enabled. It may start working when they are not, but in that + * case we still want the fallback behavior for backwards compatibility + */ + rslt = realpath(filespec, outbuf); + } +#endif + + if (rslt == NULL) { + char * vms_spec; + 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; + int file_len; + mode_t my_mode; + + /* Fall back to fid_to_name */ + + Newx(vms_spec, VMS_MAXRSS + 1, char); + + sts = vms_fid_to_name(vms_spec, VMS_MAXRSS + 1, filespec, 0, &my_mode); + if (sts == 0) { + + + /* Now need to trim the version off */ + sts = vms_split_path + (vms_spec, + &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) { + int haslower = 0; + const char *cp; + + /* Trim off the version */ + int file_len = v_len + r_len + d_len + n_len + e_len; + vms_spec[file_len] = 0; + + /* Trim off the .DIR if this is a directory */ + if (is_dir_ext(e_spec, e_len, vs_spec, vs_len)) { + if (S_ISDIR(my_mode)) { + e_len = 0; + e_spec[0] = 0; + } + } + + /* Drop NULL extensions on UNIX file specification */ + if ((e_len == 1) && decc_readdir_dropdotnotype) { + e_len = 0; + e_spec[0] = '\0'; + } + + /* The result is expected to be in UNIX format */ + rslt = int_tounixspec(vms_spec, outbuf, utf8_fl); + + /* Downcase if input had any lower case letters and + * case preservation is not in effect. + */ + if (!decc_efs_case_preserve) { + for (cp = filespec; *cp; cp++) + if (islower(*cp)) { haslower = 1; break; } + + if (haslower) __mystrtolower(rslt); + } + } + } else { + + /* Now for some hacks to deal with backwards and forward */ + /* compatibilty */ + if (!decc_efs_charset) { + + /* 1. ODS-2 mode wants to do a syntax only translation */ + rslt = int_rmsexpand(filespec, outbuf, + NULL, 0, NULL, utf8_fl); + + } else { + if (decc_filename_unix_report) { + char * dir_name; + char * vms_dir_name; + char * file_name; + + /* 2. ODS-5 / UNIX report mode should return a failure */ + /* if the parent directory also does not exist */ + /* Otherwise, get the real path for the parent */ + /* and add the child to it. + + /* basename / dirname only available for VMS 7.0+ */ + /* So we may need to implement them as common routines */ + + Newx(dir_name, VMS_MAXRSS + 1, char); + Newx(vms_dir_name, VMS_MAXRSS + 1, char); + dir_name[0] = '\0'; + file_name = NULL; + + /* First try a VMS parse */ + sts = vms_split_path + (filespec, + &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) { + /* This is VMS */ + + int dir_len = v_len + r_len + d_len + n_len; + if (dir_len > 0) { + strncpy(dir_name, filespec, dir_len); + dir_name[dir_len] = '\0'; + file_name = (char *)&filespec[dir_len + 1]; + } + } else { + /* This must be UNIX */ + char * tchar; + + tchar = strrchr(filespec, '/'); + + if (tchar != NULL) { + int dir_len = tchar - filespec; + strncpy(dir_name, filespec, dir_len); + dir_name[dir_len] = '\0'; + file_name = (char *) &filespec[dir_len + 1]; + } + } + + /* Dir name is defaulted */ + if (dir_name[0] == 0) { + dir_name[0] = '.'; + dir_name[1] = '\0'; + } + + /* Need realpath for the directory */ + sts = vms_fid_to_name(vms_dir_name, + VMS_MAXRSS + 1, + dir_name, 0, NULL); + + if (sts == 0) { + /* Now need to pathify it. + char *tdir = int_pathify_dirspec(vms_dir_name, + outbuf); + + /* And now add the original filespec to it */ + if (file_name != NULL) { + strcat(outbuf, file_name); + } + return outbuf; + } + Safefree(vms_dir_name); + Safefree(dir_name); + } + } + } + Safefree(vms_spec); + } + return rslt; +} + static char * -mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf) +mp_do_vms_realname(pTHX_ const char *filespec, char *outbuf, + int *utf8_fl) { - return realpath(filespec, outbuf); + 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; + int file_len; + + /* Fall back to fid_to_name */ + + sts = vms_fid_to_name(outbuf, VMS_MAXRSS + 1, filespec, 0, NULL); + if (sts != 0) { + return NULL; + } + else { + + + /* Now need to trim the version off */ + sts = vms_split_path + (outbuf, + &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) { + int haslower = 0; + const char *cp; + + /* Trim off the version */ + int file_len = v_len + r_len + d_len + n_len + e_len; + outbuf[file_len] = 0; + + /* Downcase if input had any lower case letters and + * case preservation is not in effect. + */ + if (!decc_efs_case_preserve) { + for (cp = filespec; *cp; cp++) + if (islower(*cp)) { haslower = 1; break; } + + if (haslower) __mystrtolower(outbuf); + } + } + } + return outbuf; } + /*}}}*/ /* External entry points */ -char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) -{ return do_vms_realpath(filespec, outbuf); } -#else -char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf) -{ return NULL; } -#endif +char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl) +{ return do_vms_realpath(filespec, outbuf, utf8_fl); } +char *Perl_vms_realname(pTHX_ const char *filespec, char *outbuf, int *utf8_fl) +{ return do_vms_realname(filespec, outbuf, utf8_fl); } -#if __CRTL_VER >= 70301000 && !defined(__VAX) /* case_tolerant */ /*{{{int do_vms_case_tolerant(void)*/ @@ -11356,6 +14571,7 @@ int do_vms_case_tolerant(void) } /*}}}*/ /* External entry points */ +#if __CRTL_VER >= 70301000 && !defined(__VAX) int Perl_vms_case_tolerant(void) { return do_vms_case_tolerant(); } #else @@ -11434,7 +14650,6 @@ static int sys_crelnm return ret_val; } - /* C RTL Feature settings */ static int set_features @@ -11444,7 +14659,6 @@ static int set_features { int status; int s; - int dflt; char* str; char val_str[10]; #if defined(JPI$_CASE_LOOKUP_PERM) && !defined(__VAX) @@ -11458,49 +14672,103 @@ static int set_features vms_debug_on_exception = 0; status = sys_trnlnm("PERL_VMS_EXCEPTION_DEBUG", val_str, sizeof(val_str)); if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) vms_debug_on_exception = 1; else vms_debug_on_exception = 0; } + /* Debug unix/vms file translation routines */ + vms_debug_fileify = 0; + status = sys_trnlnm("PERL_VMS_FILEIFY_DEBUG", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_debug_fileify = 1; + else + vms_debug_fileify = 0; + } + + + /* Historically PERL has been doing vmsify / stat differently than */ + /* the CRTL. In particular, under some conditions the CRTL will */ + /* remove some illegal characters like spaces from filenames */ + /* resulting in some differences. The stat()/lstat() wrapper has */ + /* been reporting such file names as invalid and fails to stat them */ + /* fixing this bug so that stat()/lstat() accept these like the */ + /* CRTL does will result in several tests failing. */ + /* This should really be fixed, but for now, set up a feature to */ + /* enable it so that the impact can be studied. */ + vms_bug_stat_filename = 0; + status = sys_trnlnm("PERL_VMS_BUG_STAT_FILENAME", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_bug_stat_filename = 1; + else + vms_bug_stat_filename = 0; + } + - /* hacks to see if known bugs are still present for testing */ + /* 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)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_vtf7_filenames = 1; + else + vms_vtf7_filenames = 0; + } - /* Readdir is returning filenames in VMS syntax always */ - decc_bug_readdir_efs1 = 1; - status = sys_trnlnm("DECC_BUG_READDIR_EFS1", val_str, sizeof(val_str)); + /* unlink all versions on unlink() or rename() */ + vms_unlink_all_versions = 0; + status = sys_trnlnm + ("PERL_VMS_UNLINK_ALL_VERSIONS", val_str, sizeof(val_str)); if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) - decc_bug_readdir_efs1 = 1; + vms_unlink_all_versions = 1; else - decc_bug_readdir_efs1 = 0; + 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)) { + 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; + vms_posix_exit = 1; } +#endif + + /* hacks to see if known bugs are still present for testing */ /* PCP mode requires creating /dev/null special device file */ decc_bug_devnull = 0; status = sys_trnlnm("DECC_BUG_DEVNULL", val_str, sizeof(val_str)); if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) decc_bug_devnull = 1; else decc_bug_devnull = 0; } - /* fgetname returning a VMS name in UNIX mode */ - decc_bug_fgetname = 1; - status = sys_trnlnm("DECC_BUG_FGETNAME", val_str, sizeof(val_str)); - if ($VMS_STATUS_SUCCESS(status)) { - if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) - decc_bug_fgetname = 1; - else - decc_bug_fgetname = 0; - } - /* UNIX directory names with no paths are broken in a lot of places */ decc_dir_barename = 1; status = sys_trnlnm("DECC_DIR_BARENAME", val_str, sizeof(val_str)); if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) decc_dir_barename = 1; else @@ -11523,6 +14791,7 @@ static int set_features } s = decc$feature_get_index("DECC$EFS_CHARSET"); + decc_efs_charset_index = s; if (s >= 0) { decc_efs_charset = decc$feature_get_value(s, 1); if (decc_efs_charset < 0) @@ -11532,8 +14801,10 @@ static int set_features s = decc$feature_get_index("DECC$FILENAME_UNIX_REPORT"); if (s >= 0) { decc_filename_unix_report = decc$feature_get_value(s, 1); - if (decc_filename_unix_report > 0) + if (decc_filename_unix_report > 0) { decc_filename_unix_report = 1; + vms_posix_exit = 1; + } else decc_filename_unix_report = 0; } @@ -11563,26 +14834,6 @@ static int set_features decc_readdir_dropdotnotype = 0; } - status = sys_trnlnm("SYS$POSIX_ROOT", val_str, sizeof(val_str)); - if ($VMS_STATUS_SUCCESS(status)) { - s = decc$feature_get_index("DECC$DISABLE_POSIX_ROOT"); - if (s >= 0) { - dflt = decc$feature_get_value(s, 4); - if (dflt > 0) { - decc_disable_posix_root = decc$feature_get_value(s, 1); - if (decc_disable_posix_root <= 0) { - decc$feature_set_value(s, 1, 1); - decc_disable_posix_root = 1; - } - } - else { - /* Traditionally Perl assumes this is off */ - decc_disable_posix_root = 1; - decc$feature_set_value(s, 1, 1); - } - } - } - #if __CRTL_VER >= 80200000 s = decc$feature_get_index("DECC$POSIX_COMPLIANT_PATHNAMES"); if (s >= 0) { @@ -11645,7 +14896,7 @@ static int set_features } #endif -#if defined(JPI$_CASE_LOOKUP_PERM) && !defined(__VAX) +#if defined(JPI$_CASE_LOOKUP_PERM) && defined(PPROP$K_CASE_BLIND) && !defined(__VAX) /* Report true case tolerance */ /*----------------------------*/ @@ -11661,6 +14912,18 @@ static int set_features #endif + /* USE POSIX/DCL Exit codes - Recommended, but needs to default to */ + /* for strict backward compatibilty */ + status = sys_trnlnm + ("PERL_VMS_POSIX_EXIT", val_str, sizeof(val_str)); + if ($VMS_STATUS_SUCCESS(status)) { + val_str[0] = _toupper(val_str[0]); + if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) + vms_posix_exit = 1; + else + vms_posix_exit = 0; + } + /* CRTL can be initialized past this point, but not before. */ /* DECC$CRTL_INIT(); */ @@ -11669,25 +14932,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; /*