X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=cd45fef2e20ddf9c526b08a07f7c2a6f9c8a5717;hp=8d0e6f4b3e942d13acbdf87302a34f9288a84b66;hb=c74dd3730ea1927d5083242fce4dc042f9a8646c;hpb=97d87658d706b4a1682929ff153c6a2166b355bf diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 8d0e6f4b..cd45fef2 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -108,17 +108,19 @@ static int ad_mkrf(const char *path); 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); 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, }; @@ -131,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}, @@ -174,13 +168,6 @@ static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = { {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}, - {0, 0, 0} -}; - #define ADFLAGS2LOGSTRBUFSIZ 128 const char *adflags2logstr(int adflags) { @@ -331,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; @@ -351,11 +337,8 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, 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; @@ -364,34 +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 == '.') - && !((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)); - } + 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; } @@ -423,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); } } } @@ -458,7 +446,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, const struct 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; } @@ -475,7 +463,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, const struct 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; } @@ -487,13 +475,13 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, const struct 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; } @@ -510,6 +498,52 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, const struct 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, const struct stat *hst) { @@ -537,7 +571,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, const st 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; } @@ -551,7 +585,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, const st 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; } @@ -563,7 +597,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, const st || 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; } @@ -592,12 +626,12 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct 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; } @@ -609,7 +643,7 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct 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; } @@ -622,7 +656,7 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, const struct 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; } @@ -659,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_) { @@ -730,7 +766,8 @@ 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) @@ -739,7 +776,9 @@ 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; } @@ -776,70 +815,10 @@ static int ad2openflags(const struct adouble *ad, int adfile, int adflags) if (adflags & ADFLAGS_TRUNC) oflags |= O_TRUNC; - return oflags; -} - -static int ad_conv_v22ea_hf(const char *path, const struct stat *sp, const struct vol *vol) -{ - EC_INIT; - struct adouble adv2; - struct adouble adea; - const char *adpath; - int adflags; - - LOG(log_debug, logtype_default,"ad_conv_v22ea_hf(\"%s\"): BEGIN", fullpathname(path)); - - ad_init(&adea, vol); - ad_init_old(&adv2, AD_VERSION2, adea.ad_options); - adflags = S_ISDIR(sp->st_mode) ? ADFLAGS_DIR : 0; - - /* Open and lock adouble:v2 file */ - EC_ZERO( ad_open(&adv2, path, adflags | ADFLAGS_HF | ADFLAGS_RDWR) ); - EC_NEG1_LOG( ad_tmplock(&adv2, ADEID_RFORK, ADLOCK_WR | ADLOCK_FILELOCK, 0, 0, 0) ); - EC_NEG1_LOG( adv2.ad_ops->ad_header_read(path, &adv2, sp) ); - - /* Create a adouble:ea meta EA */ - EC_ZERO_LOG( ad_open(&adea, path, adflags | ADFLAGS_HF | ADFLAGS_RDWR | ADFLAGS_CREATE) ); - EC_ZERO_LOG( ad_copy_header(&adea, &adv2) ); - ad_flush(&adea); - -EC_CLEANUP: - EC_ZERO_LOG( ad_close(&adv2, ADFLAGS_HF | ADFLAGS_SETSHRMD) ); - EC_ZERO_LOG( ad_close(&adea, ADFLAGS_HF | ADFLAGS_SETSHRMD) ); - EC_EXIT; -} - -static int ad_conv_v22ea_rf(const char *path, const struct stat *sp, const struct vol *vol) -{ - EC_INIT; - struct adouble adv2; - struct adouble adea; - - LOG(log_debug, logtype_default,"ad_conv_v22ea_rf(\"%s\"): BEGIN", fullpathname(path)); - - if (S_ISDIR(sp->st_mode)) - return 0; - - ad_init(&adea, vol); - ad_init_old(&adv2, AD_VERSION2, adea.ad_options); - - /* Open and lock adouble:v2 file */ - EC_ZERO( ad_open(&adv2, path, ADFLAGS_HF | ADFLAGS_RF | ADFLAGS_RDWR) ); - if (adv2.ad_rlen > 0) { - EC_NEG1_LOG( ad_tmplock(&adv2, ADEID_RFORK, ADLOCK_WR | ADLOCK_FILELOCK, 0, 0, 0) ); + if (!(ad->ad_options & ADVOL_FOLLO_SYML)) + oflags |= O_NOFOLLOW; - /* Create a adouble:ea resource fork */ - EC_ZERO_LOG( ad_open(&adea, path, ADFLAGS_HF | ADFLAGS_RF | ADFLAGS_RDWR | ADFLAGS_CREATE, 0666) ); - - EC_ZERO_LOG( copy_fork(ADEID_RFORK, &adea, &adv2) ); - adea.ad_rlen = adv2.ad_rlen; - ad_flush(&adea); - } - -EC_CLEANUP: - EC_ZERO_LOG( ad_close(&adv2, ADFLAGS_HF | ADFLAGS_RF) ); - EC_ZERO_LOG( ad_close(&adea, ADFLAGS_HF | ADFLAGS_RF) ); - EC_EXIT; + return oflags; } static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad) @@ -851,7 +830,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble 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, @@ -872,7 +851,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble goto EC_CLEANUP; } - oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags); + oflags = ad2openflags(ad, ADFLAGS_DF, adflags); admode = mode; if ((adflags & ADFLAGS_CREATE)) { @@ -902,7 +881,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble 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: EC_FAIL; @@ -917,7 +896,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble 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, @@ -937,7 +916,7 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou 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, @@ -960,8 +939,8 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou } 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); @@ -988,7 +967,7 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou /* * 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; @@ -1049,7 +1028,7 @@ EC_CLEANUP: 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, @@ -1061,29 +1040,27 @@ EC_CLEANUP: 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) == -2) - /* symlink */ - EC_EXIT; + 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 ((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; @@ -1096,7 +1073,7 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble 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; @@ -1106,16 +1083,16 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble /* 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; } @@ -1123,11 +1100,12 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble 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); } - ad->ad_mdp->adf_refcount++; - (void)ad_reso_size(path, adflags, ad); + if (ad_meta_fileno(ad) != -1) + ad->ad_mdp->adf_refcount++; + ad->ad_rlen = ad_reso_size(path, adflags, ad); EC_CLEANUP: if (ret != 0 && opened && ad_meta_fileno(ad) != -1) { @@ -1135,7 +1113,7 @@ EC_CLEANUP: 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, @@ -1150,7 +1128,6 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a int ret = 0; memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); - ad->ad_rlen = 0; switch (ad->ad_vers) { case AD_VERSION2: @@ -1164,62 +1141,77 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a 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; - LOG(log_debug, logtype_default, "ad_reso_size(\"%s\")", path); + 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_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( easz = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0) ); - ad->ad_rlen = easz; + 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_FAIL; + 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) @@ -1228,15 +1220,14 @@ static int ad_open_rf_ea(const char *path, int adflags, int mode, struct adouble 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: */ @@ -1248,60 +1239,105 @@ static int ad_open_rf_ea(const char *path, int adflags, int mode, struct adouble } 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 - if (ad_meta_fileno(ad) == -1) + 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)) { - errno = ENOENT; - EC_FAIL; + 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) ); } - 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); - 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 - (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) { @@ -1314,7 +1350,7 @@ EC_CLEANUP: 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; } @@ -1512,7 +1548,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 ); } /* ---------------- @@ -1534,7 +1570,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); @@ -1568,6 +1604,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; } @@ -1637,9 +1674,11 @@ 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): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", + 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); @@ -1670,19 +1709,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_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) ); + if (ad_open_hf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_RF) { - EC_ZERO( ad_open_rf(path, adflags, mode, ad) ); + if (ad_open_rf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_CHECK_OF) { @@ -1690,9 +1737,11 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) } EC_CLEANUP: - LOG(log_debug, logtype_default, - "ad_open(\"%s\"): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", + 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); @@ -1713,26 +1762,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; } @@ -1762,7 +1801,7 @@ 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); } } @@ -1829,7 +1868,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)) @@ -1838,7 +1877,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) ); @@ -1856,30 +1895,6 @@ EC_CLEANUP: return ret; } -int ad_convert(const char *path, const struct stat *sp, const struct vol *vol) -{ - EC_INIT; - const char *adpath; - int adflags = S_ISDIR(sp->st_mode) ? ADFLAGS_DIR : 0; - - if (!(vol->v_adouble == AD_VERSION_EA) || (vol->v_flags & AFPVOL_NOV2TOEACONV)) - goto EC_CLEANUP; - - EC_ZERO( ad_conv_v22ea_hf(path, sp, vol) ); - EC_ZERO( ad_conv_v22ea_rf(path, sp, vol) ); - - EC_NULL( adpath = ad_path(path, adflags) ); - LOG(log_debug, logtype_default,"ad_conv_v22ea_hf(\"%s\"): deleting adouble:v2 file: \"%s\"", - path, fullpathname(adpath)); - - become_root(); - EC_ZERO_LOG( unlink(adpath) ); - unbecome_root(); - -EC_CLEANUP: - EC_EXIT; -} - /* 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), */