#define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVID + ADEDLEN_PRIVID)
/* ad:ea */
-#define ADEDOFF_FINDERI_EA (AD_HEADER_LEN + ADEID_NUM_EA * AD_ENTRY_LEN)
-#define ADEDOFF_COMMENT_EA (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
+#define ADEDOFF_FINDERI_EA (AD_HEADER_LEN + ADEID_NUM_EA * AD_ENTRY_LEN)
+#define ADEDOFF_COMMENT_EA (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
#define ADEDOFF_FILEDATESI_EA (ADEDOFF_COMMENT_EA + ADEDLEN_COMMENT)
-#define ADEDOFF_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#define ADEDOFF_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#define ADEDOFF_PRIVID_EA (ADEDOFF_AFPFILEI_EA + ADEDLEN_AFPFILEI)
/* this is to prevent changing timezones from causing problems with
localtime volumes. the screw-up is 30 years. we use a delta of 5 years */
{ADEID_COMMENT, ADEDOFF_COMMENT_EA, ADEDLEN_INIT},
{ADEID_FILEDATESI, ADEDOFF_FILEDATESI_EA, ADEDLEN_FILEDATESI},
{ADEID_AFPFILEI, ADEDOFF_AFPFILEI_EA, ADEDLEN_AFPFILEI},
- {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT},
+ {ADEID_PRIVID, ADEDOFF_PRIVID_EA, ADEDLEN_INIT},
{0, 0, 0}
};
oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~(O_CREAT | O_TRUNC));
+ if (ad_meta_fileno(ad) == -2)
+ /* symlink */
+ EC_EXIT;
+
if (ad_meta_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
if ((oflags & O_RDWR) &&
/* For directories we open the directory RDONYL so we can later fchdir() */
oflags = (oflags & ~O_RDWR) | O_RDONLY;
LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): opening base file for meta adouble EA", path);
- EC_NEG1(ad_meta_fileno(ad) = open(path, oflags));
+ EC_NEG1_LOG(ad_meta_fileno(ad) = open(path, oflags));
opened = 1;
ad->ad_mdp->adf_flags = oflags;
}
/* Read the adouble header in and parse it.*/
if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) {
if (!(adflags & ADFLAGS_CREATE)) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path);
errno = ENOENT;
EC_FAIL;
}
LOG(log_debug, logtype_default, "ad_reso_size(\"%s\")", path);
#ifdef HAVE_EAFD
- int opened = 0;
- int eafd = ad_reso_fileno(ad);
- if (eafd == -1) {
- EC_NEG1( eafd = sys_getxattrfd(path, AD_EA_RESO, O_RDONLY) );
- opened = 1;
+ ssize_t easz;
+
+ if (ad_reso_fileno(ad) != -1) {
+ EC_NEG1( fstat(ad_reso_fileno(ad), &st) );
+ ad->ad_rlen = st.st_size;
+ } else if (ad_meta_fileno(ad) != -1) {
+ EC_NEG1( easz = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0) );
+ ad->ad_rlen = easz;
+ } else {
+ EC_FAIL;
}
- EC_NEG1( rlen = fstat(eafd, &st) );
- ad->ad_rlen = st.st_size;
+
#else
const char *rfpath;
EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags));
LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen);
EC_CLEANUP:
-#ifdef HAVE_EAFD
- if (opened)
- close(eafd);
-#endif
if (ret != 0)
ad->ad_rlen = 0;
EC_EXIT;
goto EC_CLEANUP;
}
#ifdef HAVE_EAFD
- if ((ad_reso_fileno(ad) = sys_getxattrfd(path, oflags)) == -1) {
- if (!(adflags & ADFLAGS_CREATE))
+ if (ad_meta_fileno(ad) == -1)
+ EC_FAIL;
+ if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) {
+ if (!(adflags & ADFLAGS_CREATE)) {
+ errno = ENOENT;
EC_FAIL;
+ }
oflags |= O_CREAT;
- EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(path, oflags, 0666) );
+ EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad),
+ AD_EA_RESO, oflags, 0666) );
}
#else
EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags) );
if (AD_RSRC_OPEN(ad)) {
if (ad_reso_fileno(ad) == -1)
return -1;
- ssize_t len;
- if ((len = fstat(ad_reso_fileno(ad))) == -1)
+ struct stat st;
+ if (fstat(ad_reso_fileno(ad), &st) == -1)
return -1;
- ad->ad_rlen = len;
+ ad->ad_rlen = st.st_size;
}
#else
if (AD_META_OPEN(ad)) {