X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=4e1253d1febf6e70b8cef6576b54b98015385eb9;hp=71a495d5d864dd3efe831c207871fb885d4cc4d9;hb=5ec122952ff5835479f7441291dc8fdbb7796de1;hpb=00ab46135eb7373f41380e60c8054282fc7965ff diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 71a495d5..4e1253d1 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -82,10 +83,14 @@ #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_FILEDATESI_EA (ADEDOFF_COMMENT_EA + ADEDLEN_COMMENT) -#define ADEDOFF_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI) +#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_PRIVDEV_EA (ADEDOFF_AFPFILEI_EA + ADEDLEN_AFPFILEI) +#define ADEDOFF_PRIVINO_EA (ADEDOFF_PRIVDEV_EA + ADEDLEN_PRIVDEV) +#define ADEDOFF_PRIVSYN_EA (ADEDOFF_PRIVINO_EA + ADEDLEN_PRIVINO) +#define ADEDOFF_PRIVID_EA (ADEDOFF_PRIVSYN_EA + ADEDLEN_PRIVSYN) /* 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 */ @@ -100,22 +105,22 @@ static uid_t default_uid = -1; /* Forward declarations */ static int ad_mkrf(const char *path); -static int ad_header_read(const char *path, struct adouble *ad, struct stat *hst); +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); -static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst); +#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 const char *ad_path_osx(const char *path, int adflags); +off_t ad_reso_size(const char *path, int adflags, struct adouble *ad); static int ad_mkrf_osx(const char *path); static struct adouble_fops ad_adouble = { &ad_path, &ad_mkrf, - &ad_rebuild_adouble_header, + &ad_rebuild_adouble_header_v2, &ad_header_read, &ad_header_upgrade, }; @@ -128,19 +133,11 @@ static struct adouble_fops ad_adouble_ea = { &ad_path_osx, &ad_mkrf_osx, #endif - &ad_rebuild_adouble_header, + &ad_rebuild_adouble_header_ea, &ad_header_read_ea, &ad_header_upgrade_ea, }; -static struct adouble_fops ad_osx = { - &ad_path_osx, - &ad_mkrf_osx, - &ad_rebuild_adouble_header, - &ad_header_read, - &ad_header_upgrade, -}; - static const struct entry entry_order2[ADEID_NUM_V2 + 1] = { {ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT}, {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT}, @@ -164,14 +161,10 @@ static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = { {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}, - {0, 0, 0} -}; - -/* fallback for EAs */ -static const struct entry entry_order_osx[ADEID_NUM_OSX +1] = { - {ADEID_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI}, - {ADEID_RFORK, ADEDOFF_RFORK_OSX, ADEDLEN_INIT}, + {ADEID_PRIVDEV, ADEDOFF_PRIVDEV_EA, ADEDLEN_INIT}, + {ADEID_PRIVINO, ADEDOFF_PRIVINO_EA, ADEDLEN_INIT}, + {ADEID_PRIVSYN, ADEDOFF_PRIVSYN_EA, ADEDLEN_INIT}, + {ADEID_PRIVID, ADEDOFF_PRIVID_EA, ADEDLEN_INIT}, {0, 0, 0} }; @@ -193,6 +186,12 @@ const char *adflags2logstr(int adflags) strlcat(buf, "RF", ADFLAGS2LOGSTRBUFSIZ); first = 0; } + if (adflags & ADFLAGS_NORF) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "NORF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } if (adflags & ADFLAGS_HF) { if (!first) strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); @@ -217,6 +216,12 @@ const char *adflags2logstr(int adflags) strlcat(buf, "OF", ADFLAGS2LOGSTRBUFSIZ); first = 0; } + if (adflags & ADFLAGS_SETSHRMD) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "SHRMD", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } if (adflags & ADFLAGS_RDWR) { if (!first) strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); @@ -251,6 +256,45 @@ const char *adflags2logstr(int adflags) return buf; } +#define OPENFLAGS2LOGSTRBUFSIZ 128 +const char *openflags2logstr(int oflags) +{ + int first = 1; + static char buf[OPENFLAGS2LOGSTRBUFSIZ]; + + buf[0] = 0; + + if ((oflags & O_RDONLY) || (oflags == O_RDONLY)) { + strlcat(buf, "O_RDONLY", OPENFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (oflags & O_RDWR) { + if (!first) + strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_RDWR", OPENFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (oflags & O_CREAT) { + if (!first) + strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_CREAT", OPENFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (oflags & O_TRUNC) { + if (!first) + strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_TRUNC", OPENFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (oflags & O_EXCL) { + if (!first) + strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_EXCL", OPENFLAGS2LOGSTRBUFSIZ); + first = 0; + } + return buf; +} + static uint32_t get_eid(uint32_t eid) { if (eid <= 15) @@ -274,12 +318,11 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, 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 (stp == NULL) { - stp = &st; - if (lstat(path, &st) != 0) - return -1; + if (ad->ad_magic == AD_MAGIC) { + LOG(log_debug, logtype_ad, "new_ad_header(\"%s\"): already initialized", path); + return 0; } ad->ad_magic = AD_MAGIC; @@ -288,18 +331,14 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, ad->ad_version = AD_VERSION; } - memset(ad->ad_data, 0, sizeof(ad->ad_data)); if (ad->ad_vers == AD_VERSION2) eid = entry_order2; else if (ad->ad_vers == AD_VERSION_EA) eid = entry_order_ea; - else if (ad->ad_vers == AD_VERSION2_OSX) - eid = entry_order_osx; - else { + else return -1; - } while (eid->id) { ad->ad_eid[eid->id].ade_off = eid->offset; @@ -308,31 +347,39 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, } /* put something sane in the directory finderinfo */ - if (ad->ad_vers != AD_VERSION2_OSX) { - if ((adflags & ADFLAGS_DIR)) { - /* set default view */ - ashort = htons(FINDERINFO_CLOSEDVIEW); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); - } else { - /* set default creator/type fields */ - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4); - } + if (stp == NULL) { + stp = &st; + if (lstat(path, &st) != 0) + return -1; + } - /* make things invisible */ - if ((ad->ad_options & ADVOL_INVDOTS) && (*path == '.')) { - ashort = htons(ATTRBIT_INVISIBLE); - ad_setattr(ad, ashort); - ashort = htons(FINDERINFO_INVISIBLE); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); - } + if ((adflags & ADFLAGS_DIR)) { + /* set default view */ + ashort = htons(FINDERINFO_CLOSEDVIEW); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); + } else { + /* set default creator/type fields */ + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4); + } - /* put something sane in the date fields */ - ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START); + /* make things invisible */ + if ((ad->ad_options & ADVOL_INVDOTS) + && (*path == '.') + && !((adflags & ADFLAGS_DIR) && (path[1] == 0)) + ) { + ashort = htons(ATTRBIT_INVISIBLE); + ad_setattr(ad, ashort); + ashort = htons(FINDERINFO_INVISIBLE); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); } + + /* put something sane in the date fields */ + ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START); + return 0; } @@ -364,7 +411,7 @@ static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) 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); } } } @@ -376,7 +423,7 @@ static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) * NOTE: we're assuming that the resource fork is kept at the end of * the file. also, mmapping won't work for the hfs fs until it * understands how to mmap header files. */ -static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat *hst) +static int ad_header_read(const char *path _U_, struct adouble *ad, const struct stat *hst) { char *buf = ad->ad_data; uint16_t nentries; @@ -385,7 +432,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat struct stat st; /* read the header */ - if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ, 0)) < 0) { + if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ2, 0)) < 0) { return -1; } if (header_len < AD_HEADER_LEN) { @@ -399,7 +446,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat 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; } @@ -416,7 +463,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat 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; } @@ -428,13 +475,13 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat 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; } @@ -451,8 +498,54 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat return 0; } +/* error here means it's not ad ._ adouble:osx file and thus we return 1 */ +int ad_valid_header_osx(const char *path) +{ + EC_INIT; + int fd = -1; + struct adouble adosx; + char *buf = &adosx.ad_data[0]; + ssize_t header_len; + + LOG(log_debug, logtype_ad, "ad_valid_header_osx(\"%s\"): BEGIN", fullpathname(path)); + + EC_NEG1( fd = open(path, O_RDONLY) ); + + /* read the header */ + EC_NEG1( header_len = read(fd, buf, AD_DATASZ_OSX) ); + + if (header_len < AD_HEADER_LEN) + EC_FAIL; + + memcpy(&adosx.ad_magic, buf, sizeof(adosx.ad_magic)); + memcpy(&adosx.ad_version, buf + ADEDOFF_VERSION, sizeof(adosx.ad_version)); + adosx.ad_magic = ntohl(adosx.ad_magic); + adosx.ad_version = ntohl(adosx.ad_version); + + if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) { + 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_ad, "ad_valid_header_osx(\"%s\"): END: %d", fullpathname(path), ret); + if (fd != -1) + close(fd); + if (ret != 0) + return 1; + return 0; +} + /* Read an ._ file, only uses the resofork, finderinfo is taken from EA */ -static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct stat *hst) +static int ad_header_read_osx(const char *path _U_, struct adouble *ad, const struct stat *hst) { EC_INIT; struct adouble adosx; @@ -478,7 +571,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct s 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; } @@ -492,7 +585,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct s 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; } @@ -504,7 +597,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct s || 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; } @@ -521,31 +614,24 @@ EC_CLEANUP: EC_EXIT; } -static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst _U_) +static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst _U_) { uint16_t nentries; int len; ssize_t header_len; char *buf = ad->ad_data; - /* read the header */ - if ((ad_meta_fileno(ad) == -1) - && (ad->ad_adflags & ADFLAGS_RDWR)) { - LOG(log_error, logtype_default, "ad_header_read_ea: need filedescriptor for rw access"); - return -1; - } - if (ad_meta_fileno(ad) != -1) header_len = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA); 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)); + if (header_len < 1) { + 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; } @@ -557,7 +643,7 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat * 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; } @@ -570,7 +656,7 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat * 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; } @@ -607,11 +693,13 @@ static int ad_mkrf(const char *path) 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_) { @@ -678,32 +766,44 @@ static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _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) { int err = errno; if (adflags & ADFLAGS_NOHF) { /* 1 */ - ad->ad_adflags &= ~ADFLAGS_HF; return 0; } - if (adflags & ADFLAGS_DF) { /* 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; } return -1 ; } -/* Map ADFLAGS to open() flags */ -static int ad2openflags(int adflags) +/*! + * Map ADFLAGS to open() flags + * + * @param adfile (r) the file you really want to open: ADFLAGS_DF or ADFLAGS_HF + * @param adflags (r) flags from ad_open(..., adflags, ...) + * @returns mapped flags suitable for calling open() + */ +static int ad2openflags(const struct adouble *ad, int adfile, int adflags) { int oflags = 0; if (adflags & ADFLAGS_RDWR) oflags |= O_RDWR; if (adflags & ADFLAGS_RDONLY) { - if (adflags & ADFLAGS_SETSHRMD) + if (((adfile == ADFLAGS_DF || adfile == ADFLAGS_RF) && (adflags & ADFLAGS_SETSHRMD)) + /* need rw access for locks */ + || ((adfile == ADFLAGS_HF) && (ad->ad_vers == AD_VERSION2))) + /* need rw access for adouble file for the case: + 1) openfork(data+meta:O_RDONLY), 2) openfork(reso(=meta):O_RDWR) */ oflags |= O_RDWR; else oflags |= O_RDONLY; @@ -715,19 +815,27 @@ static int ad2openflags(int adflags) if (adflags & ADFLAGS_TRUNC) oflags |= O_TRUNC; + if (!(ad->ad_options & ADVOL_FOLLO_SYML)) + oflags |= O_NOFOLLOW; + return oflags; } static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad) { + EC_INIT; struct stat st_dir; int oflags; mode_t admode; int st_invalid = -1; ssize_t lsz; - LOG(log_debug, logtype_default, "ad_open_df(\"%s\", %04o)", - fullpathname(path), mode); + 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, + ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, + ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); if (ad_data_fileno(ad) != -1) { /* the file is already open, but we want write access: */ @@ -740,10 +848,10 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble /* it's not new anymore */ ad->ad_data_fork.adf_flags &= ~( O_TRUNC | O_CREAT ); ad->ad_data_fork.adf_refcount++; - return 0; + goto EC_CLEANUP; } - oflags = O_NOFOLLOW | ad2openflags(adflags); + oflags = ad2openflags(ad, ADFLAGS_DF, adflags); admode = mode; if ((adflags & ADFLAGS_CREATE)) { @@ -762,8 +870,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble if ((adflags & ADFLAGS_SETSHRMD) && (adflags & ADFLAGS_RDONLY)) { oflags &= ~O_RDWR; oflags |= O_RDONLY; - if ((ad->ad_data_fork.adf_fd = open(path, oflags, admode)) == -1) - return -1; + EC_NEG1( ad->ad_data_fork.adf_fd = open(path, oflags, admode) ); break; } return -1; @@ -771,13 +878,13 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1); if ((lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN)) <= 0) { free(ad->ad_data_fork.adf_syml); - return -1; + EC_FAIL; } ad->ad_data_fork.adf_syml[lsz] = 0; - ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */ + ad->ad_data_fork.adf_fd = AD_SYMLINK; break; default: - return -1; + EC_FAIL; } } @@ -788,42 +895,58 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble adf_lock_init(&ad->ad_data_fork); ad->ad_data_fork.adf_refcount++; - return 0; +EC_CLEANUP: + 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, + ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, + ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); + EC_EXIT; } -/* TODO: error handling */ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adouble *ad) { + EC_INIT; struct stat st_dir; struct stat st_meta; struct stat *pst = NULL; const char *ad_p; - int oflags, nocreatflags; + int oflags, nocreatflags, opened = 0; mode_t admode; int st_invalid = -1; + 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_meta_fileno(ad), ad->ad_mdp->adf_refcount, + ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); + if (ad_meta_fileno(ad) != -1) { /* the file is already open, but we want write access: */ if ((adflags & ADFLAGS_RDWR) && /* and it was already denied: */ (ad->ad_mdp->adf_flags & O_RDONLY)) { errno = EACCES; - return -1; + EC_FAIL; } ad_refresh(path, ad); /* it's not new anymore */ ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT ); ad->ad_mdp->adf_refcount++; - return 0; + goto EC_CLEANUP; } ad_p = ad->ad_ops->ad_path(path, adflags); - oflags = O_NOFOLLOW | ad2openflags(adflags); + 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); - ad->ad_mdp->adf_fd = open(ad_p, nocreatflags); + ad_meta_fileno(ad) = open(ad_p, nocreatflags); - if (ad->ad_mdp->adf_fd != -1) { + if (ad_meta_fileno(ad) != -1) { ad->ad_mdp->adf_flags = nocreatflags; } else { switch (errno) { @@ -833,19 +956,18 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou if ((adflags & ADFLAGS_RDONLY) && (adflags & ADFLAGS_SETSHRMD)) { nocreatflags &= ~O_RDWR; nocreatflags |= O_RDONLY; - if ((ad->ad_mdp->adf_fd = open(ad_p, nocreatflags)) == -1) - return -1; + EC_NEG1( ad_meta_fileno(ad) = open(ad_p, nocreatflags) ); ad->ad_mdp->adf_flags = nocreatflags; break; } - return -1; + EC_FAIL; case ENOENT: if (!(oflags & O_CREAT)) - return ad_error(ad, adflags); + EC_FAIL; /* * 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; @@ -853,10 +975,8 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou if ((ad->ad_options & ADVOL_UNIXPRIV)) admode = mode; admode = ad_hf_mode(admode); - if ((errno == ENOENT) && (ad->ad_vers != AD_VERSION2_OSX)) { - if (ad->ad_ops->ad_mkrf( ad_p) < 0) { - return ad_error(ad, adflags); - } + if (errno == ENOENT) { + EC_NEG1_LOG( ad->ad_ops->ad_mkrf(ad_p) ); admode = mode; st_invalid = ad_mode_st(ad_p, &admode, &st_dir); if ((ad->ad_options & ADVOL_UNIXPRIV)) @@ -865,20 +985,20 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou } /* retry with O_CREAT */ - ad->ad_mdp->adf_fd = open(ad_p, oflags, admode); - if ( ad->ad_mdp->adf_fd < 0 ) - return ad_error(ad, adflags); - + EC_NEG1( ad_meta_fileno(ad) = open(ad_p, oflags, admode) ); ad->ad_mdp->adf_flags = oflags; /* just created, set owner if admin owner (root) */ if (!st_invalid) ad_chown(ad_p, &st_dir); break; default: - return -1; + EC_FAIL; } } + /* Now we've got a new opened fd, we need to check that in the error case */ + opened = 1; + if (!(ad->ad_mdp->adf_flags & O_CREAT)) { /* check for 0 length files, treat them as new. */ if (fstat(ad->ad_mdp->adf_fd, &st_meta) == 0) { @@ -895,114 +1015,123 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou if ((ad->ad_mdp->adf_flags & ( O_TRUNC | O_CREAT ))) { /* This is a new adouble header file, create it */ - if (new_ad_header(ad, path, pst, adflags) < 0) { - int err = errno; - /* the file is already deleted, perm, whatever, so return an error */ - ad_close(ad, adflags); - errno = err; - return -1; - } + EC_NEG1_LOG( new_ad_header(ad, path, pst, adflags) ); ad_flush(ad); } else { /* Read the adouble header in and parse it.*/ - if (ad->ad_ops->ad_header_read(path, ad, pst) < 0 - || ad->ad_ops->ad_header_upgrade(ad, ad_p) < 0) { - int err = errno; - ad_close(ad, adflags); - errno = err; - return -1; - } + EC_NEG1_LOG( ad->ad_ops->ad_header_read(path, ad, pst) ); } - return 0; +EC_CLEANUP: + if (ret != 0 && opened && ad_meta_fileno(ad) != -1) { + close(ad_meta_fileno(ad)); + ad_meta_fileno(ad) = -1; + ad->ad_mdp->adf_refcount = 0; + } + 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, + ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, + ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); + EC_EXIT; } -/* TODO: error handling */ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad) { - ssize_t rforklen; + EC_INIT; int oflags; + int opened = 0; + + 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); - LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\", %s, %04o)", - path, adflags2logstr(adflags), mode); + oflags = ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC); - oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~(O_CREAT | O_TRUNC)); + if (ad_meta_fileno(ad) == AD_SYMLINK) + goto EC_CLEANUP; if (ad_meta_fileno(ad) != -1) { /* the file is already open, but we want write access: */ - if ((adflags & ADFLAGS_RDWR) && + 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; - return -1; + EC_FAIL; } /* it's not new anymore */ ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT ); - ad->ad_mdp->adf_refcount++; } else { - if (adflags & ADFLAGS_RDWR) { + if (oflags & O_RDWR) { /* Fo a RDONLY adouble we just use sys_lgetxattr instead if sys_fgetxattr */ 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); - if ((ad_meta_fileno(ad) = open(path, oflags)) == -1) - goto error; + 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; } - ad->ad_mdp->adf_refcount = 1; } /* Read the adouble header in and parse it.*/ if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) { - LOG(log_error, logtype_default, "ad_open_hf_ea: no EA adouble"); - - if (!(adflags & ADFLAGS_CREATE)) - goto error; + if (!(adflags & ADFLAGS_CREATE)) { + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path); + errno = ENOENT; + EC_FAIL; + } + if ((adflags & ADFLAGS_CREATE) && (ad->ad_options & ADVOL_RO)) { + errno = EROFS; + 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)); - goto error; + LOG(log_error, logtype_ad, "ad_open_hf_ea: unexpected: %s", strerror(errno)); + EC_FAIL; } /* Create one */ - if (new_ad_header(ad, path, NULL, adflags) < 0) { - LOG(log_error, logtype_default, "ad_open_hf_ea: can't create new header: %s", - fullpathname(path)); - goto error; - } + 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); } - /* TODO: ad_rlen calculation */ - ad->ad_rlen = 0; - - return 0; + if (ad_meta_fileno(ad) != -1) + ad->ad_mdp->adf_refcount++; + ad->ad_rlen = ad_reso_size(path, adflags, ad); -error: - if (ad_meta_fileno(ad) != -1) { +EC_CLEANUP: + if (ret != 0 && opened && ad_meta_fileno(ad) != -1) { close(ad_meta_fileno(ad)); ad_meta_fileno(ad) = -1; ad->ad_mdp->adf_refcount = 0; } - return ad_error(ad, adflags); + 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, + ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, + ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); + + EC_EXIT; } static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *ad) { int ret = 0; - LOG(log_debug, logtype_default, "ad_open_hf(\"%s\", %04o)", path, mode); - memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); - ad->ad_rlen = 0; switch (ad->ad_vers) { case AD_VERSION2: @@ -1016,111 +1145,267 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a break; } - if (ret != 0) { - return ad_error(ad, adflags); - } + if (ret == 0) + ad->ad_meta_refcount++; + else + ret = ad_error(ad, adflags); + return ret; } - /*! - * Open ressource fork - * - * Only for adouble:ea, a nullop otherwise because adouble:v2 has the ressource fork as part - * of the adouble file which is openend by ADFLAGS_HF. + * Get resofork length for adouble:ea, parameter 'ad' may be NULL */ -static int ad_open_rf(const char *path, int adflags, int mode, 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) + EC_FAIL; + + LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): BEGIN", path); + +#ifdef HAVE_EAFD + ssize_t easz; + + if (ad && ad_reso_fileno(ad) != -1) { + EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); + 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( (rlen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) ); + } + +#else + const char *rfpath; + EC_NULL_LOG( rfpath = ad_path_osx(path, adflags)); + EC_ZERO( lstat(rfpath, &st)); + if (st.st_size > ADEDOFF_RFORK_OSX) + rlen = st.st_size - ADEDOFF_RFORK_OSX; + else + rlen = 0; +#endif + + LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): size: %zd", path, rlen); + +EC_CLEANUP: + if (ret != 0) + 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 + */ + + 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) { EC_INIT; 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 - if (ad->ad_vers != AD_VERSION_EA) - return 0; - - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %04o)", path, mode); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path)); - oflags = O_NOFOLLOW | (ad2openflags(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: */ - if ((adflags & ADFLAGS_RDWR) + if ((oflags & O_RDWR) /* and it was already denied: */ && (ad->ad_rfp->adf_flags & O_RDONLY)) { errno = EACCES; - return -1; + EC_FAIL; } ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT ); ad->ad_rfp->adf_refcount++; - return 0; + EC_NEG1_LOG( ad->ad_rlen = ad_reso_size(path, adflags, ad)); + goto EC_CLEANUP; } #ifdef HAVE_EAFD - if ((ad_reso_fileno(ad) = sys_getxattrfd(path, oflags)) == -1) { - if (!(adflags & ADFLAGS_CREATE)) - EC_FAIL; - oflags |= O_CREAT; - EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(path, oflags, 0666) ); + if (ad_meta_fileno(ad) < 0) + EC_FAIL; + if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) { + 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(path), strerror(errno)); + EC_FAIL; + } + oflags &= ~O_RDWR; + oflags |= O_RDONLY; + if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) { + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(path), strerror(errno)); + EC_FAIL; + } + break; + case ENOENT: + EC_EXIT_STATUS(0); + default: + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(path), strerror(errno)); + EC_FAIL; + } + } else { + oflags |= O_CREAT; + 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_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, rfpath, &st, adflags) ); - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"", + EC_NEG1_LOG( new_ad_header(ad, path, NULL, adflags) ); + 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 + ad->ad_rlen = ad_reso_size(path, adflags, ad); + EC_CLEANUP: if (ret != 0) { - if (ad_reso_fileno(ad) != -1) { + 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; } - int err = errno; - (void)ad_close(ad, closeflags); - errno = err; + if (adflags & ADFLAGS_NORF) { + ret = 0; + } else { + int err = errno; + (void)ad_close(ad, closeflags); + errno = err; + } ad->ad_rlen = 0; } - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END", path); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret); EC_EXIT; } +/*! + * Open ressource fork + */ +static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad) +{ + int ret = 0; + + switch (ad->ad_vers) { + case AD_VERSION2: + ret = ad_open_rf_v2(path, adflags, mode, ad); + break; + case AD_VERSION_EA: + ret = ad_open_rf_ea(path, adflags, mode, ad); + break; + default: + ret = -1; + break; + } + + return ret; +} + /*********************************************************************************** * API functions ********************************************************************************* */ +off_t ad_getentryoff(const struct adouble *ad, int eid) +{ + if (ad->ad_vers == AD_VERSION2) + return ad->ad_eid[eid].ade_off; + + switch (eid) { + case ADEID_DFORK: + return 0; + case ADEID_RFORK: +#ifdef HAVE_EAFD + return 0; +#else + return ADEDOFF_RFORK_OSX; +#endif + default: + return ad->ad_eid[eid].ade_off; + } + /* deadc0de */ + AFP_PANIC("What am I doing here?"); +} + const char *ad_path_ea( const char *path, int adflags _U_) { return path; @@ -1267,7 +1552,7 @@ int ad_stat(const char *path, struct stat *stbuf) p = ad_dir(path); if (!p) return -1; - return lstat( p, stbuf ); + return stat( p, stbuf ); } /* ---------------- @@ -1289,7 +1574,7 @@ int ad_mkdir( const char *path, mode_t mode) 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); @@ -1323,6 +1608,7 @@ static void ad_init_func(struct adouble *ad) ad_reso_fileno(ad) = -1; ad_meta_fileno(ad) = -1; ad->ad_refcount = 1; + ad->ad_rlen = 0; return; } @@ -1362,7 +1648,8 @@ void ad_init(struct adouble *ad, const struct vol * restrict vol) * ADFLAGS_DF: open data fork * ADFLAGS_RF: open ressource fork * ADFLAGS_HF: open header (metadata) file - * ADFLAGS_NOHF: it's not an error if header file couldn't be created + * ADFLAGS_NOHF: it's not an error if header file couldn't be opened + * ADFLAGS_NORF: it's not an error if reso fork couldn't be opened * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags * * Access mode for the forks: @@ -1391,17 +1678,30 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) va_list args; mode_t mode = 0; - LOG(log_debug, logtype_default, "ad_open(\"%s\", %s)", - fullpathname(path), adflags2logstr(adflags)); + 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), + ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount, + 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); if (adflags & ADFLAGS_CHECK_OF) /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */ adflags |= ADFLAGS_SETSHRMD; - if ((ad->ad_vers == AD_VERSION_EA) && (adflags & ADFLAGS_SETSHRMD)) - /* adouble:ea sets sharemode locks on the datafork */ + if (adflags & ADFLAGS_SETSHRMD) + /* sharemode locks are stored in the data fork */ adflags |= ADFLAGS_DF; + if (ad->ad_vers == AD_VERSION2) { + if (adflags & ADFLAGS_RF) + adflags |= ADFLAGS_HF; + if (adflags & ADFLAGS_NORF) + adflags |= ADFLAGS_NOHF; + } + if (ad->ad_inited != AD_INITED) { ad->ad_adflags = adflags; ad->ad_inited = AD_INITED; @@ -1413,22 +1713,27 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) va_start(args, adflags); if (adflags & ADFLAGS_CREATE) - mode = va_arg(args, mode_t); + mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t)); va_end(args); if (adflags & ADFLAGS_DF) { - EC_ZERO( ad_open_df(path, adflags, mode, ad) ); - ad->ad_adflags |= ADFLAGS_DF; + ad->ad_data_refcount++; + if (ad_open_df(path, adflags, mode, ad) != 0) { + ad->ad_data_refcount--; + EC_FAIL; + } } if (adflags & ADFLAGS_HF) { - EC_ZERO( ad_open_hf(path, adflags, mode, ad) ); - ad->ad_adflags |= ADFLAGS_HF; + if (ad_open_hf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_RF) { - EC_ZERO( ad_open_rf(path, adflags, mode, ad) ); - ad->ad_adflags |= ADFLAGS_RF; + if (ad_open_rf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_CHECK_OF) { @@ -1436,7 +1741,16 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) } EC_CLEANUP: - return ret; + 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, + ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount, + 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); + + EC_EXIT; } /*! @@ -1452,26 +1766,16 @@ EC_CLEANUP: */ int ad_metadata(const char *name, int flags, struct adouble *adp) { - uid_t uid; int ret, err, oflags; /* Sanitize flags */ oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY; if ((ret = ad_open(adp, name, oflags)) < 0 && errno == EACCES) { - uid = geteuid(); - if (seteuid(0)) { - LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno)); - errno = EACCES; - return -1; - } - /* we are root open read only */ + become_root(); ret = ad_open(adp, name, oflags); + unbecome_root(); err = errno; - if ( seteuid(uid) < 0) { - LOG(log_error, logtype_default, "ad_metadata: can't seteuid back"); - exit(EXITERR_SYS); - } errno = err; } @@ -1499,8 +1803,9 @@ int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp) } 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); } } @@ -1532,10 +1837,10 @@ int ad_refresh(const char *path, struct adouble *ad) 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)) { @@ -1567,7 +1872,7 @@ int ad_openat(struct adouble *ad, 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)) @@ -1576,7 +1881,7 @@ int ad_openat(struct adouble *ad, va_start(args, adflags); if (adflags & ADFLAGS_CREATE) - mode = va_arg(args, mode_t); + mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t)); va_end(args); EC_NEG1( ad_open(ad, path, adflags, mode) ); @@ -1593,3 +1898,28 @@ EC_CLEANUP: return ret; } + +/* build a resource fork mode from the data fork mode: + * remove X mode and extend header to RW if R or W (W if R for locking), + */ +mode_t ad_hf_mode(mode_t mode) +{ + mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH); + /* fnctl lock need write access */ + if ((mode & S_IRUSR)) + mode |= S_IWUSR; + if ((mode & S_IRGRP)) + mode |= S_IWGRP; + if ((mode & S_IROTH)) + mode |= S_IWOTH; + + /* if write mode set add read mode */ + if ((mode & S_IWUSR)) + mode |= S_IRUSR; + if ((mode & S_IWGRP)) + mode |= S_IRGRP; + if ((mode & S_IWOTH)) + mode |= S_IROTH; + + return mode; +}