#include <uicdef.h>
#include <stsdef.h>
#include <rmsdef.h>
-
-/* Set the maximum filespec size here as it is larger for EFS file
- * specifications.
- * Not fully implemented at this time because the larger size
- * will likely impact the stack local storage requirements of
- * threaded code, and probably cause hard to diagnose failures.
- * To implement the larger sizes, all places where filename
- * storage is put on the stack need to be changed to use
- * New()/SafeFree() instead.
- */
-#ifndef __VAX
-#ifndef VMS_MAXRSS
-#ifdef NAML$C_MAXRSS
-#define VMS_MAXRSS NAML$C_MAXRSS+1
-#ifndef VMS_LONGNAME_SUPPORT
-#define VMS_LONGNAME_SUPPORT 1
-#endif /* VMS_LONGNAME_SUPPORT */
-#endif /* NAM$L_C_MAXRSS */
-#endif /* VMS_MAXRSS */
-#endif
-
-/* temporary hack until support is complete */
-#ifdef VMS_LONGNAME_SUPPORT
-#undef VMS_LONGNAME_SUPPORT
-#undef VMS_MAXRSS
-#endif
-/* end of temporary hack until support is complete */
-
-#ifndef VMS_MAXRSS
-#define VMS_MAXRSS NAM$C_MAXRSS
+#if __CRTL_VER >= 70000000 /* FIXME to earliest version */
+#include <efndef.h>
+#define NO_EFN EFN$C_ENF
+#else
+#define NO_EFN 0;
#endif
#if __CRTL_VER < 70301000 && __CRTL_VER >= 70300000
#include <unixlib.h>
#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
+#endif
+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);
+
#if __CRTL_VER >= 70300000 && !defined(__VAX)
static int set_feature_default(const char *name, int value)
# define WARN_INTERNAL WARN_MISC
#endif
+#ifdef VMS_LONGNAME_SUPPORT
+#include <libfildef.h>
+#endif
+
#if defined(__VMS_VER) && __VMS_VER >= 70000000 && __DECC_VER >= 50200000
# define RTL_USES_UTC 1
#endif
void *bufadr;
unsigned short int *retlen;
};
+
+struct filescan_itmlst_2 {
+ unsigned short length;
+ unsigned short itmcode;
+ char * component;
+};
+
+struct vs_str_st {
+ unsigned short length;
+ char str[65536];
+};
+
#ifdef __DECC
#pragma message restore
#pragma member_alignment restore
#endif
-#define do_fileify_dirspec(a,b,c) mp_do_fileify_dirspec(aTHX_ a,b,c)
-#define do_pathify_dirspec(a,b,c) mp_do_pathify_dirspec(aTHX_ a,b,c)
-#define do_tovmsspec(a,b,c) mp_do_tovmsspec(aTHX_ a,b,c)
-#define do_tovmspath(a,b,c) mp_do_tovmspath(aTHX_ a,b,c)
-#define do_rmsexpand(a,b,c,d,e) mp_do_rmsexpand(aTHX_ a,b,c,d,e)
-#define do_vms_realpath(a,b) mp_do_vms_realpath(aTHX_ a,b)
-#define do_tounixspec(a,b,c) mp_do_tounixspec(aTHX_ a,b,c)
-#define do_tounixpath(a,b,c) mp_do_tounixpath(aTHX_ a,b,c)
+#define do_fileify_dirspec(a,b,c,d) mp_do_fileify_dirspec(aTHX_ a,b,c,d)
+#define do_pathify_dirspec(a,b,c,d) mp_do_pathify_dirspec(aTHX_ a,b,c,d)
+#define do_tovmsspec(a,b,c,d) mp_do_tovmsspec(aTHX_ a,b,c,0,d)
+#define do_tovmspath(a,b,c,d) mp_do_tovmspath(aTHX_ a,b,c,d)
+#define do_rmsexpand(a,b,c,d,e,f,g) mp_do_rmsexpand(aTHX_ a,b,c,d,e,f,g)
+#define do_vms_realpath(a,b,c) mp_do_vms_realpath(aTHX_ a,b,c)
+#define do_tounixspec(a,b,c,d) mp_do_tounixspec(aTHX_ a,b,c,d)
+#define do_tounixpath(a,b,c,d) mp_do_tounixpath(aTHX_ a,b,c,d)
#define do_vms_case_tolerant(a) mp_do_vms_case_tolerant(a)
#define expand_wild_cards(a,b,c,d) mp_expand_wild_cards(aTHX_ a,b,c,d)
#define getredirection(a,b) mp_getredirection(aTHX_ a,b)
-static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts);
-static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts);
-static char *mp_do_tounixspec(pTHX_ const char *, char *, int);
-static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts);
+static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts, int *);
+static char *mp_do_tounixpath(pTHX_ const char *path, char *buf, int ts, int *);
+static char *mp_do_tounixspec(pTHX_ const char *, char *, int, int *);
+static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts, int *);
/* see system service docs for $TRNLNM -- NOT the same as LNM$_MAX_INDEX */
#define PERL_LNM_MAX_ALLOWED_INDEX 127
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;
/* bug workarounds if needed */
int decc_bug_readdir_efs1 = 0;
-int decc_bug_devnull = 0;
+int decc_bug_devnull = 1;
int decc_bug_fgetname = 0;
int decc_dir_barename = 0;
+static int vms_debug_on_exception = 0;
+
/* Is this a UNIX file specification?
* No longer a simple check with EFS file specs
* For now, not a full check, but need to
* changes to many other conversion routines.
*/
-static is_unix_filespec(const char *path)
+static int is_unix_filespec(const char *path)
{
int ret_val;
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 '=':
+ /* 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.
+ *
+ * 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_vms_filename_escape
+ (char *outspec, const char *inspec, int *output_cnt)
+{
+int count;
+int scnt;
+
+ count = 0;
+ *output_cnt = 0;
+ if (*inspec == '^') {
+ inspec++;
+ switch (*inspec) {
+ case '.':
+ /* Non trailing dots should just be passed through */
+ *outspec = *inspec;
+ count++;
+ (*output_cnt)++;
+ break;
+ case '_': /* space */
+ *outspec = ' ';
+ inspec++;
+ count++;
+ (*output_cnt)++;
+ break;
+ case 'U': /* Unicode - FIX-ME this is wrong. */
+ inspec++;
+ count++;
+ scnt = strspn(inspec, "0123456789ABCDEFabcdef");
+ if (scnt == 4) {
+ unsigned int c1, c2;
+ scnt = sscanf(inspec, "%2x%2x", &c1, &c2);
+ outspec[0] == c1 & 0xff;
+ outspec[1] == c2 & 0xff;
+ if (scnt > 1) {
+ (*output_cnt) += 2;
+ count += 4;
+ }
+ }
+ else {
+ /* Error - do best we can to continue */
+ *outspec = 'U';
+ outspec++;
+ (*output_cnt++);
+ *outspec = *inspec;
+ count++;
+ (*output_cnt++);
+ }
+ break;
+ default:
+ scnt = strspn(inspec, "0123456789ABCDEFabcdef");
+ if (scnt == 2) {
+ /* Hex encoded */
+ unsigned int c1;
+ scnt = sscanf(inspec, "%2x", &c1);
+ outspec[0] = c1 & 0xff;
+ if (scnt > 0) {
+ (*output_cnt++);
+ count += 2;
+ }
+ }
+ else {
+ *outspec = *inspec;
+ count++;
+ (*output_cnt++);
+ }
+ }
+ }
+ else {
+ *outspec = *inspec;
+ count++;
+ (*output_cnt)++;
+ }
+ return count;
+}
+
+
+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);
+
+/* vms_split_path - Verify that the input file specification is a
+ * VMS format file specification, and provide pointers to the components of
+ * it. With EFS format filenames, this is virtually the only way to
+ * parse a VMS path specification into components.
+ *
+ * If the sum of the components do not add up to the length of the
+ * string, then the passed file specification is probably a UNIX style
+ * path.
+ */
+static int vms_split_path
+ (const char * path,
+ char * * volume,
+ int * vol_len,
+ char * * root,
+ int * root_len,
+ char * * dir,
+ int * dir_len,
+ char * * name,
+ int * name_len,
+ char * * ext,
+ int * ext_len,
+ char * * version,
+ int * ver_len)
+{
+struct dsc$descriptor path_desc;
+int status;
+unsigned long flags;
+int ret_stat;
+struct filescan_itmlst_2 item_list[9];
+const int filespec = 0;
+const int nodespec = 1;
+const int devspec = 2;
+const int rootspec = 3;
+const int dirspec = 4;
+const int namespec = 5;
+const int typespec = 6;
+const int verspec = 7;
+
+ /* Assume the worst for an easy exit */
+ ret_stat = -1;
+ *volume = NULL;
+ *vol_len = 0;
+ *root = NULL;
+ *root_len = 0;
+ *dir = NULL;
+ *dir_len;
+ *name = NULL;
+ *name_len = 0;
+ *ext = NULL;
+ *ext_len = 0;
+ *version = NULL;
+ *ver_len = 0;
+
+ path_desc.dsc$a_pointer = (char *)path; /* cast ok */
+ path_desc.dsc$w_length = strlen(path);
+ path_desc.dsc$b_dtype = DSC$K_DTYPE_T;
+ path_desc.dsc$b_class = DSC$K_CLASS_S;
+
+ /* Get the total length, if it is shorter than the string passed
+ * then this was probably not a VMS formatted file specification
+ */
+ item_list[filespec].itmcode = FSCN$_FILESPEC;
+ item_list[filespec].length = 0;
+ item_list[filespec].component = NULL;
+
+ /* If the node is present, then it gets considered as part of the
+ * volume name to hopefully make things simple.
+ */
+ item_list[nodespec].itmcode = FSCN$_NODE;
+ item_list[nodespec].length = 0;
+ item_list[nodespec].component = NULL;
+
+ item_list[devspec].itmcode = FSCN$_DEVICE;
+ item_list[devspec].length = 0;
+ item_list[devspec].component = NULL;
+
+ /* root is a special case, adding it to either the directory or
+ * the device components will probalby complicate things for the
+ * callers of this routine, so leave it separate.
+ */
+ item_list[rootspec].itmcode = FSCN$_ROOT;
+ item_list[rootspec].length = 0;
+ item_list[rootspec].component = NULL;
+
+ item_list[dirspec].itmcode = FSCN$_DIRECTORY;
+ item_list[dirspec].length = 0;
+ item_list[dirspec].component = NULL;
+
+ item_list[namespec].itmcode = FSCN$_NAME;
+ item_list[namespec].length = 0;
+ item_list[namespec].component = NULL;
+
+ item_list[typespec].itmcode = FSCN$_TYPE;
+ item_list[typespec].length = 0;
+ item_list[typespec].component = NULL;
+
+ item_list[verspec].itmcode = FSCN$_VERSION;
+ item_list[verspec].length = 0;
+ item_list[verspec].component = NULL;
+
+ item_list[8].itmcode = 0;
+ item_list[8].length = 0;
+ item_list[8].component = NULL;
+
+ status = SYS$FILESCAN
+ ((const struct dsc$descriptor_s *)&path_desc, item_list,
+ &flags, NULL, NULL);
+ _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)
+ return ret_stat;
+
+ /* If we got here, then it is a VMS file specification */
+ ret_stat = 0;
+
+ /* set the volume name */
+ if (item_list[nodespec].length > 0) {
+ *volume = item_list[nodespec].component;
+ *vol_len = item_list[nodespec].length + item_list[devspec].length;
+ }
+ else {
+ *volume = item_list[devspec].component;
+ *vol_len = item_list[devspec].length;
+ }
+
+ *root = item_list[rootspec].component;
+ *root_len = item_list[rootspec].length;
+
+ *dir = item_list[dirspec].component;
+ *dir_len = item_list[dirspec].length;
+
+ /* Now fun with versions and EFS file specifications
+ * The parser can not tell the difference when a "." is a version
+ * delimiter or a part of the file specification.
+ */
+ if ((decc_efs_charset) &&
+ (item_list[verspec].length > 0) &&
+ (item_list[verspec].component[0] == '.')) {
+ *name = item_list[namespec].component;
+ *name_len = item_list[namespec].length + item_list[typespec].length;
+ *ext = item_list[verspec].component;
+ *ext_len = item_list[verspec].length;
+ *version = NULL;
+ *ver_len = 0;
+ }
+ else {
+ *name = item_list[namespec].component;
+ *name_len = item_list[namespec].length;
+ *ext = item_list[typespec].component;
+ *ext_len = item_list[typespec].length;
+ *version = item_list[verspec].component;
+ *ver_len = item_list[verspec].length;
+ }
+ return ret_stat;
+}
+
/* my_maxidx
* Routine to retrieve the maximum equivalence index for an input
(uplnm[4] == 'I' && !strcmp(uplnm,"SYS$INPUT")) ||
(uplnm[4] == 'E' && !strcmp(uplnm,"SYS$ERROR")) ||
(uplnm[4] == 'C' && !strcmp(uplnm,"SYS$COMMAND")) ) ) {
- memcpy(eqv,eqv+4,eqvlen-4);
+ memmove(eqv,eqv+4,eqvlen-4);
eqvlen -= 4;
}
cp2 += eqvlen;
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;
*/
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 {
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);
/*}}}*/
-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
/* 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. */
- Newx(vmsname, NAM$C_MAXRSS+1, char);
- if (do_tovmsspec(name,vmsname,0) == NULL) {
- Safefree(vmsname);
+ 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, NULL) == NULL) {
+ PerlMem_free(vmsname);
return -1;
}
remove_name = (char *)name;
}
else {
- Newx(rspec, NAM$C_MAXRSS+1, char);
- if (do_rmsexpand(vmsname, rspec, 1, NULL, PERL_RMSEXPAND_M_VMS) == NULL) {
- Safefree(rspec);
- Safefree(vmsname);
+ 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, NULL) == NULL) {
+ PerlMem_free(rspec);
+ PerlMem_free(vmsname);
return -1;
}
- Safefree(vmsname);
+ PerlMem_free(vmsname);
remove_name = rspec;
}
#if defined(__CRTL_VER) && __CRTL_VER >= 70000000
if (dirflag != 0) {
if (decc_dir_barename && decc_posix_compliant_pathnames) {
- Newx(remove_name, NAM$C_MAXRSS+1, char);
- do_pathify_dirspec(name, remove_name, 0);
+ remove_name = PerlMem_malloc(NAM$C_MAXRSS+1);
+ if (remove_name == NULL) _ckvmssts(SS$_INSFMEM);
+
+ do_pathify_dirspec(name, remove_name, 0, NULL);
if (!rmdir(remove_name)) {
- Safefree(remove_name);
- Safefree(rspec);
+ PerlMem_free(remove_name);
+ PerlMem_free(rspec);
return 0; /* Can we just get rid of it? */
}
}
else {
if (!rmdir(remove_name)) {
- Safefree(rspec);
+ PerlMem_free(rspec);
return 0; /* Can we just get rid of it? */
}
}
else
#endif
if (!remove(remove_name)) {
- Safefree(rspec);
+ PerlMem_free(rspec);
return 0; /* Can we just get rid of it? */
}
/* If not, can changing protections help? */
if (vaxc$errno != RMS$_PRV) {
- Safefree(rspec);
+ PerlMem_free(rspec);
return -1;
}
_ckvmssts(aclsts);
}
set_vaxc_errno(aclsts);
- Safefree(rspec);
+ PerlMem_free(rspec);
return -1;
}
/* Grab any existing ACEs with this identifier in case we fail */
#if defined(__CRTL_VER) && __CRTL_VER >= 70000000
if (dirflag != 0)
if (decc_dir_barename && decc_posix_compliant_pathnames) {
- Newx(remove_name, NAM$C_MAXRSS+1, char);
- do_pathify_dirspec(name, remove_name, 0);
+ remove_name = PerlMem_malloc(NAM$C_MAXRSS+1);
+ if (remove_name == NULL) _ckvmssts(SS$_INSFMEM);
+
+ do_pathify_dirspec(name, remove_name, 0, NULL);
rmsts = rmdir(remove_name);
- Safefree(remove_name);
+ PerlMem_free(remove_name);
}
else {
rmsts = rmdir(remove_name);
if (!(aclsts & 1)) {
set_errno(EVMSERR);
set_vaxc_errno(aclsts);
- Safefree(rspec);
+ PerlMem_free(rspec);
return -1;
}
- Safefree(rspec);
+ PerlMem_free(rspec);
return rmsts;
} /* end of kill_file() */
int retval;
Stat_t st;
- if (do_fileify_dirspec(name,dirfile,0) == NULL) return -1;
+ if (do_fileify_dirspec(name,dirfile,0,NULL) == NULL) return -1;
if (flex_stat(dirfile,&st) || !S_ISDIR(st.st_mode)) retval = -1;
else retval = mp_do_kill_file(aTHX_ dirfile, 1);
return retval;
int
Perl_kill_file(pTHX_ const char *name)
{
- char vmsname[NAM$C_MAXRSS+1], rspec[NAM$C_MAXRSS+1];
+ 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};
/* Expand the input spec using RMS, since the CRTL remove() and
* system services won't do this by themselves, so we may miss
* a file "hiding" behind a logical name or search list. */
- if (do_tovmsspec(name,vmsname,0) == NULL) return -1;
- if (do_rmsexpand(vmsname,rspec,1,NULL,0) == NULL) return -1;
+ tspec = do_rmsexpand(name, rspec, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL);
+ 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;
* - Preview- '/' will be valid soon on VMS
*/
if ((dirlen > 1) && (dir1[dirlen-1] == '/')) {
- char *newdir = savepvn(dir,dirlen-1);
+ char *newdir = savepvn(dir1,dirlen-1);
int ret = chdir(newdir);
Safefree(newdir);
return ret;
}
- else return chdir(dir);
+ else return chdir(dir1);
} /* end of my_chdir */
/*}}}*/
if ((fp = tmpfile())) return fp;
- Newx(cp,L_tmpnam+24,char);
+ cp = PerlMem_malloc(L_tmpnam+24);
+ if (cp == NULL) _ckvmssts_noperl(SS$_INSFMEM);
+
if (decc_filename_unix_only == 0)
strcpy(cp,"Sys$Scratch:");
else
tmpnam(cp+strlen(cp));
strcat(cp,".Perltmp");
fp = fopen(cp,"w+","fop=dlt");
- Safefree(cp);
+ PerlMem_free(cp);
return fp;
}
/*}}}*/
than signalling with an unrecognized (and unhandled by CRTL) code.
*/
-#define _MY_SIG_MAX 17
+#define _MY_SIG_MAX 28
-unsigned int
-Perl_sig_to_vmscondition(int sig)
+static unsigned int
+Perl_sig_to_vmscondition_int(int sig)
{
static unsigned int sig_code[_MY_SIG_MAX+1] =
{
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
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
return sig_code[sig];
}
+unsigned int
+Perl_sig_to_vmscondition(int sig)
+{
+#ifdef SS$_DEBUG
+ if (vms_debug_on_exception != 0)
+ lib$signal(SS$_DEBUG);
+#endif
+ return Perl_sig_to_vmscondition_int(sig);
+}
+
+
int
Perl_my_kill(int pid, int sig)
{
return -1;
}
- code = Perl_sig_to_vmscondition(sig);
+ code = Perl_sig_to_vmscondition_int(sig);
if (!code) {
SETERRNO(EINVAL, SS$_BADPARAM);
while (info) {
int need_eof;
- _ckvmssts(sys$setast(0));
+ _ckvmssts_noperl(sys$setast(0));
if (info->in && !info->in->shut_on_empty) {
- _ckvmssts(sys$qio(0,info->in->chan_in,IO$_WRITEOF,0,0,0,
+ _ckvmssts_noperl(sys$qio(0,info->in->chan_in,IO$_WRITEOF,0,0,0,
0, 0, 0, 0, 0, 0));
info->waiting = 1;
did_stuff = 1;
}
- _ckvmssts(sys$setast(1));
+ _ckvmssts_noperl(sys$setast(1));
info = info->next;
}
info = open_pipes;
while (info) {
- _ckvmssts(sys$setast(0));
+ _ckvmssts_noperl(sys$setast(0));
if (info->waiting && info->done)
info->waiting = 0;
nwait += info->waiting;
- _ckvmssts(sys$setast(1));
+ _ckvmssts_noperl(sys$setast(1));
info = info->next;
}
if (!nwait) break;
did_stuff = 0;
info = open_pipes;
while (info) {
- _ckvmssts(sys$setast(0));
+ _ckvmssts_noperl(sys$setast(0));
if (!info->done) { /* Tap them gently on the shoulder . . .*/
sts = sys$forcex(&info->pid,0,&abort);
- if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts(sts);
+ if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts_noperl(sts);
did_stuff = 1;
}
- _ckvmssts(sys$setast(1));
+ _ckvmssts_noperl(sys$setast(1));
info = info->next;
}
info = open_pipes;
while (info) {
- _ckvmssts(sys$setast(0));
+ _ckvmssts_noperl(sys$setast(0));
if (info->waiting && info->done)
info->waiting = 0;
nwait += info->waiting;
- _ckvmssts(sys$setast(1));
+ _ckvmssts_noperl(sys$setast(1));
info = info->next;
}
if (!nwait) break;
info = open_pipes;
while (info) {
- _ckvmssts(sys$setast(0));
+ _ckvmssts_noperl(sys$setast(0));
if (!info->done) { /* We tried to be nice . . . */
sts = sys$delprc(&info->pid,0);
- if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts(sts);
+ if (!(sts&1) && sts != SS$_NONEXPR) _ckvmssts_noperl(sts);
}
- _ckvmssts(sys$setast(1));
+ _ckvmssts_noperl(sys$setast(1));
info = info->next;
}
*/
ifi = 0;
if (result[0] == 0x1b && result[1] == 0x00) {
- memcpy(&ifi,result+2,2);
+ memmove(&ifi,result+2,2);
strcpy(result,result+4);
}
return ifi; /* this is the RMS internal file id */
unsigned int dviitm = DVI$_DEVBUFSIZ;
int j, n;
- Newx(p, 1, Pipe);
+ 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);
DSC$K_CLASS_S, mbx2};
unsigned int dviitm = DVI$_DEVBUFSIZ;
- Newx(p, 1, Pipe);
+ 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(lib$getdvi(&dviitm, &p->chan_in, 0, &p->bufsize));
- Newx(p->buf, p->bufsize, char);
+ n = p->bufsize * sizeof(char);
+ _ckvmssts(lib$get_vm(&n, &p->buf));
p->shut_on_empty = FALSE;
p->info = 0;
p->type = 0;
struct stat s;
struct dsc$descriptor_s d_mbx = {sizeof mbx, DSC$K_DTYPE_T,
DSC$K_CLASS_S, mbx};
+ int n = sizeof(Pipe);
/* 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(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(status);
+ if ($VMS_STATUS_SUCCESS(dvi_iosb[0])) {
+ device[dev_len] = 0;
+
+ if (!(devchar & DEV$M_DIR)) {
+ strcpy(out, device);
+ return 0;
+ }
+ }
}
- Newx(p, 1, Pipe);
+ _ckvmssts(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));
- Newx(p->buf, p->bufsize+1, char);
+ n = (p->bufsize+1) * sizeof(char);
+ _ckvmssts(lib$get_vm(&n, &p->buf));
p->shut_on_empty = FALSE;
p->retry = 0;
p->info = 0;
p = *pHead;
while (p) {
pnext = p->next;
- Safefree(p);
+ PerlMem_free(p);
p = pnext;
}
*pHead = 0;
/* the . directory from @INC comes last */
- Newx(p,1,PLOC);
+ p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
+ if (p == NULL) _ckvmssts(SS$_INSFMEM);
p->next = head_PLOC;
head_PLOC = p;
strcpy(p->dir,"./");
/* get the directory from $^X */
+ unixdir = PerlMem_malloc(VMS_MAXRSS);
+ if (unixdir == NULL) _ckvmssts(SS$_INSFMEM);
+
#ifdef PERL_IMPLICIT_CONTEXT
if (aTHX && PL_origargv && PL_origargv[0]) { /* maybe nul if embedded Perl */
#else
temp[1] = '\0';
}
- if ((unixdir = tounixpath(temp, Nullch)) != Nullch) {
- Newx(p,1,PLOC);
+ if ((tounixpath_utf8(temp, unixdir, NULL)) != Nullch) {
+ p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
+ if (p == NULL) _ckvmssts(SS$_INSFMEM);
p->next = head_PLOC;
head_PLOC = p;
strncpy(p->dir,unixdir,sizeof(p->dir)-1);
p->dir[NAM$C_MAXRSS] = '\0';
- }
+ }
}
/* reverse order of @INC entries, skip "." since entered above */
if (SvROK(dirsv)) continue;
dir = SvPVx(dirsv,n_a);
if (strcmp(dir,".") == 0) continue;
- if ((unixdir = tounixpath(dir, Nullch)) == Nullch)
+ if ((tounixpath_utf8(dir, unixdir, NULL)) == Nullch)
continue;
- Newx(p,1,PLOC);
+ p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
p->next = head_PLOC;
head_PLOC = p;
strncpy(p->dir,unixdir,sizeof(p->dir)-1);
/* most likely spot (ARCHLIB) put first in the list */
#ifdef ARCHLIB_EXP
- if ((unixdir = tounixpath(ARCHLIB_EXP, Nullch)) != Nullch) {
- Newx(p,1,PLOC);
+ if ((tounixpath_utf8(ARCHLIB_EXP, unixdir, NULL)) != Nullch) {
+ p = (pPLOC) PerlMem_malloc(sizeof(PLOC));
+ if (p == NULL) _ckvmssts(SS$_INSFMEM);
p->next = head_PLOC;
head_PLOC = p;
strncpy(p->dir,unixdir,sizeof(p->dir)-1);
p->dir[NAM$C_MAXRSS] = '\0';
}
#endif
+ 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)
/* 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;
pPLOC p = head_PLOC;
while (p) {
+ char * exp_res;
+ int dirlen;
strcpy(file, p->dir);
- strncat(file, "vmspipe.com",NAM$C_MAXRSS);
+ dirlen = strlen(file);
+ strncat(file, "vmspipe.com",NAM$C_MAXRSS - dirlen);
file[NAM$C_MAXRSS] = '\0';
p = p->next;
- if (!do_tovmsspec(file,vmspipe_file,0)) continue;
+ exp_res = do_rmsexpand
+ (file, vmspipe_file, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL);
+ 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;
}
fclose(fp);
if (decc_filename_unix_only)
- do_tounixspec(file, file, 0);
+ do_tounixspec(file, file, 0, NULL);
fp = fopen(file,"r","shr=get");
if (!fp) return 0;
fstat(fileno(fp), (struct stat *)&s1);
- #if defined(_USE_STD_STAT)
- cmp_result = s0.crtl_stat.st_ino != s1.crtl_stat.st_ino;
- #else
- cmp_result = memcmp(s0.crtl_stat.st_ino, s1.crtl_stat.st_ino, 6);
- #endif
+ 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)) {
fclose(fp);
return 0;
* environment. Hence we've switched to LOCAL symbol table.
*/
unsigned int table = LIB$K_CLI_LOCAL_SYM;
- int j, wait = 0;
+ 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;
+ pInfo info = NULL;
char cmd_sym_name[20];
struct dsc$descriptor_s d_symbol= {0, DSC$K_DTYPE_T,
DSC$K_CLASS_S, symbol};
*psts = sts;
return Nullfp;
}
- Newx(info,1,Info);
+ n = sizeof(Info);
+ _ckvmssts(lib$get_vm(&n, &info));
strcpy(mode,in_mode);
info->mode = *mode;
info->in_done = TRUE;
info->out_done = TRUE;
info->err_done = TRUE;
+
+ in = PerlMem_malloc(VMS_MAXRSS);
+ if (in == NULL) _ckvmssts(SS$_INSFMEM);
+ out = PerlMem_malloc(VMS_MAXRSS);
+ if (out == NULL) _ckvmssts(SS$_INSFMEM);
+ err = PerlMem_malloc(VMS_MAXRSS);
+ if (err == NULL) _ckvmssts(SS$_INSFMEM);
+
in[0] = out[0] = err[0] = '\0';
if ((p = strchr(mode,'F')) != NULL) { /* F -> use FILE* */
if (!done) _ckvmssts(sys$waitfr(pipe_ef));
}
- if (info->out->buf) Safefree(info->out->buf);
- Safefree(info->out);
- Safefree(info);
+ if (info->out->buf) {
+ n = info->out->bufsize * sizeof(char);
+ _ckvmssts(lib$free_vm(&n, &info->out->buf));
+ }
+ n = sizeof(Pipe);
+ _ckvmssts(lib$free_vm(&n, &info->out));
+ n = sizeof(Info);
+ _ckvmssts(lib$free_vm(&n, &info));
*psts = RMS$_FNF;
return Nullfp;
}
info->in = pipe_tochild_setup(aTHX_ in,mbx);
if (!info->useFILE) {
- info->fp = PerlIO_open(mbx, mode);
+ info->fp = PerlIO_open(mbx, mode);
} else {
info->fp = (PerlIO *) freopen(mbx, mode, stdout);
Perl_vmssetuserlnm(aTHX_ "SYS$OUTPUT",mbx);
if (!done) _ckvmssts(sys$waitfr(pipe_ef));
}
- if (info->in->buf) Safefree(info->in->buf);
- Safefree(info->in);
- Safefree(info);
+ if (info->in->buf) {
+ n = info->in->bufsize * sizeof(char);
+ _ckvmssts(lib$free_vm(&n, &info->in->buf));
+ }
+ n = sizeof(Pipe);
+ _ckvmssts(lib$free_vm(&n, &info->in));
+ n = sizeof(Info);
+ _ckvmssts(lib$free_vm(&n, &info));
*psts = RMS$_FNF;
return Nullfp;
}
d_symbol.dsc$w_length = strlen(symbol);
_ckvmssts(lib$set_symbol(&d_sym_out, &d_symbol, &table));
- p = vmscmd->dsc$a_pointer;
- while (*p && *p != '\n') p++;
- *p = '\0'; /* truncate on \n */
+ /* 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 */
if (*p == '$') p++; /* remove leading $ */
{
pInfo info, last = NULL;
unsigned long int retsts;
- int done, iss;
+ int done, iss, n;
for (info = open_pipes; info != NULL; last = info, info = info->next)
if (info->fp == fp) break;
*/
if (info->fp) {
if (!info->useFILE)
- PerlIO_flush(info->fp); /* first, flush data */
+ PerlIO_flush(info->fp); /* first, flush data */
else
fflush((FILE *)info->fp);
}
_ckvmssts(sys$setast(1));
if (info->fp) {
if (!info->useFILE)
- PerlIO_close(info->fp);
+ PerlIO_close(info->fp);
else
fclose((FILE *)info->fp);
}
/* free buffers and structures */
if (info->in) {
- if (info->in->buf) Safefree(info->in->buf);
- Safefree(info->in);
+ if (info->in->buf) {
+ n = info->in->bufsize * sizeof(char);
+ _ckvmssts(lib$free_vm(&n, &info->in->buf));
+ }
+ n = sizeof(Pipe);
+ _ckvmssts(lib$free_vm(&n, &info->in));
}
if (info->out) {
- if (info->out->buf) Safefree(info->out->buf);
- Safefree(info->out);
+ if (info->out->buf) {
+ n = info->out->bufsize * sizeof(char);
+ _ckvmssts(lib$free_vm(&n, &info->out->buf));
+ }
+ n = sizeof(Pipe);
+ _ckvmssts(lib$free_vm(&n, &info->out));
}
if (info->err) {
- if (info->err->buf) Safefree(info->err->buf);
- Safefree(info->err);
+ if (info->err->buf) {
+ n = info->err->bufsize * sizeof(char);
+ _ckvmssts(lib$free_vm(&n, &info->err->buf));
+ }
+ n = sizeof(Pipe);
+ _ckvmssts(lib$free_vm(&n, &info->err));
}
- Safefree(info);
+ n = sizeof(Info);
+ _ckvmssts(lib$free_vm(&n, &info));
return retsts;
}
/*}}}*/
+#if defined(__VAX) || !defined(NAML$C_MAXRSS)
+static int rms_free_search_context(struct FAB * fab)
+{
+struct NAM * nam;
+
+ nam = fab->fab$l_nam;
+ nam->nam$b_nop |= NAM$M_SYNCHK;
+ nam->nam$l_rlf = NULL;
+ fab->fab$b_dns = 0;
+ return sys$parse(fab, NULL, NULL);
+}
+
+#define rms_setup_nam(nam) struct NAM nam = cc$rms_nam
+#define rms_clear_nam_nop(nam) nam.nam$b_nop = 0;
+#define rms_set_nam_nop(nam, opt) nam.nam$b_nop |= (opt)
+#define rms_set_nam_fnb(nam, opt) nam.nam$l_fnb |= (opt)
+#define rms_is_nam_fnb(nam, opt) (nam.nam$l_fnb & (opt))
+#define rms_nam_esll(nam) nam.nam$b_esl
+#define rms_nam_esl(nam) nam.nam$b_esl
+#define rms_nam_name(nam) nam.nam$l_name
+#define rms_nam_namel(nam) nam.nam$l_name
+#define rms_nam_type(nam) nam.nam$l_type
+#define rms_nam_typel(nam) nam.nam$l_type
+#define rms_nam_ver(nam) nam.nam$l_ver
+#define rms_nam_verl(nam) nam.nam$l_ver
+#define rms_nam_rsll(nam) nam.nam$b_rsl
+#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; }
+#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; }
+#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;}
+#define rms_set_rsa(nam, name, 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; }
+#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)
+{
+struct NAML * nam;
+
+ nam = fab->fab$l_naml;
+ nam->naml$b_nop |= NAM$M_SYNCHK;
+ nam->naml$l_rlf = NULL;
+ nam->naml$l_long_defname_size = 0;
+
+ fab->fab$b_dns = 0;
+ return sys$parse(fab, NULL, NULL);
+}
+
+#define rms_setup_nam(nam) struct NAML nam = cc$rms_naml
+#define rms_clear_nam_nop(nam) nam.naml$b_nop = 0;
+#define rms_set_nam_nop(nam, opt) nam.naml$b_nop |= (opt)
+#define rms_set_nam_fnb(nam, opt) nam.naml$l_fnb |= (opt)
+#define rms_is_nam_fnb(nam, opt) (nam.naml$l_fnb & (opt))
+#define rms_nam_esll(nam) nam.naml$l_long_expand_size
+#define rms_nam_esl(nam) nam.naml$b_esl
+#define rms_nam_name(nam) nam.naml$l_name
+#define rms_nam_namel(nam) nam.naml$l_long_name
+#define rms_nam_type(nam) nam.naml$l_type
+#define rms_nam_typel(nam) nam.naml$l_long_type
+#define rms_nam_ver(nam) nam.naml$l_ver
+#define rms_nam_verl(nam) nam.naml$l_long_ver
+#define rms_nam_rsll(nam) nam.naml$l_long_result_size
+#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; \
+ nam.naml$l_long_filename_size = size; \
+ 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; \
+ nam.naml$l_long_defname_size = size; \
+ 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; \
+ nam.naml$l_long_expand_alloc = size; \
+ 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_long_expand = l_name; \
+ 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_long_result = name; \
+ 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_long_result = l_name; \
+ 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
*
* 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
*/
-static char *mp_do_tounixspec(pTHX_ const char *, char *, int);
+static char *mp_do_tounixspec(pTHX_ const char *, char *, int, int *);
static char *
-mp_do_rmsexpand(pTHX_ const char *filespec, char *outbuf, int ts, const char *defspec, unsigned opts)
+mp_do_rmsexpand
+ (pTHX_ const char *filespec,
+ char *outbuf,
+ int ts,
+ const char *defspec,
+ unsigned opts,
+ int * fs_utf8,
+ int * dfs_utf8)
{
- static char __rmsexpand_retbuf[NAM$C_MAXRSS+1];
- char vmsfspec[NAM$C_MAXRSS+1], tmpfspec[NAM$C_MAXRSS+1];
- char esa[NAM$C_MAXRSS], *cp, *out = NULL;
+ static char __rmsexpand_retbuf[VMS_MAXRSS];
+ char * vmsfspec, *tmpfspec;
+ char * esa, *cp, *out = NULL;
+ char * tbuf;
+ char * esal;
+ char * outbufl;
struct FAB myfab = cc$rms_fab;
- struct NAM mynam = cc$rms_nam;
+ rms_setup_nam(mynam);
STRLEN speclen;
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,NAM$C_MAXRSS+1,char);
+ if (ts) out = Newx(outbuf,VMS_MAXRSS,char);
else outbuf = __rmsexpand_retbuf;
}
- isunix = is_unix_filespec(filespec);
- if (isunix) {
- if (do_tovmsspec(filespec,vmsfspec,0) == NULL) return NULL;
- filespec = vmsfspec;
+
+ vmsfspec = NULL;
+ tmpfspec = NULL;
+ outbufl = NULL;
+
+ isunix = 0;
+ if ((opts & PERL_RMSEXPAND_M_VMS_IN) == 0) {
+ isunix = is_unix_filespec(filespec);
+ if (isunix) {
+ vmsfspec = PerlMem_malloc(VMS_MAXRSS);
+ if (vmsfspec == NULL) _ckvmssts(SS$_INSFMEM);
+ if (do_tovmsspec(filespec,vmsfspec,0,fs_utf8) == 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;
+ }
+ }
}
- myfab.fab$l_fna = (char *)filespec; /* cast ok for read only pointer */
- myfab.fab$b_fns = strlen(filespec);
- myfab.fab$l_nam = &mynam;
+ rms_set_fna(myfab, mynam, (char *)filespec, strlen(filespec)); /* cast ok */
+ rms_bind_fab_nam(myfab, mynam);
if (defspec && *defspec) {
- if (strchr(defspec,'/') != NULL) {
- if (do_tovmsspec(defspec,tmpfspec,0) == NULL) return NULL;
+ 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,dfs_utf8) == NULL) {
+ PerlMem_free(tmpfspec);
+ if (vmsfspec != NULL)
+ PerlMem_free(vmsfspec);
+ if (out)
+ Safefree(out);
+ return NULL;
+ }
defspec = tmpfspec;
}
- myfab.fab$l_dna = (char *)defspec; /* cast ok for read only pointer */
- myfab.fab$b_dns = strlen(defspec);
+ rms_set_dna(myfab, mynam, (char *)defspec, strlen(defspec)); /* cast ok */
}
- mynam.nam$l_esa = esa;
- mynam.nam$b_ess = sizeof esa;
- mynam.nam$l_rsa = outbuf;
- mynam.nam$b_rss = NAM$C_MAXRSS;
+ esa = PerlMem_malloc(NAM$C_MAXRSS + 1);
+ if (esa == NULL) _ckvmssts(SS$_INSFMEM);
+#if !defined(__VAX) && defined(NAML$C_MAXRSS)
+ esal = PerlMem_malloc(VMS_MAXRSS);
+ if (esal == NULL) _ckvmssts(SS$_INSFMEM);
+#endif
+ 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 !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);
+#endif
+ }
- retsts = sys$parse(&myfab,0,0);
- if (!(retsts & 1)) {
- mynam.nam$b_nop |= NAM$M_SYNCHK;
#ifdef NAM$M_NO_SHORT_UPCASE
- if (decc_efs_case_preserve)
- mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
+ if (decc_efs_case_preserve)
+ rms_set_nam_nop(mynam, NAM$M_NO_SHORT_UPCASE);
#endif
+
+ /* First attempt to parse as an existing file */
+ retsts = sys$parse(&myfab,0,0);
+ if (!(retsts & STS$K_SUCCESS)) {
+
+ /* Could not find the file, try as syntax only if error is not fatal */
+ rms_set_nam_nop(mynam, NAM$M_SYNCHK);
if (retsts == RMS$_DNF || retsts == RMS$_DIR || retsts == RMS$_DEV) {
retsts = sys$parse(&myfab,0,0);
- if (retsts & 1) goto expanded;
+ if (retsts & STS$K_SUCCESS) goto expanded;
}
- mynam.nam$l_rlf = NULL; myfab.fab$b_dns = 0;
- sts = sys$parse(&myfab,0,0); /* Free search context */
+
+ /* 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 (vmsfspec != NULL)
+ PerlMem_free(vmsfspec);
+ if (outbufl != NULL)
+ PerlMem_free(outbufl);
+ PerlMem_free(esa);
+ PerlMem_free(esal);
set_vaxc_errno(retsts);
if (retsts == RMS$_PRV) set_errno(EACCES);
else if (retsts == RMS$_DEV) set_errno(ENODEV);
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;
-#ifdef NAM$M_NO_SHORT_UPCASE
- if (decc_efs_case_preserve)
- mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
-#endif
- myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */
+ 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 (vmsfspec != NULL)
+ PerlMem_free(vmsfspec);
+ if (outbufl != NULL)
+ PerlMem_free(outbufl);
+ PerlMem_free(esa);
+ PerlMem_free(esal);
set_vaxc_errno(retsts);
if (retsts == RMS$_PRV) set_errno(EACCES);
else set_errno(EVMSERR);
* 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; }
+ for (tbuf = rms_get_fna(myfab, mynam); *tbuf; tbuf++)
+ if (islower(*tbuf)) { haslower = 1; break; }
+ }
+
+ /* Is a long or a short name expected */
+ /*------------------------------------*/
+ if ((opts & PERL_RMSEXPAND_M_LONG) != 0) {
+ if (rms_nam_rsll(mynam)) {
+ tbuf = outbuf;
+ speclen = rms_nam_rsll(mynam);
+ }
+ else {
+ tbuf = esal; /* Not esa */
+ speclen = rms_nam_esll(mynam);
+ }
}
- if (mynam.nam$b_rsl) { out = outbuf; speclen = mynam.nam$b_rsl; }
- else { out = esa; speclen = mynam.nam$b_esl; }
+ else {
+ if (rms_nam_rsl(mynam)) {
+ tbuf = outbuf;
+ speclen = rms_nam_rsl(mynam);
+ }
+ else {
+ tbuf = esa; /* Not esal */
+ speclen = rms_nam_esl(mynam);
+ }
+ }
+ tbuf[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);
+ trimver = !rms_is_nam_fnb(mynam, NAM$M_EXP_VER);
+ if ((opts & PERL_RMSEXPAND_M_LONG) != 0) {
+ trimtype = !rms_is_nam_fnb(mynam, NAM$M_EXP_TYPE) &&
+ ((rms_nam_verl(mynam) - rms_nam_typel(mynam)) == 1);
+ }
+ else {
+ trimtype = !rms_is_nam_fnb(mynam, NAM$M_EXP_TYPE) &&
+ ((rms_nam_ver(mynam) - rms_nam_type(mynam)) == 1);
+ }
if (trimver || trimtype) {
if (defspec && *defspec) {
- char defesa[NAM$C_MAXRSS];
- struct FAB deffab = cc$rms_fab;
- struct NAM defnam = cc$rms_nam;
+ char *defesal = NULL;
+ defesal = PerlMem_malloc(NAML$C_MAXRSS + 1);
+ if (defesal != NULL) {
+ struct FAB deffab = cc$rms_fab;
+ rms_setup_nam(defnam);
- 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 = sizeof defesa;
- defnam.nam$b_nop = NAM$M_SYNCHK;
+ rms_bind_fab_nam(deffab, defnam);
+
+ /* Cast ok */
+ rms_set_fna
+ (deffab, defnam, (char *)defspec, rms_nam_dns(myfab, mynam));
+
+ rms_set_esa(deffab, defnam, defesal, VMS_MAXRSS - 1);
+
+ rms_clear_nam_nop(defnam);
+ rms_set_nam_nop(defnam, NAM$M_SYNCHK);
#ifdef NAM$M_NO_SHORT_UPCASE
- if (decc_efs_case_preserve)
- defnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
+ if (decc_efs_case_preserve)
+ rms_set_nam_nop(defnam, NAM$M_NO_SHORT_UPCASE);
#endif
- if (sys$parse(&deffab,0,0) & 1) {
- if (trimver) trimver = !(defnam.nam$l_fnb & NAM$M_EXP_VER);
- if (trimtype) trimtype = !(defnam.nam$l_fnb & NAM$M_EXP_TYPE);
+ if (sys$parse(&deffab,0,0) & STS$K_SUCCESS) {
+ if (trimver) {
+ trimver = !rms_is_nam_fnb(defnam, NAM$M_EXP_VER);
+ }
+ if (trimtype) {
+ trimtype = !rms_is_nam_fnb(defnam, NAM$M_EXP_TYPE);
+ }
+ }
+ PerlMem_free(defesal);
}
}
if (trimver) {
- if (*mynam.nam$l_ver != '\"')
- speclen = mynam.nam$l_ver - out;
+ if ((opts & PERL_RMSEXPAND_M_LONG) != 0) {
+ if (*(rms_nam_verl(mynam)) != '\"')
+ speclen = rms_nam_verl(mynam) - tbuf;
+ }
+ else {
+ if (*(rms_nam_ver(mynam)) != '\"')
+ speclen = rms_nam_ver(mynam) - tbuf;
+ }
}
if (trimtype) {
/* If we didn't already trim version, copy down */
- if (speclen > mynam.nam$l_ver - out)
- memcpy(mynam.nam$l_type, mynam.nam$l_ver,
- speclen - (mynam.nam$l_ver - out));
- speclen -= mynam.nam$l_ver - mynam.nam$l_type;
+ if ((opts & PERL_RMSEXPAND_M_LONG) != 0) {
+ if (speclen > rms_nam_verl(mynam) - tbuf)
+ memmove
+ (rms_nam_typel(mynam),
+ rms_nam_verl(mynam),
+ speclen - (rms_nam_verl(mynam) - tbuf));
+ speclen -= rms_nam_verl(mynam) - rms_nam_typel(mynam);
+ }
+ else {
+ if (speclen > rms_nam_ver(mynam) - tbuf)
+ memmove
+ (rms_nam_type(mynam),
+ rms_nam_ver(mynam),
+ speclen - (rms_nam_ver(mynam) - tbuf));
+ speclen -= rms_nam_ver(mynam) - rms_nam_type(mynam);
+ }
}
}
+
+ /* Done with these copies of the input files */
+ /*-------------------------------------------*/
+ if (vmsfspec != NULL)
+ PerlMem_free(vmsfspec);
+ if (tmpfspec != NULL)
+ PerlMem_free(tmpfspec);
+
/* 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;
+ 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;
+ }
+ else {
+ 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;
+ }
/* Posix format specifications must have matching quotes */
- if (decc_posix_compliant_pathnames && (out[0] == '\"')) {
- if ((speclen > 1) && (out[speclen-1] != '\"')) {
- out[speclen] = '\"';
- speclen++;
+ if (speclen < (VMS_MAXRSS - 1)) {
+ if (decc_posix_compliant_pathnames && (tbuf[0] == '\"')) {
+ if ((speclen > 1) && (tbuf[speclen-1] != '\"')) {
+ tbuf[speclen] = '\"';
+ speclen++;
+ }
}
}
-
- out[speclen] = '\0';
- if (haslower && !decc_efs_case_preserve) __mystrtolower(out);
+ tbuf[speclen] = '\0';
+ if (haslower && !decc_efs_case_preserve) __mystrtolower(tbuf);
/* Have we been working with an expanded, but not resultant, spec? */
/* Also, convert back to Unix syntax if necessary. */
- if ((opts & PERL_RMSEXPAND_M_VMS) != 0)
- isunix = 0;
- if (!mynam.nam$b_rsl) {
+ if (!rms_nam_rsll(mynam)) {
if (isunix) {
- if (do_tounixspec(esa,outbuf,0) == NULL) return NULL;
+ if (do_tounixspec(esa,outbuf,0,fs_utf8) == NULL) {
+ if (out) Safefree(out);
+ PerlMem_free(esal);
+ PerlMem_free(esa);
+ if (outbufl != NULL)
+ PerlMem_free(outbufl);
+ return NULL;
+ }
}
else strcpy(outbuf,esa);
}
else if (isunix) {
- if (do_tounixspec(outbuf,tmpfspec,0) == NULL) return NULL;
+ tmpfspec = PerlMem_malloc(VMS_MAXRSS);
+ if (tmpfspec == NULL) _ckvmssts(SS$_INSFMEM);
+ if (do_tounixspec(outbuf,tmpfspec,0,fs_utf8) == 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);
}
- mynam.nam$b_nop |= NAM$M_SYNCHK; mynam.nam$l_rlf = NULL;
-#ifdef NAM$M_NO_SHORT_UPCASE
- if (decc_efs_case_preserve)
- mynam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
-#endif
- mynam.nam$l_rsa = NULL; mynam.nam$b_rss = 0;
- myfab.fab$b_dns = 0; sts = sys$parse(&myfab,0,0); /* Free search context */
+
+ rms_set_rsal(mynam, NULL, 0, NULL, 0);
+ sts = rms_free_search_context(&myfab); /* Free search context */
+ PerlMem_free(esa);
+ PerlMem_free(esal);
+ if (outbufl != NULL)
+ PerlMem_free(outbufl);
return outbuf;
}
/*}}}*/
/* 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); }
/*
** 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 <bailey@newman.upenn.edu>
** Permission is given to distribute this code as part of the Perl
** found in the Perl standard distribution.
*/
-/*{{{ char *fileify_dirspec[_ts](char *path, char *buf)*/
-static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts)
+/*{{{ char *fileify_dirspec[_ts](char *dir, char *buf, int * utf8_fl)*/
+static char *mp_do_fileify_dirspec(pTHX_ const char *dir,char *buf,int ts, int *utf8_fl)
{
- static char __fileify_retbuf[NAM$C_MAXRSS+1];
+ static char __fileify_retbuf[VMS_MAXRSS];
unsigned long int dirlen, retlen, addmfd = 0, hasfilename = 0;
char *retspec, *cp1, *cp2, *lastdir;
- char trndir[NAM$C_MAXRSS+2], vmsdir[NAM$C_MAXRSS+1];
+ char *trndir, *vmsdir;
unsigned short int trnlnm_iter_count;
int sts;
+ if (utf8_fl != NULL)
+ *utf8_fl = 0;
if (!dir || !*dir) {
set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL;
else
dirlen = 1;
}
- if (dirlen > NAM$C_MAXRSS) {
- set_errno(ENAMETOOLONG); set_vaxc_errno(RMS$_SYN); return NULL;
+ if (dirlen > (VMS_MAXRSS - 1)) {
+ set_errno(ENAMETOOLONG); set_vaxc_errno(RMS$_SYN);
+ return NULL;
}
+ trndir = PerlMem_malloc(VMS_MAXRSS + 1);
+ if (trndir == NULL) _ckvmssts(SS$_INSFMEM);
if (!strpbrk(dir+1,"/]>:") &&
(!decc_posix_compliant_pathnames && decc_disable_posix_root)) {
strcpy(trndir,*dir == '/' ? dir + 1: dir);
for (cp2 = cp1; cp2 > trndir; cp2--) {
if (*cp2 == '.') {
if ((cp2 - 1 > trndir) && (*(cp2 - 1) != '^')) {
+/* fix-me, can not scan EFS file specs backward like this */
*cp2 = *cp1; *cp1 = '\0';
hasfilename = 1;
break;
}
}
- cp1 = strpbrk(trndir,"]:>"); /* Prepare for future change */
+ vmsdir = PerlMem_malloc(VMS_MAXRSS + 1);
+ if (vmsdir == NULL) _ckvmssts(SS$_INSFMEM);
+ cp1 = strpbrk(trndir,"]:>");
if (hasfilename || !cp1) { /* Unix-style path or filename */
if (trndir[0] == '.') {
- if (trndir[1] == '\0' || (trndir[1] == '/' && trndir[2] == '\0'))
- return do_fileify_dirspec("[]",buf,ts);
+ if (trndir[1] == '\0' || (trndir[1] == '/' && trndir[2] == '\0')) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return do_fileify_dirspec("[]",buf,ts,NULL);
+ }
else if (trndir[1] == '.' &&
- (trndir[2] == '\0' || (trndir[2] == '/' && trndir[3] == '\0')))
- return do_fileify_dirspec("[-]",buf,ts);
+ (trndir[2] == '\0' || (trndir[2] == '/' && trndir[3] == '\0'))) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return do_fileify_dirspec("[-]",buf,ts,NULL);
+ }
}
if (dirlen && trndir[dirlen-1] == '/') { /* path ends with '/'; just add .dir;1 */
dirlen -= 1; /* to last element */
do {
if (*(cp1+2) == '.') cp1++;
if (*(cp1+2) == '/' || *(cp1+2) == '\0') {
- if (do_tovmsspec(trndir,vmsdir,0) == NULL) return NULL;
+ char * ret_chr;
+ if (do_tovmsspec(trndir,vmsdir,0,NULL) == NULL) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return NULL;
+ }
if (strchr(vmsdir,'/') != NULL) {
/* If do_tovmsspec() returned it, it must have VMS syntax
* delimiters in it, so it's a mixed VMS/Unix spec. We take
* the time to check this here only so we avoid a recursion
* loop; otherwise, gigo.
*/
- set_errno(EINVAL); set_vaxc_errno(RMS$_SYN); return NULL;
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ set_errno(EINVAL); set_vaxc_errno(RMS$_SYN);
+ return NULL;
}
- if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) return NULL;
- return do_tounixspec(trndir,buf,ts);
+ if (do_fileify_dirspec(vmsdir,trndir,0,NULL) == NULL) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return NULL;
+ }
+ ret_chr = do_tounixspec(trndir,buf,ts,NULL);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return ret_chr;
}
cp1++;
} while ((cp1 = strstr(cp1,"/.")) != NULL);
lastdir = strrchr(trndir,'/');
}
else if (dirlen >= 7 && !strcmp(&trndir[dirlen-7],"/000000")) {
+ char * ret_chr;
/* Ditto for specs that end in an MFD -- let the VMS code
* figure out whether it's a real device or a rooted logical. */
*/
trndir[dirlen] = '/'; trndir[dirlen+1] = '\0';
- if (do_tovmsspec(trndir,vmsdir,0) == NULL) return NULL;
- if (do_fileify_dirspec(vmsdir,trndir,0) == NULL) return NULL;
- return do_tounixspec(trndir,buf,ts);
+ if (do_tovmsspec(trndir,vmsdir,0,NULL) == NULL) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return NULL;
+ }
+ if (do_fileify_dirspec(vmsdir,trndir,0,NULL) == NULL) {
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return NULL;
+ }
+ ret_chr = do_tounixspec(trndir,buf,ts,NULL);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ return ret_chr;
}
else {
(*(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;
(*(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;
strcat(retspec,".dir;1");
else
strcat(retspec,".DIR;1");
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
return retspec;
}
else { /* VMS-style directory spec */
- char esa[NAM$C_MAXRSS+1], term, *cp;
+
+ char *esa, term, *cp;
unsigned long int sts, cmplen, haslower = 0;
+ unsigned int nam_fnb;
+ char * nam_type;
struct FAB dirfab = cc$rms_fab;
- struct NAM savnam, dirnam = cc$rms_nam;
-
- dirfab.fab$b_fns = strlen(trndir);
- dirfab.fab$l_fna = trndir;
- dirfab.fab$l_nam = &dirnam;
- dirfab.fab$l_dna = ".DIR;1";
- dirfab.fab$b_dns = 6;
- dirnam.nam$b_ess = NAM$C_MAXRSS;
- dirnam.nam$l_esa = esa;
+ rms_setup_nam(savnam);
+ rms_setup_nam(dirnam);
+
+ esa = PerlMem_malloc(VMS_MAXRSS + 1);
+ if (esa == NULL) _ckvmssts(SS$_INSFMEM);
+ 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));
#ifdef NAM$M_NO_SHORT_UPCASE
if (decc_efs_case_preserve)
- dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
+ rms_set_nam_nop(dirnam, NAM$M_NO_SHORT_UPCASE);
#endif
for (cp = trndir; *cp; cp++)
if (islower(*cp)) { haslower = 1; break; }
- if (!((sts = sys$parse(&dirfab))&1)) {
+ if (!((sts = sys$parse(&dirfab)) & STS$K_SUCCESS)) {
if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) {
- dirnam.nam$b_nop |= NAM$M_SYNCHK;
- sts = sys$parse(&dirfab) & 1;
+ rms_set_nam_nop(dirnam, NAM$M_SYNCHK);
+ sts = sys$parse(&dirfab) & STS$K_SUCCESS;
}
if (!sts) {
+ PerlMem_free(esa);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
set_errno(EVMSERR);
set_vaxc_errno(dirfab.fab$l_sts);
return NULL;
}
else {
savnam = dirnam;
- if (sys$search(&dirfab)&1) { /* Does the file really exist? */
+ /* Does the file really exist? */
+ if (sys$search(&dirfab)& STS$K_SUCCESS) {
/* Yes; fake the fnb bits so we'll check type below */
- dirnam.nam$l_fnb |= 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;
else {
- set_errno(EVMSERR); set_vaxc_errno(dirfab.fab$l_sts);
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ int fab_sts;
+ fab_sts = dirfab.fab$l_sts;
+ sts = rms_free_search_context(&dirfab);
+ PerlMem_free(esa);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
+ set_errno(EVMSERR); set_vaxc_errno(fab_sts);
return NULL;
}
}
}
- if (!(dirnam.nam$l_fnb & (NAM$M_EXP_DEV | NAM$M_EXP_DIR))) {
+ esa[rms_nam_esll(dirnam)] = '\0';
+ if (!rms_is_nam_fnb(dirnam, (NAM$M_EXP_DEV | NAM$M_EXP_DIR))) {
cp1 = strchr(esa,']');
if (!cp1) cp1 = strchr(esa,'>');
if (cp1) { /* Should always be true */
- dirnam.nam$b_esl -= cp1 - esa - 1;
- memcpy(esa,cp1 + 1,dirnam.nam$b_esl);
+ rms_nam_esll(dirnam) -= cp1 - esa - 1;
+ memmove(esa,cp1 + 1, rms_nam_esll(dirnam));
}
}
- if (dirnam.nam$l_fnb & NAM$M_EXP_TYPE) { /* Was type specified? */
+ 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 = (dirnam.nam$l_fnb & NAM$M_EXP_VER) ? 6 : 4;
- if (strncmp(dirnam.nam$l_type,".DIR;1",cmplen)) {
+ cmplen = rms_is_nam_fnb(dirnam, NAM$M_EXP_VER) ? 6 : 4;
+ if (strncmp(rms_nam_typel(dirnam), ".DIR;1", cmplen)) {
/* Something other than .DIR[;1]. Bzzt. */
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ sts = rms_free_search_context(&dirfab);
+ PerlMem_free(esa);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
set_errno(ENOTDIR);
set_vaxc_errno(RMS$_DIR);
return NULL;
}
}
- esa[dirnam.nam$b_esl] = '\0';
- if (dirnam.nam$l_fnb & NAM$M_EXP_NAME) {
+
+ 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,dirnam.nam$b_esl+1,char);
+ else if (ts) Newx(retspec, rms_nam_esll(dirnam)+1, char);
else retspec = __fileify_retbuf;
strcpy(retspec,esa);
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ sts = rms_free_search_context(&dirfab);
+ PerlMem_free(trndir);
+ PerlMem_free(esa);
+ PerlMem_free(vmsdir);
return retspec;
}
if ((cp1 = strstr(esa,".][000000]")) != NULL) {
for (cp2 = cp1 + 9; *cp2; cp1++,cp2++) *cp1 = *cp2;
*cp1 = '\0';
- dirnam.nam$b_esl -= 9;
+ rms_nam_esll(dirnam) -= 9;
}
if ((cp1 = strrchr(esa,']')) == NULL) cp1 = strrchr(esa,'>');
if (cp1 == NULL) { /* should never happen */
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ sts = rms_free_search_context(&dirfab);
+ PerlMem_free(trndir);
+ PerlMem_free(esa);
+ PerlMem_free(vmsdir);
return NULL;
}
term = *cp1;
retlen = strlen(esa);
cp1 = strrchr(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) != '^'))
break;
strcpy(retspec,esa);
}
else {
- if (dirnam.nam$l_fnb & NAM$M_ROOT_DIR) {
+ if (rms_is_nam_fnb(dirnam, NAM$M_ROOT_DIR)) {
/* Go back and expand rooted logical name */
- dirnam.nam$b_nop = NAM$M_SYNCHK | NAM$M_NOCONCEAL;
+ rms_set_nam_nop(dirnam, NAM$M_SYNCHK | NAM$M_NOCONCEAL);
#ifdef NAM$M_NO_SHORT_UPCASE
if (decc_efs_case_preserve)
- dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
+ rms_set_nam_nop(dirnam, NAM$M_NO_SHORT_UPCASE);
#endif
- if (!(sys$parse(&dirfab) & 1)) {
- dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ if (!(sys$parse(&dirfab) & STS$K_SUCCESS)) {
+ sts = rms_free_search_context(&dirfab);
+ PerlMem_free(esa);
+ PerlMem_free(trndir);
+ PerlMem_free(vmsdir);
set_errno(EVMSERR);
set_vaxc_errno(dirfab.fab$l_sts);
return NULL;
}
- retlen = dirnam.nam$b_esl - 9; /* esa - '][' - '].DIR;1' */
+ 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;
memcpy(retspec,esa,dirlen);
if (!strncmp(cp1+2,"000000]",7)) {
retspec[dirlen-1] = '\0';
- /* Not full ODS-5, just extra dots in directories for now */
+ /* fix-me Not full ODS-5, just extra dots in directories for now */
cp1 = retspec + dirlen - 1;
while (cp1 > retspec)
{
if (*cp1 == '.') *cp1 = ']';
else {
memmove(cp1+8,cp1+1,retspec+dirlen-cp1);
- memcpy(cp1+1,"000000]",7);
+ memmove(cp1+1,"000000]",7);
}
}
else {
- memcpy(retspec+dirlen,cp1+2,retlen-dirlen);
+ memmove(retspec+dirlen,cp1+2,retlen-dirlen);
retspec[retlen] = '\0';
/* Convert last '.' to ']' */
cp1 = retspec+retlen-1;
if (*cp1 == '.') *cp1 = ']';
else {
memmove(cp1+8,cp1+1,retspec+dirlen-cp1);
- memcpy(cp1+1,"000000]",7);
+ memmove(cp1+1,"000000]",7);
}
}
}
else retspec = __fileify_retbuf;
cp1 = esa;
cp2 = retspec;
- while (*cp1 != ':') *(cp2++) = *(cp1++);
+ while ((*cp1 != ':') && (*cp1 != '\0')) *(cp2++) = *(cp1++);
strcpy(cp2,":[000000]");
cp1 += 2;
strcpy(cp2+9,cp1);
}
}
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ 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");
/* $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);
+ PerlMem_free(trndir);
+ PerlMem_free(esa);
+ PerlMem_free(vmsdir);
return retspec;
}
} /* 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); }
/*{{{ char *pathify_dirspec[_ts](char *path, char *buf)*/
-static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts)
+static char *mp_do_pathify_dirspec(pTHX_ const char *dir,char *buf, int ts, int * utf8_fl)
{
- static char __pathify_retbuf[NAM$C_MAXRSS+1];
+ static char __pathify_retbuf[VMS_MAXRSS];
unsigned long int retlen;
- char *retpath, *cp1, *cp2, trndir[NAM$C_MAXRSS+1];
+ char *retpath, *cp1, *cp2, *trndir;
unsigned short int trnlnm_iter_count;
STRLEN trnlen;
int sts;
+ if (utf8_fl != NULL)
+ *utf8_fl = 0;
if (!dir || !*dir) {
set_errno(EINVAL); set_vaxc_errno(SS$_BADPARAM); return NULL;
}
+ trndir = PerlMem_malloc(VMS_MAXRSS);
+ if (trndir == NULL) _ckvmssts(SS$_INSFMEM);
if (*dir) strcpy(trndir,dir);
- else getcwd(trndir,sizeof trndir - 1);
+ else getcwd(trndir,VMS_MAXRSS - 1);
trnlnm_iter_count = 0;
while (!strpbrk(trndir,"/]:>") && !no_translate_barewords
else retpath = __pathify_retbuf;
strcpy(retpath,dir);
strcat(retpath,":[000000]");
+ PerlMem_free(trndir);
return retpath;
}
}
(*(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;
(*(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 retpath[retlen-1] = '\0';
}
else { /* VMS-style directory spec */
- char esa[NAM$C_MAXRSS+1], *cp;
+ char *esa, *cp;
unsigned long int sts, cmplen, haslower;
struct FAB dirfab = cc$rms_fab;
- struct NAM savnam, dirnam = cc$rms_nam;
+ int dirlen;
+ rms_setup_nam(savnam);
+ rms_setup_nam(dirnam);
/* If we've got an explicit filename, we can just shuffle the string. */
if ( ( (cp1 = strrchr(trndir,']')) != NULL ||
(*(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;
(*(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;
*cp1 = '.';
/* We've now got a VMS 'path'; fall through */
}
- dirfab.fab$b_fns = strlen(trndir);
- dirfab.fab$l_fna = trndir;
- if (trndir[dirfab.fab$b_fns-1] == ']' ||
- trndir[dirfab.fab$b_fns-1] == '>' ||
- trndir[dirfab.fab$b_fns-1] == ':') { /* It's already a VMS 'path' */
+
+ 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;
- }
- dirfab.fab$l_dna = ".DIR;1";
- dirfab.fab$b_dns = 6;
- dirfab.fab$l_nam = &dirnam;
- dirnam.nam$b_ess = (unsigned char) sizeof esa - 1;
- dirnam.nam$l_esa = esa;
+ }
+ 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)
- dirnam.nam$b_nop |= NAM$M_NO_SHORT_UPCASE;
+ rms_set_nam_nop(dirnam, NAM$M_NO_SHORT_UPCASE);
#endif
for (cp = trndir; *cp; cp++)
if (islower(*cp)) { haslower = 1; break; }
- if (!(sts = (sys$parse(&dirfab)&1))) {
+ if (!(sts = (sys$parse(&dirfab)& STS$K_SUCCESS))) {
if ((dirfab.fab$l_sts == RMS$_DIR) || (dirfab.fab$l_sts == RMS$_DNF)) {
- dirnam.nam$b_nop |= NAM$M_SYNCHK;
- sts = sys$parse(&dirfab) & 1;
+ 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;
}
else {
savnam = dirnam;
- if (!(sys$search(&dirfab)&1)) { /* Does the file really exist? */
+ /* Does the file really exist? */
+ if (!(sys$search(&dirfab)&STS$K_SUCCESS)) {
if (dirfab.fab$l_sts != RMS$_FNF) {
int sts1;
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0;
- sts1 = sys$parse(&dirfab,0,0);
+ 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 */
}
}
- if (dirnam.nam$l_fnb & NAM$M_EXP_TYPE) { /* Was type specified? */
+ 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 = (dirnam.nam$l_fnb & NAM$M_EXP_VER) ? 6 : 4;
- if (strncmp(dirnam.nam$l_type,".DIR;1",cmplen)) {
+ 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. */
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0;
- sts2 = sys$parse(&dirfab,0,0);
+ sts2 = rms_free_search_context(&dirfab);
+ PerlMem_free(trndir);
+ PerlMem_free(esa);
set_errno(ENOTDIR);
set_vaxc_errno(RMS$_DIR);
return NULL;
}
/* OK, the type was fine. Now pull any file name into the
directory path. */
- if ((cp1 = strrchr(esa,']'))) *dirnam.nam$l_type = ']';
+ if ((cp1 = strrchr(esa,']'))) *(rms_nam_typel(dirnam)) = ']';
else {
cp1 = strrchr(esa,'>');
- *dirnam.nam$l_type = '>';
+ *(rms_nam_typel(dirnam)) = '>';
}
*cp1 = '.';
- *(dirnam.nam$l_type + 1) = '\0';
- retlen = dirnam.nam$l_type - esa + 2;
+ *(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);
- dirnam.nam$b_nop |= NAM$M_SYNCHK; dirnam.nam$l_rlf = NULL;
- dirfab.fab$b_dns = 0; sts = sys$parse(&dirfab,0,0);
+ 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);
}
+ PerlMem_free(trndir);
return retpath;
} /* 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); }
-
-/*{{{ char *tounixspec[_ts](char *spec, char *buf)*/
-static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts)
+{ 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, int *)*/
+static char *mp_do_tounixspec(pTHX_ const char *spec, char *buf, int ts, int * utf8_fl)
{
- static char __tounixspec_retbuf[NAM$C_MAXRSS+1];
- char *dirend, *rslt, *cp1, *cp3, tmp[NAM$C_MAXRSS+1];
+ static char __tounixspec_retbuf[VMS_MAXRSS];
+ char *dirend, *rslt, *cp1, *cp3, *tmp;
const char *cp2;
- int devlen, dirlen, retlen = NAM$C_MAXRSS+1;
+ 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) > NAM$C_MAXRSS) return NULL;
+ if (strlen(spec) > (VMS_MAXRSS-1)) return NULL;
if (buf) rslt = buf;
else if (ts) {
- retlen = strlen(spec);
- cp1 = strchr(spec,'[');
- if (!cp1) cp1 = strchr(spec,'<');
- if (cp1) {
- for (cp1++; *cp1; cp1++) {
- if (*cp1 == '-') expand++; /* VMS '-' ==> Unix '../' */
- if (*cp1 == '.' && *(cp1+1) == '.' && *(cp1+2) == '.')
- { expand++; cp1 +=2; } /* VMS '...' ==> Unix '/.../' */
- }
- }
- Newx(rslt,retlen+2+2*expand,char);
+ Newx(rslt, VMS_MAXRSS, char);
}
else rslt = __tounixspec_retbuf;
int tunix_len;
int nl_flag;
- Newx(tunix, VMS_MAXRSS + 1,char);
+ tunix = PerlMem_malloc(VMS_MAXRSS);
+ if (tunix == NULL) _ckvmssts(SS$_INSFMEM);
strcpy(tunix, spec);
tunix_len = strlen(tunix);
nl_flag = 0;
nl_flag = 1;
}
uspec = decc$translate_vms(tunix);
- Safefree(tunix);
+ PerlMem_free(tunix);
if ((int)uspec > 0) {
strcpy(rslt,uspec);
if (nl_flag) {
#else
cmp_rslt = strncasecmp(spec,"SYS$SCRATCH:", 12);
#endif
+ tmp = PerlMem_malloc(VMS_MAXRSS);
+ if (tmp == NULL) _ckvmssts(SS$_INSFMEM);
if (cmp_rslt == 0) {
int islnm;
cp2++;
if (*cp2 == ']' || *cp2 == '>') {
*(cp1++) = '.'; *(cp1++) = '/'; *(cp1++) = '\0';
+ PerlMem_free(tmp);
return rslt;
}
else if ( *cp2 != '^' && *cp2 != '.' && *cp2 != '-') { /* add the implied device */
- if (getcwd(tmp,sizeof tmp,1) == NULL) {
+ if (getcwd(tmp, VMS_MAXRSS-1 ,1) == NULL) {
if (ts) Safefree(rslt);
+ PerlMem_free(tmp);
return NULL;
}
trnlnm_iter_count = 0;
*(cp1++) = '/';
while (*cp3) {
*(cp1++) = *(cp3++);
- if (cp1 - rslt > NAM$C_MAXRSS && !ts && !buf) return NULL; /* No room */
+ if (cp1 - rslt > (VMS_MAXRSS - 1) && !ts && !buf) {
+ PerlMem_free(tmp);
+ return NULL; /* No room */
+ }
}
*(cp1++) = '/';
}
else cp2++;
}
}
+ PerlMem_free(tmp);
for (; cp2 <= dirend; cp2++) {
if ((*cp2 == '^')) {
/* EFS file escape, pass the next character as is */
} /* end of do_tounixspec() */
/*}}}*/
/* External entry points */
-char *Perl_tounixspec(pTHX_ const char *spec, char *buf) { return do_tounixspec(spec,buf,0); }
-char *Perl_tounixspec_ts(pTHX_ const char *spec, char *buf) { return do_tounixspec(spec,buf,1); }
+char *Perl_tounixspec(pTHX_ const char *spec, char *buf)
+ { return do_tounixspec(spec,buf,0, NULL); }
+char *Perl_tounixspec_ts(pTHX_ const char *spec, char *buf)
+ { return do_tounixspec(spec,buf,1, NULL); }
+char *Perl_tounixspec_utf8(pTHX_ const char *spec, char *buf, int * utf8_fl)
+ { return do_tounixspec(spec,buf,0, utf8_fl); }
+char *Perl_tounixspec_utf8_ts(pTHX_ const char *spec, char *buf, int * utf8_fl)
+ { return do_tounixspec(spec,buf,1, utf8_fl); }
-#if __CRTL_VER >= 80200000 && !defined(__VAX)
+#if __CRTL_VER >= 70200000 && !defined(__VAX)
+
+/*
+ This procedure is used to identify if a path is based in either
+ the old SYS$POSIX_ROOT: or the new 8.3 RMS based POSIX root, and
+ it returns the OpenVMS format directory for it.
+
+ It is expecting specifications of only '/' or '/xxxx/'
-static int posix_to_vmsspec
- (char *vmspath, int vmspath_len, const char *unixpath) {
+ 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;
int dir_flag;
int unixlen;
+ dir_flag = 0;
+ unixlen = strlen(unixpath);
+ if (unixlen == 0) {
+ vmspath[0] = '\0';
+ return RMS$_FNF;
+ }
+
+#if __CRTL_VER >= 80200000
/* If not a posix spec already, convert it */
- dir_flag = 0;
- unixlen = strlen(unixpath);
- if (unixlen == 0) {
- vmspath[0] = '\0';
- return SS$_NORMAL;
- }
- if (strncmp(unixpath,"\"^UP^",5) != 0) {
- sprintf(vmspath,"\"^UP^%s\"",unixpath);
+ if (decc_posix_compliant_pathnames) {
+ if (strncmp(unixpath,"\"^UP^",5) != 0) {
+ sprintf(vmspath,"\"^UP^%s\"",unixpath);
+ }
+ else {
+ /* This is already a VMS specification, no conversion */
+ unixlen--;
+ strncpy(vmspath,unixpath, vmspath_len);
+ }
}
- else {
- /* This is already a VMS specification, no conversion */
- unixlen--;
- strncpy(vmspath,unixpath, vmspath_len);
+ else
+#endif
+ {
+ int path_len;
+ int i,j;
+
+ /* Check to see if this is under the POSIX root */
+ if (decc_disable_posix_root) {
+ return RMS$_FNF;
+ }
+
+ /* Skip leading / */
+ if (unixpath[0] == '/') {
+ unixpath++;
+ unixlen--;
+ }
+
+
+ strcpy(vmspath,"SYS$POSIX_ROOT:");
+
+ /* If this is only the / , or blank, then... */
+ if (unixpath[0] == '\0') {
+ /* by definition, this is the answer */
+ return SS$_NORMAL;
+ }
+
+ /* Need to look up a directory */
+ vmspath[15] = '[';
+ vmspath[16] = '\0';
+
+ /* Copy and add '^' escape characters as needed */
+ j = 16;
+ i = 0;
+ while (unixpath[i] != 0) {
+ int k;
+
+ j += copy_expand_unix_filename_escape
+ (&vmspath[j], &unixpath[i], &k, utf8_fl);
+ i += k;
+ }
+
+ path_len = strlen(vmspath);
+ if (vmspath[path_len - 1] == '/')
+ path_len--;
+ vmspath[path_len] = ']';
+ path_len++;
+ vmspath[path_len] = '\0';
+
}
vmspath[vmspath_len] = 0;
if (unixpath[unixlen - 1] == '/')
dir_flag = 1;
- Newx(esa, VMS_MAXRSS+1, char);
+ esa = PerlMem_malloc(VMS_MAXRSS);
+ 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;
+ mynam.naml$l_long_expand_alloc = (unsigned char) VMS_MAXRSS - 1;
mynam.naml$l_rsa = NULL;
mynam.naml$b_rss = 0;
if (decc_efs_case_preserve)
mynam.naml$b_nop |= NAM$M_NO_SHORT_UPCASE;
+#ifdef NAML$M_OPEN_SPECIAL
mynam.naml$l_input_flags |= NAML$M_OPEN_SPECIAL;
+#endif
/* Set up the remaining naml fields */
sts = sys$parse(&myfab);
/* It failed! Try again as a UNIX filespec */
if (!(sts & 1)) {
- Safefree(esa);
+ PerlMem_free(esa);
return sts;
}
sts = sys$search(&myfab);
/* on any failure, returned the POSIX ^UP^ filespec */
if (!(sts & 1)) {
- Safefree(esa);
+ PerlMem_free(esa);
return sts;
}
specdsc.dsc$a_pointer = vmspath;
}
}
}
- Safefree(esa);
+ PerlMem_free(esa);
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;
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;
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)
/* 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;
/* 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) {
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++ = ']';
* here that are a VMS device name or concealed logical name instead.
* So to make things work, this procedure must be tolerant.
*/
- Newx(esa, vmspath_len, char);
+ esa = PerlMem_malloc(vmspath_len);
+ if (esa == NULL) _ckvmssts_noperl(SS$_INSFMEM);
sts = SS$_NORMAL;
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;
}
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 */
*
* As it is, perl is occasionally looking for dev:[000000]tty.
* which looks a little strange.
+ *
+ * Not that easy to detect as "/dev" may be file structured with
+ * special device files.
*/
- if ((add_6zero == 0) && (*nextslash == '/') && (nextslash[1] == '\0')) {
+ if ((add_6zero == 0) && (*nextslash == '/') &&
+ (&nextslash[1] == unixend)) {
/* No real directory present */
add_6zero = 1;
}
}
} /* non-POSIX translation */
- Safefree(esa);
+ 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;
/* 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;
/* Skip redundant ./ characters */
while ((*unixptr == '.') &&
- ((unixptr[1] == '/')||(unixptr[1] == '\0'))) {
+ ((unixptr[1] == '/')||(&unixptr[1] == unixend))) {
loop_flag = 1;
unixptr++;
if (unixptr == lastslash)
/* 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;
}
/* All done? */
- if (*unixptr == '\0')
+ if (unixptr >= unixend)
break;
/* Normal characters - More EFS work probably needed */
}
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;
}
}
char *vmsptr2;
/* Add a trailing dot if a file with no extension */
vmsptr2 = vmsptr - 1;
- if ((*vmsptr2 != ']') && (*vmsptr2 != '*') && (*vmsptr2 != '%') &&
- (*lastdot != '.')) {
+ if ((vmslen > 1) &&
+ (*vmsptr2 != ']') && (*vmsptr2 != '*') && (*vmsptr2 != '%') &&
+ (*vmsptr2 != ')') && (*lastdot != '.')) {
*vmsptr++ = '.';
vmslen++;
}
}
#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[NAM$C_MAXRSS+1];
+ /* Eventual routine to convert a UTF-8 specification to VTF-7. */
+static char * utf8_to_vtf7(char * rslt, const char * path, int *utf8_fl)
+{
+char * result;
+int utf8_flag;
+
+ /* If a UTF8 flag is being passed, honor it */
+ utf8_flag = 0;
+ if (utf8_fl != NULL) {
+ utf8_flag = *utf8_fl;
+ *utf8_fl = 0;
+ }
+
+ if (utf8_flag) {
+ /* If there is a possibility of UTF8, then if any UTF8 characters
+ are present, then they must be converted to VTF-7
+ */
+ result = strcpy(rslt, path); /* FIX-ME */
+ }
+ else
+ result = strcpy(rslt, path);
+
+ return result;
+}
+
+
+/*{{{ char *tovmsspec[_ts](char *path, char *buf, int * utf8_flag)*/
+static char *mp_do_tovmsspec
+ (pTHX_ const char *path, char *buf, int ts, int dir_flag, int * utf8_flag) {
+ static char __tovmsspec_retbuf[VMS_MAXRSS];
char *rslt, *dirend;
char *lastdot;
char *vms_delim;
unsigned long int infront = 0, hasdir = 1;
int rslt_len;
int no_type_seen;
+ char * v_spec, * r_spec, * d_spec, * n_spec, * e_spec, * vs_spec;
+ int sts, v_len, r_len, d_len, n_len, e_len, vs_len;
if (path == NULL) return NULL;
- rslt_len = VMS_MAXRSS;
+ rslt_len = VMS_MAXRSS-1;
if (buf) rslt = buf;
- else if (ts) Newx(rslt,NAM$C_MAXRSS+1,char);
+ 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);
+ posix_to_vmsspec_hardway(rslt, rslt_len, path, dir_flag, utf8_flag);
return rslt;
}
}
#endif
- vms_delim = strpbrk(path,"]:>");
-
- if ((vms_delim != NULL) ||
- ((dirend = strrchr(path,'/')) == NULL)) {
+ /* This is really the only way to see if this is already in VMS format */
+ sts = vms_split_path
+ (path,
+ &v_spec,
+ &v_len,
+ &r_spec,
+ &r_len,
+ &d_spec,
+ &d_len,
+ &n_spec,
+ &n_len,
+ &e_spec,
+ &e_len,
+ &vs_spec,
+ &vs_len);
+ if (sts == 0) {
+ /* FIX-ME - If dir_flag is non-zero, then this is a mp_do_vmspath()
+ replacement, because the above parse just took care of most of
+ what is needed to do vmspath when the specification is already
+ in VMS format.
+
+ And if it is not already, it is easier to do the conversion as
+ part of this routine than to call this routine and then work on
+ the result.
+ */
- /* VMS special characters found! */
+ /* If VMS punctuation was found, it is already VMS format */
+ if ((v_len != 0) || (r_len != 0) || (d_len != 0) || (vs_len != 0)) {
+ if (utf8_flag != NULL)
+ *utf8_flag = 0;
+ strcpy(rslt, path);
+ return rslt;
+ }
+ /* Now, what to do with trailing "." cases where there is no
+ extension? If this is a UNIX specification, and EFS characters
+ are enabled, then the trailing "." should be converted to a "^.".
+ But if this was already a VMS specification, then it should be
+ left alone.
- if (path[0] == '.') {
- if (path[1] == '\0') strcpy(rslt,"[]");
- else if (path[1] == '.' && path[2] == '\0')
- strcpy(rslt,"[-]");
+ So in the case of ambiguity, leave the specification alone.
+ */
- /* Dot preceeding a device or directory ? */
- else {
- /* If not in POSIX mode, pass it through and hope it works */
-#if __CRTL_VER >= 80200000 && !defined(__VAX)
- if (!decc_posix_compliant_pathnames)
- strcpy(rslt,path); /* probably garbage */
- else
- posix_to_vmsspec_hardway(rslt, rslt_len, path);
-#else
- strcpy(rslt,path); /* probably garbage */
-#endif
- }
- }
- else {
- /* If no VMS characters and in POSIX mode, convert it!
- * This is the easiest way to get directory specifications
- * handled correctly in POSIX mode
- */
-#if __CRTL_VER >= 80200000 && !defined(__VAX)
- if ((vms_delim == NULL) && decc_posix_compliant_pathnames)
- posix_to_vmsspec_hardway(rslt, rslt_len, path);
- else {
- /* No unix path separators - presume VMS already */
- strcpy(rslt,path);
- }
-#else
- strcpy(rslt,path); /* probably garbage */
-#endif
- }
+ /* If there is a possibility of UTF8, then if any UTF8 characters
+ are present, then they must be converted to VTF-7
+ */
+ if (utf8_flag != NULL)
+ *utf8_flag = 0;
+ strcpy(rslt, path);
return rslt;
}
+ dirend = strrchr(path,'/');
+
+ if (dirend == NULL) {
+ /* If we get here with no UNIX directory delimiters, then this is
+ not a complete file specification, either garbage a UNIX glob
+ specification that can not be converted to a VMS wildcard, or
+ it a UNIX shell macro. MakeMaker wants these passed through AS-IS,
+ so apparently other programs expect this also.
+
+ utf8 flag setting needs to be preserved.
+ */
+ strcpy(rslt, path);
+ return rslt;
+ }
+
/* If POSIX mode active, handle the conversion */
#if __CRTL_VER >= 80200000 && !defined(__VAX)
- if (decc_posix_compliant_pathnames) {
- posix_to_vmsspec_hardway(rslt, rslt_len, path);
+ if (decc_efs_charset) {
+ posix_to_vmsspec_hardway(rslt, rslt_len, path, dir_flag, utf8_flag);
return rslt;
}
#endif
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;
cp2 = path;
lastdot = strrchr(cp2,'.');
if (*cp2 == '/') {
- char trndev[NAM$C_MAXRSS+1];
+ char *trndev;
int islnm, rooted;
STRLEN trnend;
else {
strcpy(rslt,"sys$posix_root:[000000]");
}
+ if (utf8_flag != NULL)
+ *utf8_flag = 0;
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);
/* DECC special handling */
}
else {
if (cp2 != dirend) {
- if (!buf && ts) Renew(rslt,strlen(path)-strlen(rslt)+trnend+4,char);
strcpy(rslt,trndev);
cp1 = rslt + trnend;
if (*cp2 != 0) {
}
}
}
+ PerlMem_free(trndev);
}
else {
*(cp1++) = '[';
while (*cp2) {
switch(*cp2) {
case '?':
- *(cp1++) = '%';
+ if (decc_efs_charset == 0)
+ *(cp1++) = '%';
+ else
+ *(cp1++) = '?';
cp2++;
case ' ':
*(cp1)++ = '^';
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 '`':
break;
case ';':
/* FIXME: This needs fixing as Perl is putting ".dir;" on UNIX filespecs
- * which is wrong. UNIX notation should be ".dir. unless
+ * which is wrong. UNIX notation should be ".dir." unless
* the DECC$FILENAME_UNIX_NO_VERSION is enabled.
* changing this behavior could break more things at this time.
* efs character set effectively does not allow "." to be a version
}
*cp1 = '\0';
+ if (utf8_flag != NULL)
+ *utf8_flag = 0;
return rslt;
} /* end of do_tovmsspec() */
/*}}}*/
/* External entry points */
-char *Perl_tovmsspec(pTHX_ const char *path, char *buf) { return do_tovmsspec(path,buf,0); }
-char *Perl_tovmsspec_ts(pTHX_ const char *path, char *buf) { return do_tovmsspec(path,buf,1); }
-
-/*{{{ char *tovmspath[_ts](char *path, char *buf)*/
-static char *mp_do_tovmspath(pTHX_ const char *path, char *buf, int ts) {
- static char __tovmspath_retbuf[NAM$C_MAXRSS+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 *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[NAM$C_MAXRSS+1], vmsified[NAM$C_MAXRSS+1], *cp;
+ char *pathified, *vmsified, *cp;
+
+ if (path == NULL) return NULL;
+ pathified = PerlMem_malloc(VMS_MAXRSS);
+ if (pathified == NULL) _ckvmssts(SS$_INSFMEM);
+ if (do_pathify_dirspec(path,pathified,0,NULL) == NULL) {
+ PerlMem_free(pathified);
+ return NULL;
+ }
- if (path == NULL) return NULL;
- if (do_pathify_dirspec(path,pathified,0) == NULL) return NULL;
- if (do_tovmsspec(pathified,buf ? buf : vmsified,0) == NULL) return NULL;
- if (buf) return buf;
+ vmsified = NULL;
+ if (buf == NULL)
+ Newx(vmsified, VMS_MAXRSS, char);
+ if (do_tovmsspec(pathified, buf ? buf : vmsified, 0, NULL) == NULL) {
+ PerlMem_free(pathified);
+ if (vmsified) Safefree(vmsified);
+ return NULL;
+ }
+ PerlMem_free(pathified);
+ if (buf) {
+ return buf;
+ }
else if (ts) {
vmslen = strlen(vmsified);
Newx(cp,vmslen+1,char);
memcpy(cp,vmsified,vmslen);
cp[vmslen] = '\0';
+ Safefree(vmsified);
return cp;
}
else {
strcpy(__tovmspath_retbuf,vmsified);
+ Safefree(vmsified);
return __tovmspath_retbuf;
}
} /* 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) {
- static char __tounixpath_retbuf[NAM$C_MAXRSS+1];
+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[NAM$C_MAXRSS+1], unixified[NAM$C_MAXRSS+1], *cp;
+ char *pathified, *unixified, *cp;
if (path == NULL) return NULL;
- if (do_pathify_dirspec(path,pathified,0) == NULL) return NULL;
- if (do_tounixspec(pathified,buf ? buf : unixified,0) == NULL) return NULL;
- if (buf) return buf;
+ pathified = PerlMem_malloc(VMS_MAXRSS);
+ if (pathified == NULL) _ckvmssts(SS$_INSFMEM);
+ if (do_pathify_dirspec(path,pathified,0,NULL) == NULL) {
+ PerlMem_free(pathified);
+ return NULL;
+ }
+
+ unixified = NULL;
+ if (buf == NULL) {
+ Newx(unixified, VMS_MAXRSS, char);
+ }
+ if (do_tounixspec(pathified,buf ? buf : unixified,0,NULL) == NULL) {
+ PerlMem_free(pathified);
+ if (unixified) Safefree(unixified);
+ return NULL;
+ }
+ PerlMem_free(pathified);
+ if (buf) {
+ return buf;
+ }
else if (ts) {
unixlen = strlen(unixified);
Newx(cp,unixlen+1,char);
memcpy(cp,unixified,unixlen);
cp[unixlen] = '\0';
+ Safefree(unixified);
return cp;
}
else {
strcpy(__tounixpath_retbuf,unixified);
+ Safefree(unixified);
return __tounixpath_retbuf;
}
} /* 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)
* Allocate and fill in the new argument vector, Some Unix's terminate
* the list with an extra null pointer.
*/
- Newx(argv, item_count+1, char *);
+ argv = (char **) PerlMem_malloc((item_count+1) * sizeof(char *));
+ if (argv == NULL) _ckvmssts_noperl(SS$_INSFMEM);
*av = argv;
for (j = 0; j < item_count; ++j, list_head = list_head->next)
argv[j] = list_head->value;
{
if (*head == 0)
{
- Newx(*head,1,struct list_item);
+ *head = (struct list_item *) PerlMem_malloc(sizeof(struct list_item));
+ if (head == NULL) _ckvmssts_noperl(SS$_INSFMEM);
*tail = *head;
}
else {
- Newx((*tail)->next,1,struct list_item);
+ (*tail)->next = (struct list_item *) PerlMem_malloc(sizeof(struct list_item));
+ if ((*tail)->next == NULL) _ckvmssts_noperl(SS$_INSFMEM);
*tail = (*tail)->next;
}
(*tail)->value = value;
char *had_device;
int had_directory;
char *devdir,*cp;
-char vmsspec[NAM$C_MAXRSS+1];
+char *vmsspec;
$DESCRIPTOR(filespec, "");
$DESCRIPTOR(defaultspec, "SYS$DISK:[]");
$DESCRIPTOR(resultspec, "");
-unsigned long int zero = 0, sts;
+unsigned long int lff_flags = 0;
+int sts;
+int rms_sts;
+
+#ifdef VMS_LONGNAME_SUPPORT
+ lff_flags = LIB$M_FIL_LONG_NAMES;
+#endif
for (cp = item; *cp; cp++) {
if (*cp == '*' || *cp == '%' || isspace(*cp)) break;
resultspec.dsc$b_dtype = DSC$K_DTYPE_T;
resultspec.dsc$b_class = DSC$K_CLASS_D;
resultspec.dsc$a_pointer = NULL;
+ vmsspec = PerlMem_malloc(VMS_MAXRSS);
+ if (vmsspec == NULL) _ckvmssts_noperl(SS$_INSFMEM);
if ((isunix = (int) strchr(item,'/')) != (int) NULL)
- filespec.dsc$a_pointer = do_tovmsspec(item,vmsspec,0);
+ filespec.dsc$a_pointer = do_tovmsspec(item,vmsspec,0,NULL);
if (!isunix || !filespec.dsc$a_pointer)
filespec.dsc$a_pointer = item;
filespec.dsc$w_length = strlen(filespec.dsc$a_pointer);
had_device = strchr(item, ':');
had_directory = (isunix || NULL != strchr(item, '[')) || (NULL != strchr(item, '<'));
- while (1 == (1 & (sts = lib$find_file(&filespec, &resultspec, &context,
- &defaultspec, 0, 0, &zero))))
+ while ($VMS_STATUS_SUCCESS(sts = lib$find_file
+ (&filespec, &resultspec, &context,
+ &defaultspec, 0, &rms_sts, &lff_flags)))
{
char *string;
char *c;
- Newx(string,resultspec.dsc$w_length+1,char);
+ string = PerlMem_malloc(resultspec.dsc$w_length+1);
+ if (string == NULL) _ckvmssts_noperl(SS$_INSFMEM);
strncpy(string, resultspec.dsc$a_pointer, resultspec.dsc$w_length);
string[resultspec.dsc$w_length] = '\0';
if (NULL == had_version)
if (isunix) trim_unixpath(string,item,1);
add_item(head, tail, string, count);
++expcount;
- }
+ }
+ PerlMem_free(vmsspec);
if (sts != RMS$_NMF)
{
set_vaxc_errno(sts);
*p++ = '"';
l++;
}
- }
+ }
} else {
if ((quote||tquote) && *q == '"') {
*p++ = '"';
l++;
- }
+ }
*p++ = *q++;
l++;
}
fp = safe_popen(aTHX_ subcmd,"wbF",&sts);
if (fp == Nullfp) {
PerlIO_printf(Perl_debug_log,"Can't open output pipe (status %d)",sts);
- }
+ }
}
static int background_process(pTHX_ int argc, char **argv)
{
-char command[2048] = "$";
+char command[MAX_DCL_SYMBOL + 1] = "$";
$DESCRIPTOR(value, "");
static $DESCRIPTOR(cmd, "BACKGROUND$COMMAND");
static $DESCRIPTOR(null, "NLA0:");
$DESCRIPTOR(pidstr, "");
int pid;
unsigned long int flags = 17, one = 1, retsts;
+int len;
strcat(command, argv[0]);
- while (--argc)
+ len = strlen(command);
+ while (--argc && (len < MAX_DCL_SYMBOL))
{
strcat(command, " \"");
strcat(command, *(++argv));
strcat(command, "\"");
+ len = strlen(command);
}
value.dsc$a_pointer = command;
value.dsc$w_length = strlen(value.dsc$a_pointer);
#ifndef KGB$M_SUBSYSTEM
# define KGB$M_SUBSYSTEM 0x8
#endif
+
+/* Avoid Newx() in vms_image_init as thread context has not been initialized. */
/*{{{void vms_image_init(int *, char ***)*/
void
"Check your rights database for corruption.\n");
exit(SS$_ABORT);
}
- if (jpilist[1].bufadr != rlst) Safefree(jpilist[1].bufadr);
- jpilist[1].bufadr = Newx(mask,rsz,unsigned long int);
+ if (jpilist[1].bufadr != rlst) PerlMem_free(jpilist[1].bufadr);
+ jpilist[1].bufadr = mask = (unsigned long int *) PerlMem_malloc(rsz * sizeof(unsigned long int));
+ if (mask == NULL) _ckvmssts_noperl(SS$_INSFMEM);
jpilist[1].buflen = rsz * sizeof(unsigned long int);
_ckvmssts_noperl(sys$getjpiw(0,NULL,NULL,&jpilist[1],iosb,NULL,NULL));
_ckvmssts_noperl(iosb[0]);
break;
}
}
- if (mask != rlst) Safefree(mask);
+ if (mask != rlst) PerlMem_free(mask);
}
/* When Perl is in decc_filename_unix_report mode and is run from a concealed
if (will_taint) {
char **newargv, **oldargv;
oldargv = *argvp;
- Newx(newargv,(*argcp)+2,char *);
+ newargv = (char **) PerlMem_malloc(((*argcp)+2) * sizeof(char *));
+ if (newargv == NULL) _ckvmssts_noperl(SS$_INSFMEM);
newargv[0] = oldargv[0];
- Newx(newargv[1],3,char);
+ newargv[1] = PerlMem_malloc(3 * sizeof(char));
+ if (newargv[1] == NULL) _ckvmssts_noperl(SS$_INSFMEM);
strcpy(newargv[1], "-T");
Copy(&oldargv[1],&newargv[2],(*argcp)-1,char **);
(*argcp)++;
for (tabidx = 0;
len = my_trnlnm("PERL_ENV_TABLES",eqv,tabidx);
tabidx++) {
- if (!tabidx) Newx(tabvec,tabct,struct dsc$descriptor_s *);
+ if (!tabidx) {
+ tabvec = (struct dsc$descriptor_s **)
+ PerlMem_malloc(tabct * sizeof(struct dsc$descriptor_s *));
+ if (tabvec == NULL) _ckvmssts_noperl(SS$_INSFMEM);
+ }
else if (tabidx >= tabct) {
tabct += 8;
- Renew(tabvec,tabct,struct dsc$descriptor_s *);
+ tabvec = (struct dsc$descriptor_s **) PerlMem_realloc(tabvec, tabct * sizeof(struct dsc$descriptor_s *));
+ if (tabvec == NULL) _ckvmssts_noperl(SS$_INSFMEM);
}
- Newx(tabvec[tabidx],1,struct dsc$descriptor_s);
+ tabvec[tabidx] = (struct dsc$descriptor_s *) PerlMem_malloc(sizeof(struct dsc$descriptor_s));
+ if (tabvec[tabidx] == NULL) _ckvmssts_noperl(SS$_INSFMEM);
tabvec[tabidx]->dsc$w_length = 0;
tabvec[tabidx]->dsc$b_dtype = DSC$K_DTYPE_T;
tabvec[tabidx]->dsc$b_class = DSC$K_CLASS_D;
int
Perl_trim_unixpath(pTHX_ char *fspec, const char *wildspec, int opts)
{
- char unixified[NAM$C_MAXRSS+1], unixwild[NAM$C_MAXRSS+1],
+ char *unixified, *unixwild,
*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;
template = unixwild;
if (strpbrk(wildspec,"]>:") != NULL) {
- if (do_tounixspec(wildspec,unixwild,0) == NULL) return 0;
+ if (do_tounixspec(wildspec,unixwild,0,NULL) == NULL) {
+ PerlMem_free(unixwild);
+ return 0;
+ }
}
else {
- strncpy(unixwild, wildspec, NAM$C_MAXRSS);
- unixwild[NAM$C_MAXRSS] = 0;
+ strncpy(unixwild, wildspec, VMS_MAXRSS-1);
+ unixwild[VMS_MAXRSS-1] = 0;
}
+ unixified = PerlMem_malloc(VMS_MAXRSS);
+ if (unixified == NULL) _ckvmssts(SS$_INSFMEM);
if (strpbrk(fspec,"]>:") != NULL) {
- if (do_tounixspec(fspec,unixified,0) == NULL) return 0;
+ if (do_tounixspec(fspec,unixified,0,NULL) == NULL) {
+ PerlMem_free(unixwild);
+ PerlMem_free(unixified);
+ return 0;
+ }
else base = unixified;
/* reslen != 0 ==> we had to unixify resultant filespec, so we must
* check to see that final result fits into (isn't longer than) fspec */
/* No prefix or absolute path on wildcard, so nothing to remove */
if (!*template || *template == '/') {
- if (base == fspec) return 1;
+ PerlMem_free(unixwild);
+ if (base == fspec) {
+ PerlMem_free(unixified);
+ return 1;
+ }
tmplen = strlen(unixified);
- if (tmplen > reslen) return 0; /* not enough space */
+ if (tmplen > reslen) {
+ PerlMem_free(unixified);
+ return 0; /* not enough space */
+ }
/* Copy unixified resultant, including trailing NUL */
memmove(fspec,unixified,tmplen+1);
+ PerlMem_free(unixified);
return 1;
}
if ((*cp1 == '/') && !dirs--) /* postdec so we get front of rel path */
{ cp1++; break; }
if (cp1 != fspec) memmove(fspec,cp1, end - cp1 + 1);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
return 1;
}
else {
- char tpl[NAM$C_MAXRSS+1], lcres[NAM$C_MAXRSS+1];
+ char *tpl, *lcres;
char *front, *nextell, *lcend, *lcfront, *ellipsis = cp1;
int ells = 1, totells, segdirs, match;
- struct dsc$descriptor_s wilddsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, tpl},
+ struct dsc$descriptor_s wilddsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL},
resdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
while ((cp1 = strstr(ellipsis+4,".../")) != NULL) {ellipsis = cp1; ells++;}
totells = ells;
for (cp1 = ellipsis+4; *cp1; cp1++) if (*cp1 == '/') dirs++;
+ tpl = PerlMem_malloc(VMS_MAXRSS);
+ if (tpl == NULL) _ckvmssts(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
* ellipsis weren't there (i.e. return shortest possible path that
* could match template).
*/
- if (getcwd(tpl, sizeof tpl,0) == NULL) return 0;
+ if (getcwd(tpl, (VMS_MAXRSS - 1),0) == NULL) {
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ return 0;
+ }
if (!decc_efs_case_preserve) {
for (cp1 = tpl, cp2 = base; *cp1 && *cp2; cp1++,cp2++)
if (_tolower(*cp1) != _tolower(*cp2)) break;
segdirs = dirs - totells; /* Min # of dirs we must have left */
for (front = cp2+1; *front; front++) if (*front == '/') segdirs--;
if (*cp1 == '\0' && *cp2 == '/' && segdirs < 1) {
- memcpy(fspec,cp2+1,end - cp2);
+ memmove(fspec,cp2+1,end - cp2);
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
return 1;
}
}
for (front = end ; front >= base; front--)
if (*front == '/' && !dirs--) { front++; break; }
}
- if (!decc_efs_case_preserve) {
- for (cp1=template,cp2=lcres; *cp1 && cp2 <= lcres + sizeof lcres;
- cp1++,cp2++) *cp2 = _tolower(*cp1); /* Make lc copy for match */
+ lcres = PerlMem_malloc(VMS_MAXRSS);
+ if (lcres == NULL) _ckvmssts(SS$_INSFMEM);
+ for (cp1=template,cp2=lcres; *cp1 && cp2 <= lcres + (VMS_MAXRSS - 1);
+ cp1++,cp2++) {
+ if (!decc_efs_case_preserve) {
+ *cp2 = _tolower(*cp1); /* Make lc copy for match */
+ }
+ else {
+ *cp2 = *cp1;
+ }
+ }
+ if (cp1 != '\0') {
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ PerlMem_free(lcres);
+ return 0; /* Path too long. */
}
- if (cp1 != '\0') return 0; /* Path too long. */
lcend = cp2;
*cp2 = '\0'; /* Pick up with memcpy later */
lcfront = lcres + (front - base);
if (cp1 + 4 == ellipsis) { /* Consecutive ellipses */
ellipsis = cp1; continue;
}
+ wilddsc.dsc$a_pointer = tpl;
wilddsc.dsc$w_length = resdsc.dsc$w_length = ellipsis - 1 - cp1;
nextell = cp1;
for (segdirs = 0, cp2 = tpl;
- cp1 <= ellipsis - 1 && cp2 <= tpl + sizeof tpl;
+ cp1 <= ellipsis - 1 && cp2 <= tpl + (VMS_MAXRSS-1);
cp1++, cp2++) {
if (*cp1 == '?') *cp2 = '%'; /* Substitute VMS' wildcard for Unix' */
else {
}
if (*cp2 == '/') segdirs++;
}
- if (cp1 != ellipsis - 1) return 0; /* Path too long */
+ if (cp1 != ellipsis - 1) {
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ PerlMem_free(lcres);
+ return 0; /* Path too long */
+ }
/* Back up at least as many dirs as in template before matching */
for (cp1 = lcfront - 1; segdirs && cp1 >= lcres; cp1--)
if (*cp1 == '/' && !segdirs--) { cp1++; break; }
}
for ( ; cp1 >= lcres; cp1--) if (*cp1 == '/') { cp1++; break; }
}
- if (!match) return 0; /* Can't find prefix ??? */
+ if (!match) {
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ PerlMem_free(lcres);
+ return 0; /* Can't find prefix ??? */
+ }
if (match > 1 && opts & 1) {
/* This ... wildcard could cover more than one set of dirs (i.e.
* a set of similar dir names is repeated). If the template
*/
char def[NAM$C_MAXRSS+1], *st;
- if (getcwd(def, sizeof def,0) == NULL) return 0;
+ if (getcwd(def, sizeof def,0) == NULL) {
+ Safefree(unixified);
+ Safefree(unixwild);
+ Safefree(lcres);
+ Safefree(tpl);
+ return 0;
+ }
if (!decc_efs_case_preserve) {
for (cp1 = def, cp2 = base; *cp1 && *cp2; cp1++,cp2++)
if (_tolower(*cp1) != _tolower(*cp2)) break;
segdirs = dirs - totells; /* Min # of dirs we must have left */
for (st = cp2+1; *st; st++) if (*st == '/') segdirs--;
if (*cp1 == '\0' && *cp2 == '/') {
- memcpy(fspec,cp2+1,end - cp2);
+ memmove(fspec,cp2+1,end - cp2);
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ PerlMem_free(lcres);
return 1;
}
/* Nope -- stick with lcfront from above and keep going. */
}
}
- memcpy(fspec,base + (lcfront - lcres), lcend - lcfront + 1);
+ memmove(fspec,base + (lcfront - lcres), lcend - lcfront + 1);
+ PerlMem_free(tpl);
+ PerlMem_free(unixified);
+ PerlMem_free(unixwild);
+ PerlMem_free(lcres);
return 1;
ellipsis = nextell;
}
* Open a directory, return a handle for later use.
*/
/*{{{ DIR *opendir(char*name) */
-MY_DIR *
+DIR *
Perl_opendir(pTHX_ const char *name)
{
- MY_DIR *dd;
- char dir[NAM$C_MAXRSS+1];
+ DIR *dd;
+ char *dir;
Stat_t sb;
+ int unix_flag;
+
+ unix_flag = 0;
+ if (decc_efs_charset) {
+ unix_flag = is_unix_filespec(name);
+ }
- if (do_tovmspath(name,dir,0) == NULL) {
+ Newx(dir, VMS_MAXRSS, char);
+ if (do_tovmspath(name,dir,0,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;
}
if (flex_stat(dir,&sb) == -1) return NULL;
if (!S_ISDIR(sb.st_mode)) {
+ Safefree(dir);
set_errno(ENOTDIR); set_vaxc_errno(RMS$_DIR);
return NULL;
}
/* Get memory for the handle, and the pattern. */
- Newx(dd,1,MY_DIR);
+ Newx(dd,1,DIR);
Newx(dd->pattern,strlen(dir)+sizeof "*.*" + 1,char);
/* Fill in the fields; mainly playing with the descriptor. */
sprintf(dd->pattern, "%s*.*",dir);
+ Safefree(dir);
dd->context = 0;
dd->count = 0;
- dd->vms_wantversions = 0;
+ dd->flags = 0;
+ if (unix_flag)
+ 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;
*/
/*{{{ void vmsreaddirversions(DIR *dd, int flag)*/
void
-vmsreaddirversions(MY_DIR *dd, int flag)
+vmsreaddirversions(DIR *dd, int flag)
{
- dd->vms_wantversions = flag;
+ if (flag)
+ dd->flags |= PERL_VMSDIR_M_VERSIONS;
+ else
+ dd->flags &= ~PERL_VMSDIR_M_VERSIONS;
}
/*}}}*/
*/
/*{{{ void closedir(DIR *dd)*/
void
-Perl_closedir(MY_DIR *dd)
+Perl_closedir(DIR *dd)
{
int sts;
* Collect all the version numbers for the current file.
*/
static void
-collectversions(pTHX_ MY_DIR *dd)
+collectversions(pTHX_ DIR *dd)
{
struct dsc$descriptor_s pat;
struct dsc$descriptor_s res;
- struct my_dirent *e;
- char *p, *text, buff[sizeof dd->entry.d_name];
+ struct dirent *e;
+ char *p, *text, *buff;
int i;
unsigned long context, tmpsts;
pat.dsc$b_class = DSC$K_CLASS_S;
/* Set up result descriptor. */
+ Newx(buff, VMS_MAXRSS, char);
res.dsc$a_pointer = buff;
- res.dsc$w_length = sizeof buff - 2;
+ res.dsc$w_length = VMS_MAXRSS - 1;
res.dsc$b_dtype = DSC$K_DTYPE_T;
res.dsc$b_class = DSC$K_CLASS_S;
for (context = 0, e->vms_verscount = 0;
e->vms_verscount < VERSIZE(e);
e->vms_verscount++) {
- tmpsts = lib$find_file(&pat, &res, &context);
+ unsigned long rsts;
+ unsigned long flags = 0;
+
+#ifdef VMS_LONGNAME_SUPPORT
+ flags = LIB$M_FIL_LONG_NAMES;
+#endif
+ tmpsts = lib$find_file(&pat, &res, &context, NULL, NULL, &rsts, &flags);
if (tmpsts == RMS$_NMF || context == 0) break;
_ckvmssts(tmpsts);
- buff[sizeof buff - 1] = '\0';
+ buff[VMS_MAXRSS - 1] = '\0';
if ((p = strchr(buff, ';')))
e->vms_versions[e->vms_verscount] = atoi(p + 1);
else
_ckvmssts(lib$find_file_end(&context));
Safefree(text);
+ Safefree(buff);
} /* end of collectversions() */
* Read the next entry from the directory.
*/
/*{{{ struct dirent *readdir(DIR *dd)*/
-struct my_dirent *
-Perl_readdir(pTHX_ MY_DIR *dd)
+struct dirent *
+Perl_readdir(pTHX_ DIR *dd)
{
struct dsc$descriptor_s res;
- char *p, buff[sizeof dd->entry.d_name];
+ char *p, *buff;
unsigned long int tmpsts;
+ unsigned long rsts;
+ unsigned long flags = 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;
/* Set up result descriptor, and get next file. */
+ Newx(buff, VMS_MAXRSS, char);
res.dsc$a_pointer = buff;
- res.dsc$w_length = sizeof buff - 2;
+ res.dsc$w_length = VMS_MAXRSS - 1;
res.dsc$b_dtype = DSC$K_DTYPE_T;
res.dsc$b_class = DSC$K_CLASS_S;
- tmpsts = lib$find_file(&dd->pat, &res, &dd->context);
+
+#ifdef VMS_LONGNAME_SUPPORT
+ flags = LIB$M_FIL_LONG_NAMES;
+#endif
+
+ tmpsts = lib$find_file
+ (&dd->pat, &res, &dd->context, NULL, NULL, &rsts, &flags);
if ( tmpsts == RMS$_NMF || dd->context == 0) return NULL; /* None left. */
if (!(tmpsts & 1)) {
set_vaxc_errno(tmpsts);
default:
set_errno(EVMSERR);
}
+ Safefree(buff);
return NULL;
}
dd->count++;
/* Force the buffer to end with a NUL, and downcase name to match C convention. */
if (!decc_efs_case_preserve) {
- buff[sizeof buff - 1] = '\0';
+ buff[VMS_MAXRSS - 1] = '\0';
for (p = buff; *p; p++) *p = _tolower(*p);
- while (--p >= buff) if (!isspace(*p)) break; /* Do we really need this? */
- *p = '\0';
}
else {
/* we don't want to force to lowercase, just null terminate */
buff[res.dsc$w_length] = '\0';
}
- for (p = buff; *p; p++) *p = _tolower(*p);
while (--p >= buff) if (!isspace(*p)) break; /* Do we really need this? */
*p = '\0';
/* Skip any directory component and just copy the name. */
- if ((p = strchr(buff, ']'))) strcpy(dd->entry.d_name, p + 1);
- else strcpy(dd->entry.d_name, buff);
+ sts = vms_split_path
+ (buff,
+ &v_spec,
+ &v_len,
+ &r_spec,
+ &r_len,
+ &d_spec,
+ &d_len,
+ &n_spec,
+ &n_len,
+ &e_spec,
+ &e_len,
+ &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';
+ }
+
+ strncpy(dd->entry.d_name, n_spec, n_len + e_len);
+ dd->entry.d_name[n_len + e_len] = '\0';
+ dd->entry.d_namlen = strlen(dd->entry.d_name);
- /* Clobber the version. */
- if ((p = strchr(dd->entry.d_name, ';'))) *p = '\0';
+ /* Convert the filename to UNIX format if needed */
+ if (dd->flags & PERL_VMSDIR_M_UNIXSPECS) {
+
+ /* Translate the encoded 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;
+ /* fix-me */
+ /* if y > 1, then this is a wide file specification */
+ /* Wide file specifications need to be passed in Perl */
+ /* 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);
dd->entry.vms_verscount = 0;
- if (dd->vms_wantversions) collectversions(aTHX_ dd);
+ if (dd->flags & PERL_VMSDIR_M_VERSIONS) collectversions(aTHX_ dd);
+ Safefree(buff);
return &dd->entry;
} /* end of readdir() */
*/
/*{{{ int readdir_r(DIR *dd, struct dirent *entry, struct dirent **result)*/
int
-Perl_readdir_r(pTHX_ MY_DIR *dd, struct my_dirent *entry, struct my_dirent **result)
+Perl_readdir_r(pTHX_ DIR *dd, struct dirent *entry, struct dirent **result)
{
int retval;
*/
/*{{{ long telldir(DIR *dd)*/
long
-Perl_telldir(MY_DIR *dd)
+Perl_telldir(DIR *dd)
{
return dd->count;
}
*/
/*{{{ void seekdir(DIR *dd,long count)*/
void
-Perl_seekdir(pTHX_ MY_DIR *dd, long count)
+Perl_seekdir(pTHX_ DIR *dd, long count)
{
- int vms_wantversions;
+ int old_flags;
/* If we haven't done anything yet... */
if (dd->count == 0)
return;
/* Remember some state, and clear it. */
- vms_wantversions = dd->vms_wantversions;
- dd->vms_wantversions = 0;
+ old_flags = dd->flags;
+ dd->flags &= ~PERL_VMSDIR_M_VERSIONS;
_ckvmssts(lib$find_file_end(&dd->context));
dd->context = 0;
for (dd->count = 0; dd->count < count; )
readdir(dd);
- dd->vms_wantversions = vms_wantversions;
+ dd->flags = old_flags;
} /* end of seekdir() */
/*}}}*/
{
if (vmscmd) {
if (vmscmd->dsc$a_pointer) {
- Safefree(vmscmd->dsc$a_pointer);
+ PerlMem_free(vmscmd->dsc$a_pointer);
}
- Safefree(vmscmd);
+ PerlMem_free(vmscmd);
}
}
cmdlen += rlen ? rlen + 1 : 0;
}
}
- Newx(PL_Cmd,cmdlen+1,char);
+ Newx(PL_Cmd, cmdlen+1, char);
if (tmps && *tmps) {
strcpy(PL_Cmd,tmps);
int cmdlen;
register int isdcl;
- Newx(vmscmd,sizeof(struct dsc$descriptor_s),struct dsc$descriptor_s);
+ vmscmd = PerlMem_malloc(sizeof(struct dsc$descriptor_s));
+ if (vmscmd == NULL) _ckvmssts(SS$_INSFMEM);
/* Make a copy for modification */
cmdlen = strlen(incmd);
- Newx(cmd, cmdlen+1, char);
+ cmd = PerlMem_malloc(cmdlen+1);
+ if (cmd == NULL) _ckvmssts(SS$_INSFMEM);
strncpy(cmd, incmd, cmdlen);
cmd[cmdlen] = 0;
image_name[0] = 0;
if (suggest_quote) *suggest_quote = 0;
if (strlen(cmd) > MAX_DCL_LINE_LENGTH) {
+ PerlMem_free(cmd);
return CLI$_BUFOVF; /* continuation lines currently unsupported */
- Safefree(cmd);
}
s = cmd;
*rest && !isspace(*rest) && cp2 - resspec < sizeof resspec;
rest++, cp2++) *cp2 = *rest;
*cp2 = '\0';
- if (do_tovmsspec(resspec,cp,0)) {
+ if (do_tovmsspec(resspec,cp,0,NULL)) {
s = vmsspec;
if (*rest) {
for (cp2 = vmsspec + strlen(vmsspec);
}
if (!isdcl) {
+ int rsts;
imgdsc.dsc$a_pointer = s;
imgdsc.dsc$w_length = wordbreak - s;
- retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,0,&flags);
+ retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,&rsts,&flags);
if (!(retsts&1)) {
_ckvmssts(lib$find_file_end(&cxt));
- retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,0,&flags);
+ retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,&rsts,&flags);
if (!(retsts & 1) && *s == '$') {
_ckvmssts(lib$find_file_end(&cxt));
imgdsc.dsc$a_pointer++; imgdsc.dsc$w_length--;
- retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,0,&flags);
+ retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc,0,&rsts,&flags);
if (!(retsts&1)) {
_ckvmssts(lib$find_file_end(&cxt));
- retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,0,&flags);
+ retsts = lib$find_file(&imgdsc,&resdsc,&cxt,&defdsc2,0,&rsts,&flags);
}
}
}
/* Try to find the exact program requested to be run */
/*---------------------------------------------------*/
iname = do_rmsexpand
- (tmpspec, image_name, 0, ".exe", PERL_RMSEXPAND_M_VMS);
+ (tmpspec, image_name, 0, ".exe",
+ PERL_RMSEXPAND_M_VMS, NULL, NULL);
if (iname != NULL) {
- if (cando_by_name(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;
}
/* Try again with a null type */
/*----------------------------*/
iname = do_rmsexpand
- (tmpspec, image_name, 0, ".", PERL_RMSEXPAND_M_VMS);
+ (tmpspec, image_name, 0, ".",
+ PERL_RMSEXPAND_M_VMS, NULL, NULL);
if (iname != NULL) {
- if (cando_by_name(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;
}
if (check_img && isdcl) return RMS$_FNF;
if (cando_by_name(S_IXUSR,0,resspec)) {
- Newx(vmscmd->dsc$a_pointer, MAX_DCL_LINE_LENGTH ,char);
+ vmscmd->dsc$a_pointer = PerlMem_malloc(MAX_DCL_LINE_LENGTH);
+ if (vmscmd->dsc$a_pointer == NULL) _ckvmssts(SS$_INSFMEM);
if (!isdcl) {
strcpy(vmscmd->dsc$a_pointer,"$ MCR ");
if (image_name[0] != 0) {
retsts = CLI$_BUFOVF;
}
vmscmd->dsc$w_length = strlen(vmscmd->dsc$a_pointer);
- Safefree(cmd);
+ PerlMem_free(cmd);
return (vmscmd->dsc$w_length > MAX_DCL_LINE_LENGTH ? CLI$_BUFOVF : retsts);
}
- else retsts = RMS$_PRV;
+ else
+ retsts = RMS$_PRV;
}
}
/* It's either a DCL command or we couldn't find a suitable image */
vmscmd->dsc$w_length = strlen(cmd);
-/* if (cmd == PL_Cmd) {
- vmscmd->dsc$a_pointer = PL_Cmd;
- if (suggest_quote) *suggest_quote = 1;
- }
- else */
- vmscmd->dsc$a_pointer = savepvn(cmd,vmscmd->dsc$w_length);
- Safefree(cmd);
+ vmscmd->dsc$a_pointer = PerlMem_malloc(vmscmd->dsc$w_length + 1);
+ strncpy(vmscmd->dsc$a_pointer,cmd,vmscmd->dsc$w_length);
+ vmscmd->dsc$a_pointer[vmscmd->dsc$w_length] = 0;
+
+ PerlMem_free(cmd);
/* check if it's a symbol (for quoting purposes) */
if (suggest_quote && !*suggest_quote) {
bool
Perl_vms_do_aexec(pTHX_ SV *really,SV **mark,SV **sp)
{
+bool exec_sts;
+char * cmd;
+
if (sp > mark) {
if (vfork_called) { /* this follows a vfork - act Unixish */
vfork_called--;
else return do_aexec(really,mark,sp);
}
/* no vfork - act VMSish */
- return vms_do_exec(setup_argstr(aTHX_ really,mark,sp));
-
+ cmd = setup_argstr(aTHX_ really,mark,sp);
+ exec_sts = vms_do_exec(cmd);
+ Safefree(cmd); /* Clean up from setup_argstr() */
+ return exec_sts;
}
return FALSE;
unsigned long int
Perl_do_aspawn(pTHX_ void *really,void **mark,void **sp)
{
- if (sp > mark) return do_spawn(setup_argstr(aTHX_ (SV *)really,(SV **)mark,(SV **)sp));
+unsigned long int sts;
+char * cmd;
+ if (sp > mark) {
+ cmd = setup_argstr(aTHX_ (SV *)really,(SV **)mark,(SV **)sp);
+ sts = do_spawn(cmd);
+ /* pp_sys will clean up cmd */
+ return sts;
+ }
return SS$_ABORT;
} /* end of do_aspawn() */
/*}}}*/
{
unsigned long int sts, substs;
+ /* The caller of this routine expects to Safefree(PL_Cmd) */
+ Newx(PL_Cmd,10,char);
+
TAINT_ENV();
TAINT_PROPER("spawn");
if (!cmd || !*cmd) {
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;
#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)
/*{{{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,
struct dsc$descriptor fibdsc = {sizeof(myfib), DSC$K_DTYPE_Z, DSC$K_CLASS_S,(char *) &myfib},
devdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0},
fnmdsc = {0,DSC$K_DTYPE_T, DSC$K_CLASS_S,0};
-
+
if (file == NULL || *file == '\0') {
- set_errno(ENOENT);
- set_vaxc_errno(LIB$_INVARG);
+ SETERRNO(ENOENT, LIB$_INVARG);
return -1;
}
- if (do_tovmsspec(file,vmsspec,0) == NULL) 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, NULL) == 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).
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;
}
}
/* 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;
}
}
}
return 0;
+
+#endif /* #if __CRTL_VER >= 70300000 */
+
} /* end of my_utime() */
/*}}}*/
*
* 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.
*/
#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. */
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
f = 1;
i = 0;
for (q = dev + strlen(dev); q--; q >= dev) {
+ if (*q == ':')
+ break;
if (isdigit (*q))
c= (*q) - '0';
else if (isalpha (toupper (*q)))
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 char namecache[NAM$C_MAXRSS+1];
-
static int
is_null_device(name)
const char *name;
{
if (decc_bug_devnull != 0) {
- if (strcmp("/dev/null", name) == 0) /* temp hack */
+ if (strncmp("/dev/null", name, 9) == 0)
return 1;
}
/* The VMS null device is named "_NLA0:", usually abbreviated as "NL:".
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, Uid_t effective, const Stat_t *statbufp)
-{
- char fname_phdev[NAM$C_MAXRSS+1];
-#if __CRTL_VER >= 80200000 && !defined(__VAX)
- /* Namecache not workable with symbolic links, as symbolic links do
- * not have extensions and directories do in VMS mode. So in order
- * to test this, the did and ino_t must be used.
- *
- * Fix-me - Hide the information in the new stat structure
- * Get rid of the namecache.
- */
- if (decc_posix_compliant_pathnames == 0)
-#endif
- if (statbufp == &PL_statcache)
- return cando_by_name(bit,effective,namecache);
- {
- char fname[NAM$C_MAXRSS+1];
- unsigned long int retsts;
- struct dsc$descriptor_s devdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0},
- namdsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
-
- /* If the struct mystat is stale, we're OOL; stat() overwrites the
- device name on successive calls */
- devdsc.dsc$a_pointer = ((Stat_t *)statbufp)->st_devnam;
- devdsc.dsc$w_length = strlen(((Stat_t *)statbufp)->st_devnam);
- namdsc.dsc$a_pointer = fname;
- namdsc.dsc$w_length = sizeof fname - 1;
-
- retsts = lib$fid_to_name(&devdsc,&(((Stat_t *)statbufp)->st_ino),
- &namdsc,&namdsc.dsc$w_length,0,0);
- if (retsts & 1) {
- fname[namdsc.dsc$w_length] = '\0';
-/*
- * lib$fid_to_name returns DVI$_LOGVOLNAM as the device part of the name,
- * but if someone has redefined that logical, Perl gets very lost. Since
- * we have the physical device name from the stat buffer, just paste it on.
- */
- strcpy( fname_phdev, statbufp->st_devnam );
- strcat( fname_phdev, strrchr(fname, ':') );
-
- return cando_by_name(bit,effective,fname_phdev);
- }
- else if (retsts == SS$_NOSUCHDEV || retsts == SS$_NOSUCHFILE) {
- Perl_warn(aTHX_ "Can't get filespec - stale stat buffer?\n");
- return FALSE;
- }
- _ckvmssts(retsts);
- return FALSE; /* Should never get to here */
- }
-} /* end of cando() */
-/*}}}*/
-
-/*{{{I32 cando_by_name(I32 bit, Uid_t effective, char *fname)*/
-I32
-Perl_cando_by_name(pTHX_ I32 bit, Uid_t 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 =
{0, DSC$K_DTYPE_T, DSC$K_CLASS_S, usrname};
- char vmsname[NAM$C_MAXRSS+1], fileified[NAM$C_MAXRSS+1];
- unsigned long int objtyp = ACL$C_FILE, access, retsts, privused, iosb[2];
+ char vmsname[NAM$C_MAXRSS+1];
+ char *fileified;
+ 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}};
if (!fname || !*fname) return FALSE;
/* Make sure we expand logical names, since sys$check_access doesn't */
- if (!strpbrk(fname,"/]>:")) {
- strcpy(fileified,fname);
- trnlnm_iter_count = 0;
- while (!strpbrk(fileified,"/]>:>") && my_trnlnm(fileified,fileified,0)) {
+
+ fileified = NULL;
+ if ((opts & PERL_RMSEXPAND_M_VMS_IN) != 0) {
+ fileified = PerlMem_malloc(VMS_MAXRSS);
+ if (!strpbrk(fname,"/]>:")) {
+ 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;
}
- fname = fileified;
- }
- if (!do_tovmsspec(fname,vmsname,1)) return FALSE;
- retlen = namdsc.dsc$w_length = strlen(vmsname);
- namdsc.dsc$a_pointer = vmsname;
- if (vmsname[retlen-1] == ']' || vmsname[retlen-1] == '>' ||
+ if (!do_rmsexpand(fname, vmsname, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL)) {
+ PerlMem_free(fileified);
+ return FALSE;
+ }
+ retlen = namdsc.dsc$w_length = strlen(vmsname);
+ namdsc.dsc$a_pointer = vmsname;
+ if (vmsname[retlen-1] == ']' || vmsname[retlen-1] == '>' ||
vmsname[retlen-1] == ':') {
- if (!do_fileify_dirspec(vmsname,fileified,1)) return FALSE;
- namdsc.dsc$w_length = strlen(fileified);
- namdsc.dsc$a_pointer = fileified;
+ if (!do_fileify_dirspec(vmsname,fileified,1,NULL)) return FALSE;
+ namdsc.dsc$w_length = strlen(fileified);
+ namdsc.dsc$a_pointer = fileified;
+ }
+ }
+ else {
+ retlen = namdsc.dsc$w_length = strlen(fname);
+ namdsc.dsc$a_pointer = (char *)fname; /* cast ok */
}
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:
+ if (fileified != NULL)
+ PerlMem_free(fileified);
return FALSE;
}
&usrprodsc.dsc$w_length,0));
/* allocate space for the profile and get it filled in */
- Newx(usrprodsc.dsc$a_pointer,usrprodsc.dsc$w_length,char);
+ 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));
/* use the profile to check access to the file; free profile & analyze results */
retsts = sys$check_access(&objtyp,&namdsc,0,armlst,0,0,0,&usrprodsc);
- Safefree(usrprodsc.dsc$a_pointer);
+ PerlMem_free(usrprodsc.dsc$a_pointer);
if (retsts == SS$_NOCALLPRIV) retsts = SS$_NOPRIV; /* not really 3rd party */
#else
if (retsts == SS$_NOPRIV) set_errno(EACCES);
else if (retsts == SS$_INVFILFOROP) set_errno(EINVAL);
else set_errno(ENOENT);
+ if (fileified != NULL)
+ PerlMem_free(fileified);
return FALSE;
}
if (retsts == SS$_NORMAL || retsts == SS$_ACCONFLICT) {
+ if (fileified != NULL)
+ PerlMem_free(fileified);
return TRUE;
}
_ckvmssts(retsts);
+ if (fileified != NULL)
+ PerlMem_free(fileified);
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() */
+/*}}}*/
+
+
+/*{{{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() */
/*}}}*/
Perl_flex_fstat(pTHX_ int fd, Stat_t *statbufp)
{
if (!fstat(fd,(stat_t *) statbufp)) {
- if (statbufp == (Stat_t *) &PL_statcache) {
char *cptr;
+ char *vms_filename;
+ vms_filename = PerlMem_malloc(VMS_MAXRSS);
+ if (vms_filename == NULL) _ckvmssts(SS$_INSFMEM);
- /* Save name for cando by name in VMS format */
- cptr = getname(fd, namecache, 1);
+ /* Save name for cando by name in VMS format */
+ cptr = getname(fd, vms_filename, 1);
- /* This should not happen, but just in case */
+ /* This should not happen, but just in case */
+ if (cptr == NULL) {
+ statbufp->st_devnam[0] = 0;
+ }
+ else {
+ /* Make sure that the saved name fits in 255 characters */
+ cptr = do_rmsexpand
+ (vms_filename,
+ statbufp->st_devnam,
+ 0,
+ NULL,
+ PERL_RMSEXPAND_M_VMS | PERL_RMSEXPAND_M_VMS_IN,
+ NULL,
+ NULL);
if (cptr == NULL)
- namecache[0] = '\0';
+ statbufp->st_devnam[0] = 0;
}
-#ifdef _USE_STD_STAT
- memcpy(&statbufp->st_ino, &statbufp->crtl_stat.st_ino, 8);
-#else
- memcpy(&statbufp->st_ino, statbufp->crtl_stat.st_ino, 8);
-#endif
-#ifndef _USE_STD_STAT
- strncpy(statbufp->st_devnam, statbufp->crtl_stat.st_dev, 63);
- statbufp->st_devnam[63] = 0;
- statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam);
-#else
- /* todo:
- * The device is only encoded so that Perl_cando can use it to
- * look up ACLS. So rmsexpand it to the 255 character version
- * and store it in ->st_devnam. rmsexpand needs to be fixed
- * for long filenames and symbolic links first. This also seems
- * to remove the need for a namecache that could be stale.
- */
-#endif
+ PerlMem_free(vms_filename);
+
+ VMS_INO_T_COPY(statbufp->st_ino, statbufp->crtl_stat.st_ino);
+ VMS_DEVICE_ENCODE
+ (statbufp->st_dev, statbufp->st_devnam, statbufp->crtl_stat.st_dev);
# ifdef RTL_USES_UTC
# ifdef VMSISH_TIME
static int
Perl_flex_stat_int(pTHX_ const char *fspec, Stat_t *statbufp, int lstat_flag)
{
- char fileified[NAM$C_MAXRSS+1];
- char temp_fspec[NAM$C_MAXRSS+300];
+ char fileified[VMS_MAXRSS];
+ char temp_fspec[VMS_MAXRSS];
+ char *save_spec;
int retval = -1;
int saved_errno, saved_vaxc_errno;
if (!fspec) return retval;
saved_errno = errno; saved_vaxc_errno = vaxc$errno;
strcpy(temp_fspec, fspec);
- if (statbufp == (Stat_t *) &PL_statcache)
- do_tovmsspec(temp_fspec,namecache,0);
+
if (decc_bug_devnull != 0) {
if (is_null_device(temp_fspec)) { /* Fake a stat() for the null device */
memset(statbufp,0,sizeof *statbufp);
- statbufp->st_dev = encode_dev(aTHX_ "_NLA0:");
+ 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;
#if __CRTL_VER >= 80200000 && !defined(__VAX)
if (decc_posix_compliant_pathnames == 0) {
#endif
- if (do_fileify_dirspec(temp_fspec,fileified,0) != NULL) {
+ if (do_fileify_dirspec(temp_fspec,fileified,0,NULL) != NULL) {
if (lstat_flag == 0)
retval = stat(fileified,(stat_t *) statbufp);
else
retval = lstat(fileified,(stat_t *) statbufp);
- if (!retval && statbufp == (Stat_t *) &PL_statcache)
- strcpy(namecache,fileified);
+ save_spec = fileified;
}
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;
}
#if __CRTL_VER >= 80200000 && !defined(__VAX)
} else {
retval = stat(temp_fspec,(stat_t *) statbufp);
else
retval = lstat(temp_fspec,(stat_t *) statbufp);
+ save_spec = temp_fspec;
}
#endif
if (!retval) {
-#ifdef _USE_STD_STAT
- memcpy(&statbufp->st_ino, &statbufp->crtl_stat.st_ino, 8);
-#else
- memcpy(&statbufp->st_ino, statbufp->crtl_stat.st_ino, 8);
-#endif
-#ifndef _USE_STD_STAT
- strncpy(statbufp->st_devnam, statbufp->crtl_stat.st_dev, 63);
- statbufp->st_devnam[63] = 0;
- statbufp->st_dev = encode_dev(aTHX_ statbufp->st_devnam);
-#else
- /* todo:
- * The device is only encoded so that Perl_cando can use it to
- * look up ACLS. So rmsexpand it to the 255 character version
- * and store it in ->st_devnam. rmsexpand needs to be fixed
- * for long filenames and symbolic links first. This also seems
- * to remove the need for a namecache that could be stale.
- */
-#endif
+ char * cptr;
+ cptr = do_rmsexpand
+ (save_spec, statbufp->st_devnam, 0, NULL, PERL_RMSEXPAND_M_VMS, NULL, NULL);
+ if (cptr == NULL)
+ statbufp->st_devnam[0] = 0;
+
+ VMS_INO_T_COPY(statbufp->st_ino, statbufp->crtl_stat.st_ino);
+ VMS_DEVICE_ENCODE
+ (statbufp->st_dev, statbufp->st_devnam, statbufp->crtl_stat.st_dev);
# ifdef RTL_USES_UTC
# ifdef VMSISH_TIME
if (VMSISH_TIME) {
* as part of the Perl standard distribution under the terms of the
* GNU General Public License or the Perl Artistic License. Copies
* of each may be found in the Perl standard distribution.
- */
+ */ /* FIXME */
/*{{{int rmscopy(char *src, char *dst, int preserve_dates)*/
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];
+ char *vmsin, * vmsout, *esa, *esa_out,
+ *rsa, *ubf;
unsigned long int i, sts, sts2;
+ int dna_len;
struct FAB fab_in, fab_out;
struct RAB rab_in, rab_out;
- struct NAM nam;
+ rms_setup_nam(nam);
+ rms_setup_nam(nam_out);
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)) {
+ vmsin = PerlMem_malloc(VMS_MAXRSS);
+ if (vmsin == NULL) _ckvmssts(SS$_INSFMEM);
+ vmsout = PerlMem_malloc(VMS_MAXRSS);
+ if (vmsout == NULL) _ckvmssts(SS$_INSFMEM);
+ if (!spec_in || !*spec_in || !do_tovmsspec(spec_in,vmsin,1,NULL) ||
+ !spec_out || !*spec_out || !do_tovmsspec(spec_out,vmsout,1,NULL)) {
+ PerlMem_free(vmsin);
+ PerlMem_free(vmsout);
set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG);
return 0;
}
+ esa = PerlMem_malloc(VMS_MAXRSS);
+ if (esa == NULL) _ckvmssts(SS$_INSFMEM);
fab_in = cc$rms_fab;
- fab_in.fab$l_fna = vmsin;
- fab_in.fab$b_fns = 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_nam = &nam;
+ rms_bind_fab_nam(fab_in, 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;
+ rsa = PerlMem_malloc(VMS_MAXRSS);
+ if (rsa == NULL) _ckvmssts(SS$_INSFMEM);
+ rms_set_rsa(nam, rsa, (VMS_MAXRSS-1));
+ rms_set_esa(fab_in, nam, esa, (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.nam$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 */
xabsum = cc$rms_xabsum; /* To get key and area information */
if (!((sts = sys$open(&fab_in)) & 1)) {
+ PerlMem_free(vmsin);
+ PerlMem_free(vmsout);
+ PerlMem_free(esa);
+ PerlMem_free(rsa);
set_vaxc_errno(sts);
switch (sts) {
case RMS$_FNF: case RMS$_DNF:
return 0;
}
+ nam_out = nam;
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;
+ 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(VMS_MAXRSS);
+ if (esa_out == NULL) _ckvmssts(SS$_INSFMEM);
+ rms_set_rsa(nam_out, NULL, 0);
+ rms_set_esa(fab_out, nam_out, esa_out, (VMS_MAXRSS - 1));
if (preserve_dates == 0) { /* Act like DCL COPY */
- nam.nam$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);
+ PerlMem_free(rsa);
+ PerlMem_free(esa_out);
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;
+ if (rms_is_nam_fnb(nam, 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)) {
+ if (!((sts = sys$create(&fab_out)) & STS$K_SUCCESS)) {
+ PerlMem_free(vmsin);
+ PerlMem_free(vmsout);
+ PerlMem_free(esa);
+ PerlMem_free(rsa);
+ PerlMem_free(esa_out);
set_vaxc_errno(sts);
switch (sts) {
case RMS$_DNF:
fab_out.fab$l_xab = (void *) &xabrdt;
}
+ ubf = PerlMem_malloc(32256);
+ if (ubf == NULL) _ckvmssts(SS$_INSFMEM);
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;
+ rab_in.rab$w_usz = 32256;
if (!((sts = sys$connect(&rab_in)) & 1)) {
sys$close(&fab_in); sys$close(&fab_out);
+ 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;
}
rab_out.rab$l_rbf = ubf;
if (!((sts = sys$connect(&rab_out)) & 1)) {
sys$close(&fab_in); sys$close(&fab_out);
+ 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;
}
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);
+ 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;
}
}
+
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(rsa);
+ PerlMem_free(esa_out);
return 1;
} /* end of rmscopy() */
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
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);
}
candelete_fromperl(pTHX_ CV *cv)
{
dXSARGS;
- char fspec[NAM$C_MAXRSS+1], *fsp;
+ char *fspec, *fsp;
SV *mysv;
IO *io;
STRLEN n_a;
if (items != 1) Perl_croak(aTHX_ "Usage: VMS::Filespec::candelete(spec)");
mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0);
+ Newx(fspec, VMS_MAXRSS, char);
+ if (fspec == NULL) _ckvmssts(SS$_INSFMEM);
if (SvTYPE(mysv) == SVt_PVGV) {
if (!(io = GvIOp(mysv)) || !PerlIO_getname(IoIFP(io),fspec)) {
set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG);
ST(0) = &PL_sv_no;
+ Safefree(fspec);
XSRETURN(1);
}
fsp = fspec;
if (mysv != ST(0) || !(fsp = SvPV(mysv,n_a)) || !*fsp) {
set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG);
ST(0) = &PL_sv_no;
+ Safefree(fspec);
XSRETURN(1);
}
}
ST(0) = boolSV(cando_by_name(S_IDUSR,0,fsp));
+ Safefree(fspec);
XSRETURN(1);
}
rmscopy_fromperl(pTHX_ CV *cv)
{
dXSARGS;
- char inspec[NAM$C_MAXRSS+1], outspec[NAM$C_MAXRSS+1], *inp, *outp;
+ char *inspec, *outspec, *inp, *outp;
int date_flag;
struct dsc$descriptor indsc = { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0},
outdsc = { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
Perl_croak(aTHX_ "Usage: File::Copy::rmscopy(from,to[,date_flag])");
mysv = SvROK(ST(0)) ? SvRV(ST(0)) : ST(0);
+ Newx(inspec, VMS_MAXRSS, char);
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;
+ Safefree(inspec);
XSRETURN(1);
}
inp = inspec;
if (mysv != ST(0) || !(inp = SvPV(mysv,n_a)) || !*inp) {
set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG);
ST(0) = &PL_sv_no;
+ Safefree(inspec);
XSRETURN(1);
}
}
mysv = SvROK(ST(1)) ? SvRV(ST(1)) : ST(1);
+ Newx(outspec, VMS_MAXRSS, char);
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;
+ Safefree(inspec);
+ Safefree(outspec);
XSRETURN(1);
}
outp = outspec;
if (mysv != ST(1) || !(outp = SvPV(mysv,n_a)) || !*outp) {
set_errno(EINVAL); set_vaxc_errno(LIB$_INVARG);
ST(0) = &PL_sv_no;
+ Safefree(inspec);
+ Safefree(outspec);
XSRETURN(1);
}
}
date_flag = (items == 3) ? SvIV(ST(2)) : 0;
ST(0) = boolSV(rmscopy(inp,outp,date_flag));
+ Safefree(inspec);
+ Safefree(outspec);
XSRETURN(1);
}
-
+/* The mod2fname is limited to shorter filenames by design, so it should
+ * not be modified to support longer EFS pathnames
+ */
void
mod2fname(pTHX_ CV *cv)
{
XSRETURN(1);
}
+
+PerlIO *
+Perl_vms_start_glob
+ (pTHX_ SV *tmpglob,
+ IO *io)
+{
+ PerlIO *fp;
+ struct vs_str_st *rslt;
+ char *vmsspec;
+ char *rstr;
+ char *begin, *cp;
+ $DESCRIPTOR(dfltdsc,"SYS$DISK:[]*.*;");
+ PerlIO *tmpfp;
+ STRLEN i;
+ struct dsc$descriptor_s wilddsc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+ struct dsc$descriptor_vs rsdsc;
+ unsigned long int cxt = 0, sts = 0, ok = 1, hasdir = 0;
+ unsigned long hasver = 0, isunix = 0;
+ unsigned long int lff_flags = 0;
+ int rms_sts;
+
+#ifdef VMS_LONGNAME_SUPPORT
+ lff_flags = LIB$M_FIL_LONG_NAMES;
+#endif
+ /* The Newx macro will not allow me to assign a smaller array
+ * to the rslt pointer, so we will assign it to the begin char pointer
+ * and then copy the value into the rslt pointer.
+ */
+ Newx(begin, VMS_MAXRSS + sizeof(unsigned short int), char);
+ rslt = (struct vs_str_st *)begin;
+ rslt->length = 0;
+ rstr = &rslt->str[0];
+ rsdsc.dsc$a_pointer = (char *) rslt; /* cast required */
+ rsdsc.dsc$w_maxstrlen = VMS_MAXRSS + sizeof(unsigned short int);
+ rsdsc.dsc$b_dtype = DSC$K_DTYPE_VT;
+ rsdsc.dsc$b_class = DSC$K_CLASS_VS;
+
+ Newx(vmsspec, VMS_MAXRSS, char);
+
+ /* We could find out if there's an explicit dev/dir or version
+ by peeking into lib$find_file's internal context at
+ ((struct NAM *)((struct FAB *)cxt)->fab$l_nam)->nam$l_fnb
+ but that's unsupported, so I don't want to do it now and
+ have it bite someone in the future. */
+ /* Fix-me: vms_split_path() is the only way to do this, the
+ existing method will fail with many legal EFS or UNIX specifications
+ */
+
+ cp = SvPV(tmpglob,i);
+
+ for (; i; i--) {
+ if (cp[i] == ';') hasver = 1;
+ if (cp[i] == '.') {
+ if (sts) hasver = 1;
+ else sts = 1;
+ }
+ if (cp[i] == '/') {
+ hasdir = isunix = 1;
+ break;
+ }
+ if (cp[i] == ']' || cp[i] == '>' || cp[i] == ':') {
+ hasdir = 1;
+ break;
+ }
+ }
+ if ((tmpfp = PerlIO_tmpfile()) != NULL) {
+ 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_utf8(SvPVX(tmpglob),vmsspec,NULL);
+ ok = (wilddsc.dsc$a_pointer != NULL);
+ }
+ else {
+ wilddsc.dsc$a_pointer = tovmsspec_utf8(SvPVX(tmpglob),vmsspec,NULL);
+ ok = (wilddsc.dsc$a_pointer != NULL);
+ }
+ if (ok)
+ wilddsc.dsc$w_length = strlen(wilddsc.dsc$a_pointer);
+
+ /* 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 = '%';
+ }
+ 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;
+
+ sts = lib$find_file(&wilddsc,&rsdsc,&cxt,
+ &dfltdsc,NULL,&rms_sts,&lff_flags);
+ if (!$VMS_STATUS_SUCCESS(sts))
+ break;
+
+ /* with varying string, 1st word of buffer contains result length */
+ rstr[rslt->length] = '\0';
+
+ /* Find where all the components are */
+ v_sts = vms_split_path
+ (rstr,
+ &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 no version on input, truncate the version on output */
+ if (!hasver && (vs_len > 0)) {
+ *vs_spec = '\0';
+ vs_len = 0;
+
+ /* No version & a null extension on UNIX handling */
+ if (isunix && (e_len == 1) && decc_readdir_dropdotnotype) {
+ e_len = 0;
+ *e_spec = '\0';
+ }
+ }
+
+ if (!decc_efs_case_preserve) {
+ 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);
+ }
+ if (cxt) (void)lib$find_file_end(&cxt);
+ if (ok && sts != RMS$_NMF &&
+ sts != RMS$_DNF && sts != RMS_FNF) ok = 0;
+ if (!ok) {
+ if (!(sts & 1)) {
+ SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts);
+ }
+ PerlIO_close(tmpfp);
+ fp = NULL;
+ }
+ else {
+ PerlIO_rewind(tmpfp);
+ IoTYPE(io) = IoTYPE_RDONLY;
+ IoIFP(io) = fp = tmpfp;
+ IoFLAGS(io) &= ~IOf_UNTAINT; /* maybe redundant */
+ }
+ }
+ Safefree(vmsspec);
+ Safefree(rslt);
+ return fp;
+}
+
#ifdef HAS_SYMLINK
static char *
-mp_do_vms_realpath(pTHX_ const char *filespec, char * rslt_spec);
+mp_do_vms_realpath(pTHX_ const char *filespec, char * rslt_spec, const int *utf8_fl);
void
vms_realpath_fromperl(pTHX_ CV *cv)
if (!fspec || !*fspec) XSRETURN_UNDEF;
Newx(rslt_spec, VMS_MAXRSS + 1, char);
- rslt = do_vms_realpath(fspec, rslt_spec);
+ rslt = do_vms_realpath(fspec, rslt_spec, NULL);
ST(0) = sv_newmortal();
if (rslt != NULL)
sv_usepvn(ST(0),rslt,strlen(rslt));
{
dTHX;
char* file = __FILE__;
- char temp_buff[512];
- if (my_trnlnm("DECC$DISABLE_TO_VMS_LOGNAME_TRANSLATION", temp_buff, 0)) {
+ if (decc_disable_to_vms_logname_translation) {
no_translate_barewords = TRUE;
} else {
no_translate_barewords = FALSE;
* on OpenVMS.
*/
static char *
-mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf)
+mp_do_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl)
{
return realpath(filespec, outbuf);
}
/*}}}*/
/* External entry points */
-char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf)
-{ return do_vms_realpath(filespec, outbuf); }
+char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl)
+{ return do_vms_realpath(filespec, outbuf, utf8_fl); }
#else
-char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf)
+char *Perl_vms_realpath(pTHX_ const char *filespec, char *outbuf, int *utf8_fl)
{ return NULL; }
#endif
return ret_val;
}
-
/* C RTL Feature settings */
static int set_features
int dflt;
char* str;
char val_str[10];
+#if defined(JPI$_CASE_LOOKUP_PERM) && !defined(__VAX)
const unsigned long int jpicode1 = JPI$_CASE_LOOKUP_PERM;
const unsigned long int jpicode2 = JPI$_CASE_LOOKUP_IMAGE;
unsigned long case_perm;
unsigned long case_image;
+#endif
+
+ /* Allow an exception to bring Perl into the VMS debugger */
+ vms_debug_on_exception = 0;
+ status = sys_trnlnm("PERL_VMS_EXCEPTION_DEBUG", val_str, sizeof(val_str));
+ if ($VMS_STATUS_SUCCESS(status)) {
+ if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T'))
+ vms_debug_on_exception = 1;
+ else
+ vms_debug_on_exception = 0;
+ }
+
+ /* Create VTF-7 filenames from UNICODE instead of UTF-8 */
+ vms_vtf7_filenames = 0;
+ status = sys_trnlnm("PERL_VMS_VTF7_FILENAMES", val_str, sizeof(val_str));
+ if ($VMS_STATUS_SUCCESS(status)) {
+ if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T'))
+ vms_vtf7_filenames = 1;
+ else
+ vms_vtf7_filenames = 0;
+ }
+
+ /* Dectect running under GNV Bash or other UNIX like shell */
+#if __CRTL_VER >= 70300000 && !defined(__VAX)
+ gnv_unix_shell = 0;
+ status = sys_trnlnm("GNV$UNIX_SHELL", val_str, sizeof(val_str));
+ if ($VMS_STATUS_SUCCESS(status)) {
+ if ((val_str[0] == 'E') || (val_str[0] == '1') || (val_str[0] == 'T')) {
+ gnv_unix_shell = 1;
+ set_feature_default("DECC$EFS_CASE_PRESERVE", 1);
+ set_feature_default("DECC$EFS_CHARSET", 1);
+ set_feature_default("DECC$FILENAME_UNIX_NO_VERSION", 1);
+ set_feature_default("DECC$FILENAME_UNIX_REPORT", 1);
+ set_feature_default("DECC$READDIR_DROPDOTNOTYPE", 1);
+ set_feature_default("DECC$DISABLE_POSIX_ROOT", 0);
+ }
+ else
+ gnv_unix_shell = 0;
+ }
+#endif
/* hacks to see if known bugs are still present for testing */
if ($VMS_STATUS_SUCCESS(status)) {
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 */
}
#endif
-#ifndef __VAX
+#if defined(JPI$_CASE_LOOKUP_PERM) && !defined(__VAX)
/* Report true case tolerance */
/*----------------------------*/
projects / p5sagit/p5-mst-13.2.git / blobdiff