static int ad_header_read(const char *path, struct adouble *ad, const struct stat *hst);
static int ad_header_upgrade(struct adouble *ad, const char *name);
+#ifdef HAVE_EAFD
static int ad_mkrf_ea(const char *path);
+#endif
static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst);
static int ad_header_upgrade_ea(struct adouble *ad, const char *name);
-static int ad_reso_size(const char *path, int adflags, struct adouble *ad);
+off_t ad_reso_size(const char *path, int adflags, struct adouble *ad);
static int ad_mkrf_osx(const char *path);
uint16_t ashort;
struct stat st;
- LOG(log_debug, logtype_default, "new_ad_header(\"%s\")", path);
+ LOG(log_debug, logtype_ad, "new_ad_header(\"%s\")", path);
if (ad->ad_magic == AD_MAGIC) {
- LOG(log_debug, logtype_default, "new_ad_header(\"%s\"): already initialized", path);
+ LOG(log_debug, logtype_ad, "new_ad_header(\"%s\"): already initialized", path);
return 0;
}
ad->ad_eid[ eid ].ade_len = len;
} else if (!warning) {
warning = 1;
- LOG(log_warning, logtype_default, "parse_entries: bogus eid: %d", eid);
+ LOG(log_warning, logtype_ad, "parse_entries: bogus eid: %d", eid);
}
}
}
ad->ad_version = ntohl( ad->ad_version );
if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) {
- LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header.");
+ LOG(log_error, logtype_ad, "ad_open: can't parse AppleDouble header.");
errno = EIO;
return -1;
}
buf += AD_HEADER_LEN;
if (len > header_len - AD_HEADER_LEN) {
- LOG(log_error, logtype_default, "ad_header_read: can't read entry info.");
+ LOG(log_error, logtype_ad, "ad_header_read: can't read entry info.");
errno = EIO;
return -1;
}
if (!ad_getentryoff(ad, ADEID_RFORK)
|| (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data))
) {
- LOG(log_error, logtype_default, "ad_header_read: problem with rfork entry offset.");
+ LOG(log_error, logtype_ad, "ad_header_read: problem with rfork entry offset.");
errno = EIO;
return -1;
}
if (ad_getentryoff(ad, ADEID_RFORK) > header_len) {
- LOG(log_error, logtype_default, "ad_header_read: can't read in entries.");
+ LOG(log_error, logtype_ad, "ad_header_read: can't read in entries.");
errno = EIO;
return -1;
}
char *buf = &adosx.ad_data[0];
ssize_t header_len;
- LOG(log_debug, logtype_afpd, "ad_valid_header_osx(\"%s\"): BEGIN", fullpathname(path));
+ LOG(log_debug, logtype_ad, "ad_valid_header_osx(\"%s\"): BEGIN", fullpathname(path));
EC_NEG1( fd = open(path, O_RDONLY) );
adosx.ad_version = ntohl(adosx.ad_version);
if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) {
- LOG(log_error, logtype_afpd, "ad_valid_header_osx: not an adouble:ox file");
+ LOG(log_warning, logtype_ad, "ad_valid_header_osx(\"%s\"): not an adouble:osx file", fullpathname(path));
EC_FAIL;
}
+ if (strncmp(buf + ADEDOFF_FILLER, "Mac OS X", strlen("Mac OS X")) == 0)
+ /*
+ * It's a split fork created by OS X, it's not our "own" ._ file
+ * and thus not a valid header in this context.
+ * We allow enumeration and access.
+ */
+ EC_FAIL;
+
EC_CLEANUP:
- LOG(log_debug, logtype_afpd, "ad_valid_header_osx(\"%s\"): END: %d", fullpathname(path), ret);
+ LOG(log_debug, logtype_ad, "ad_valid_header_osx(\"%s\"): END: %d", fullpathname(path), ret);
if (fd != -1)
close(fd);
if (ret != 0)
adosx.ad_version = ntohl(adosx.ad_version);
if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) {
- LOG(log_error, logtype_afpd, "ad_header_read_osx: can't parse AppleDouble header");
+ LOG(log_error, logtype_ad, "ad_header_read_osx: can't parse AppleDouble header");
errno = EIO;
return -1;
}
buf += AD_HEADER_LEN;
if (len > header_len - AD_HEADER_LEN) {
- LOG(log_error, logtype_afpd, "ad_header_read_osx: can't read entry info.");
+ LOG(log_error, logtype_ad, "ad_header_read_osx: can't read entry info.");
errno = EIO;
return -1;
}
|| ad_getentryoff(&adosx, ADEID_RFORK) > sizeof(ad->ad_data)
|| ad_getentryoff(&adosx, ADEID_RFORK) > header_len
) {
- LOG(log_error, logtype_afpd, "ad_header_read_osx: problem with rfork entry offset.");
+ LOG(log_error, logtype_ad, "ad_header_read_osx: problem with rfork entry offset.");
errno = EIO;
return -1;
}
else
header_len = sys_lgetxattr(path, AD_EA_META, ad->ad_data, AD_DATASZ_EA);
if (header_len < 1) {
- LOG(log_debug, logtype_default, "ad_header_read_ea: %s", strerror(errno));
+ LOG(log_debug, logtype_ad, "ad_header_read_ea: %s", strerror(errno));
return -1;
}
if (header_len < AD_HEADER_LEN) {
- LOG(log_error, logtype_default, "ad_header_read_ea: bogus AppleDouble header.");
+ LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): bogus AppleDouble header.", fullpathname(path));
errno = EIO;
return -1;
}
ad->ad_version = ntohl( ad->ad_version );
if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) {
- LOG(log_error, logtype_default, "ad_header_read_ea: wrong magic or version");
+ LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): wrong magic or version", fullpathname(path));
errno = EIO;
return -1;
}
if (len + AD_HEADER_LEN > sizeof(ad->ad_data))
len = sizeof(ad->ad_data) - AD_HEADER_LEN;
if (len > header_len - AD_HEADER_LEN) {
- LOG(log_error, logtype_default, "ad_header_read_ea: can't read entry info.");
+ LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): can't read entry info.", fullpathname(path));
errno = EIO;
return -1;
}
return 0;
}
+#ifdef HAVE_EAFD
static int ad_mkrf_ea(const char *path _U_)
{
AFP_PANIC("ad_mkrf_ea: dont use");
return 0;
}
+#endif
static int ad_mkrf_osx(const char *path _U_)
{
*
* We're called because opening ADFLAGS_HF caused an error.
* 1. In case ad_open is called with ADFLAGS_NOHF the error is suppressed.
- * 2. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus
+ * 2. Open non-existent ressource fork, this will just result in first read return EOF
+ * 3. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus
* ought to close it before returning with an error condition.
*/
static int ad_error(struct adouble *ad, int adflags)
if (adflags & ADFLAGS_NOHF) { /* 1 */
return 0;
}
- if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 2 */
+ if ((adflags & ADFLAGS_RDONLY) && (adflags & ADFLAGS_RF) && (errno == ENOENT)) /* 2 */
+ return 0;
+ if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 3 */
ad_close( ad, ADFLAGS_DF );
err = errno;
}
if (adflags & ADFLAGS_TRUNC)
oflags |= O_TRUNC;
+ if (!(ad->ad_options & ADVOL_FOLLO_SYML))
+ oflags |= O_NOFOLLOW;
+
return oflags;
}
int st_invalid = -1;
ssize_t lsz;
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_df(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags),
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
goto EC_CLEANUP;
}
- oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags);
+ oflags = ad2openflags(ad, ADFLAGS_DF, adflags);
admode = mode;
if ((adflags & ADFLAGS_CREATE)) {
ad->ad_data_fork.adf_refcount++;
EC_CLEANUP:
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_df(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags), ret,
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
mode_t admode;
int st_invalid = -1;
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_hf_v2(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags),
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
}
ad_p = ad->ad_ops->ad_path(path, adflags);
- oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_HF, adflags);
- LOG(log_debug, logtype_default,"ad_open_hf_v2(\"%s\"): open flags: %s",
+ oflags = ad2openflags(ad, ADFLAGS_HF, adflags);
+ LOG(log_debug, logtype_ad,"ad_open_hf_v2(\"%s\"): open flags: %s",
fullpathname(path), openflags2logstr(oflags));
nocreatflags = oflags & ~(O_CREAT | O_EXCL);
/*
* We're expecting to create a new adouble header file here
*/
- LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file",
+ LOG(log_debug, logtype_ad, "ad_open(\"%s\"): creating adouble file",
fullpathname(path));
admode = mode;
errno = 0;
ad_meta_fileno(ad) = -1;
ad->ad_mdp->adf_refcount = 0;
}
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_hf_v2(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags), ret,
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad)
{
EC_INIT;
- ssize_t rforklen;
int oflags;
int opened = 0;
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_hf_ea(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags),
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
- oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC));
+ oflags = ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC);
if (ad_meta_fileno(ad) == AD_SYMLINK)
goto EC_CLEANUP;
if ((oflags & O_RDWR) &&
/* and it was already denied: */
(ad->ad_mdp->adf_flags & O_RDONLY)) {
- LOG(log_error, logtype_default, "ad_open_hf_ea(%s): rw request for ro file: %s",
+ LOG(log_error, logtype_ad, "ad_open_hf_ea(%s): rw request for ro file: %s",
fullpathname(path), strerror(errno));
errno = EACCES;
EC_FAIL;
if (adflags & ADFLAGS_DIR)
/* 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);
+ LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): opening base file for meta adouble EA", path);
EC_NEG1(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_debug, logtype_default, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path);
+ LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path);
errno = ENOENT;
EC_FAIL;
}
- LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): creating metadata EA", path);
+ LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): creating metadata EA", path);
/* It doesnt exist, EPERM or another error */
if (!(errno == ENOATTR || errno == ENOENT)) {
- LOG(log_error, logtype_default, "ad_open_hf_ea: unexpected: %s", strerror(errno));
+ LOG(log_error, logtype_ad, "ad_open_hf_ea: unexpected: %s", strerror(errno));
EC_FAIL;
}
EC_NEG1_LOG(new_ad_header(ad, path, NULL, adflags));
ad->ad_mdp->adf_flags |= O_CREAT; /* mark as just created */
ad_flush(ad);
- LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): created metadata EA", path);
+ LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): created metadata EA", path);
}
if (ad_meta_fileno(ad) != -1)
ad->ad_mdp->adf_refcount++;
- (void)ad_reso_size(path, adflags, ad);
+ ad->ad_rlen = ad_reso_size(path, adflags, ad);
EC_CLEANUP:
if (ret != 0 && opened && ad_meta_fileno(ad) != -1) {
ad_meta_fileno(ad) = -1;
ad->ad_mdp->adf_refcount = 0;
}
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open_hf_ea(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags), ret,
ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
int ret = 0;
memset(ad->ad_eid, 0, sizeof( ad->ad_eid ));
- ad->ad_rlen = 0;
switch (ad->ad_vers) {
case AD_VERSION2:
break;
}
- if (ret != 0)
+ if (ret == 0)
+ ad->ad_meta_refcount++;
+ else
ret = ad_error(ad, adflags);
return ret;
}
/*!
- * Get resofork length for adouble:ea
+ * Get resofork length for adouble:ea, parameter 'ad' may be NULL
*/
-static int ad_reso_size(const char *path, int adflags, struct adouble *ad)
+off_t ad_reso_size(const char *path, int adflags, struct adouble *ad)
{
EC_INIT;
struct stat st;
+ off_t rlen;
- if (adflags & ADFLAGS_DIR) {
- ad->ad_rlen = 0;
- goto EC_CLEANUP;
- }
+ if (adflags & ADFLAGS_DIR)
+ EC_FAIL;
- LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): BEGIN", path);
+ LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): BEGIN", path);
#ifdef HAVE_EAFD
ssize_t easz;
- if (ad_reso_fileno(ad) != -1) {
+ if (ad && 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( (ad->ad_rlen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) );
+ rlen = st.st_size;
+ } else if (ad && ad_meta_fileno(ad) != -1) {
+ EC_NEG1( (rlen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) );
} else {
- EC_NEG1( (ad->ad_rlen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) );
+ EC_NEG1( (rlen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) );
}
#else
const char *rfpath;
- EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags));
+ EC_NULL_LOG( rfpath = ad_path_osx(path, adflags));
EC_ZERO( lstat(rfpath, &st));
if (st.st_size > ADEDOFF_RFORK_OSX)
- ad->ad_rlen = st.st_size - ADEDOFF_RFORK_OSX;
+ rlen = st.st_size - ADEDOFF_RFORK_OSX;
else
- ad->ad_rlen = 0;
+ rlen = 0;
#endif
- LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen);
+ LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): size: %zd", path, rlen);
EC_CLEANUP:
if (ret != 0)
- ad->ad_rlen = 0;
- EC_EXIT;
+ rlen = 0;
+ return rlen;
}
static int ad_open_rf_v2(const char *path, int adflags, int mode, struct adouble *ad)
{
+ EC_INIT;
+
/*
* ad_open_hf_v2() does the work, but if it failed and adflags are ADFLAGS_NOHF | ADFLAGS_RF
* ad_open_hf_v2() didn't give an error, but we're supposed to return a reso fork fd
*/
- if (!AD_RSRC_OPEN(ad) && !(adflags & ADFLAGS_NORF))
- return -1;
- return 0;
+
+ LOG(log_debug, logtype_ad, "ad_open_rf_v2(\"%s\"): BEGIN", fullpathname(path));
+
+ if (!AD_META_OPEN(ad) && !(adflags & (ADFLAGS_NORF | ADFLAGS_RDONLY)))
+ EC_FAIL;
+ if (AD_META_OPEN(ad))
+ ad->ad_reso_refcount++;
+
+EC_CLEANUP:
+ LOG(log_debug, logtype_ad, "ad_open_rf_v2(\"%s\"): END: %d", fullpathname(path), ret);
+ EC_EXIT;
}
static int ad_open_rf_ea(const char *path, int adflags, int mode, struct adouble *ad)
int oflags;
int opened = 0;
int closeflags = adflags & (ADFLAGS_DF | ADFLAGS_HF);
- ssize_t rlen;
#ifndef HAVE_EAFD
const char *rfpath;
struct stat st;
#endif
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path));
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path));
- oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT);
+ oflags = ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT;
if (ad_reso_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
}
ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT );
ad->ad_rfp->adf_refcount++;
- EC_NEG1_LOG( ad_reso_size(path, adflags, ad));
+ EC_NEG1_LOG( ad->ad_rlen = ad_reso_size(path, adflags, ad));
goto EC_CLEANUP;
}
#ifdef HAVE_EAFD
#else
EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags) );
if ((ad_reso_fileno(ad) = open(rfpath, oflags)) == -1) {
- if (!(adflags & ADFLAGS_CREATE))
- EC_FAIL;
- oflags |= O_CREAT;
- EC_NEG1_LOG( ad_reso_fileno(ad) = open(rfpath, oflags, mode) );
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork: \"%s\"",
- path, rfpath);
+ if (!(adflags & ADFLAGS_CREATE)) {
+ switch (errno) {
+ case EACCES:
+ case EPERM:
+ case EROFS:
+ if (!(adflags & ADFLAGS_RDONLY)) {
+ LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno));
+ EC_FAIL;
+ }
+ oflags &= ~O_RDWR;
+ oflags |= O_RDONLY;
+ if ((ad_reso_fileno(ad) = open(rfpath, oflags)) == -1) {
+ LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno));
+ EC_FAIL;
+ }
+ break;
+ case ENOENT:
+ EC_EXIT_STATUS(0);
+ default:
+ LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno));
+ EC_FAIL;
+ }
+ } else {
+ oflags |= O_CREAT;
+ EC_NEG1_LOG( ad_reso_fileno(ad) = open(rfpath, oflags, mode) );
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork: \"%s\"",
+ path, rfpath);
+ }
}
#endif
opened = 1;
ad->ad_rfp->adf_refcount = 1;
ad->ad_rfp->adf_flags = oflags;
+ ad->ad_reso_refcount++;
#ifndef HAVE_EAFD
EC_ZERO_LOG( fstat(ad_reso_fileno(ad), &st) );
if (ad->ad_rfp->adf_flags & O_CREAT) {
/* This is a new adouble header file, create it */
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, initializing: \"%s\"",
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork, initializing: \"%s\"",
path, rfpath);
EC_NEG1_LOG( new_ad_header(ad, path, NULL, adflags) );
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"",
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"",
path, rfpath);
ad_flush(ad);
} else {
/* Read the adouble header */
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): reading adouble rfork: \"%s\"",
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): reading adouble rfork: \"%s\"",
path, rfpath);
EC_NEG1_LOG( ad_header_read_osx(NULL, ad, &st) );
}
#endif
- (void)ad_reso_size(path, adflags, ad);
+ ad->ad_rlen = ad_reso_size(path, adflags, ad);
EC_CLEANUP:
if (ret != 0) {
if (opened && (ad_reso_fileno(ad) != -1)) {
close(ad_reso_fileno(ad));
ad_reso_fileno(ad) = -1;
+ ad->ad_reso_refcount--;
ad->ad_rfp->adf_refcount = 0;
}
if (adflags & ADFLAGS_NORF) {
ad->ad_rlen = 0;
}
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret);
+ LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret);
EC_EXIT;
}
p = ad_dir(path);
if (!p)
return -1;
- return lstat( p, stbuf );
+ return stat( p, stbuf );
}
/* ----------------
int st_invalid;
struct stat stbuf;
- LOG(log_debug, logtype_default, "ad_mkdir(\"%s\", %04o) {cwd: \"%s\"}",
+ LOG(log_debug, logtype_ad, "ad_mkdir(\"%s\", %04o) {cwd: \"%s\"}",
path, mode, getcwdpath());
st_invalid = ad_mode_st(path, &mode, &stbuf);
ad_reso_fileno(ad) = -1;
ad_meta_fileno(ad) = -1;
ad->ad_refcount = 1;
+ ad->ad_rlen = 0;
return;
}
va_list args;
mode_t mode = 0;
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open(\"%s\", %s): BEGIN {d: %d, m: %d, r: %d}"
"[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), adflags2logstr(adflags),
}
if (adflags & ADFLAGS_HF) {
- ad->ad_meta_refcount++;
if (ad_open_hf(path, adflags, mode, ad) != 0) {
- ad->ad_meta_refcount--;
EC_FAIL;
}
}
if (adflags & ADFLAGS_RF) {
- ad->ad_reso_refcount++;
if (ad_open_rf(path, adflags, mode, ad) != 0) {
- ad->ad_reso_refcount--;
EC_FAIL;
}
}
}
EC_CLEANUP:
- LOG(log_debug, logtype_default,
+ LOG(log_debug, logtype_ad,
"ad_open(\"%s\"): END: %d {d: %d, m: %d, r: %d}"
"[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
fullpathname(path), ret,
if (dirfd != -1) {
if (fchdir(cwdfd) != 0) {
- LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting");
+ LOG(log_error, logtype_ad, "ad_openat: cant chdir back, exiting");
exit(EXITERR_SYS);
}
}
EC_INIT;
int cwdfd = -1;
va_list args;
- mode_t mode;
+ mode_t mode = 0;
if (dirfd != -1) {
if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0))
projects / netatalk.git / blobdiff