X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=94549cd81769092d2a11aa40d5651ec5b8104384;hb=f3de6f64aedf6ee3b053534e2ed2fa6460ad5558;hp=824f9fb262fd1d64324dd8dba429becc9f507636;hpb=53a4185410872bdb5271a886ce8c04362e23b5e9;p=netatalk.git diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 824f9fb2..94549cd8 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -45,18 +45,16 @@ #include #include #include +#include #include #include #include #include #include +#include #include "ad_lock.h" -#ifndef MAX -#define MAX(a, b) ((a) < (b) ? (b) : (a)) -#endif /* ! MAX */ - #define ADEDOFF_MAGIC (0) #define ADEDOFF_VERSION (ADEDOFF_MAGIC + ADEDLEN_MAGIC) #define ADEDOFF_FILLER (ADEDOFF_VERSION + ADEDLEN_VERSION) @@ -85,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 */ @@ -103,12 +105,15 @@ static uid_t default_uid = -1; /* Forward declarations */ static int ad_mkrf(const char *path); -static int ad_header_read(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); static int ad_mkrf_ea(const char *path); -static int ad_header_read_ea(struct adouble *ad, struct stat *hst); +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); +static int ad_mkrf_osx(const char *path); + static struct adouble_fops ad_adouble = { &ad_path, @@ -119,13 +124,26 @@ static struct adouble_fops ad_adouble = { }; static struct adouble_fops ad_adouble_ea = { +#ifdef HAVE_EAFD &ad_path_ea, &ad_mkrf_ea, +#else + &ad_path_osx, + &ad_mkrf_osx, +#endif &ad_rebuild_adouble_header, &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}, @@ -149,6 +167,17 @@ 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_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} +}; + +/* 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} }; @@ -170,6 +199,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); @@ -194,6 +229,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); @@ -228,6 +269,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) @@ -245,25 +325,34 @@ static uint32_t get_eid(uint32_t eid) } /* ----------------------------------- */ -static int new_ad_header(const char *path, struct adouble *ad, int adflags) +static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, int adflags) { const struct entry *eid; uint16_t ashort; struct stat st; + LOG(log_debug, logtype_default, "new_ad_header(\"%s\")", path); + + if (stp == NULL) { + stp = &st; + if (lstat(path, &st) != 0) + return -1; + } + ad->ad_magic = AD_MAGIC; - ad->ad_version = ad->ad_flags & 0x0f0000; + ad->ad_version = ad->ad_vers & 0x0f0000; if (!ad->ad_version) { ad->ad_version = AD_VERSION; } - memset(ad->ad_data, 0, sizeof(ad->ad_data)); - if (ad->ad_flags == AD_VERSION2) + if (ad->ad_vers == AD_VERSION2) eid = entry_order2; - else if (ad->ad_flags == AD_VERSION_EA) + 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 { return -1; } @@ -275,32 +364,34 @@ static int new_ad_header(const char *path, struct adouble *ad, int adflags) } /* put something sane in the directory finderinfo */ - 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); - } - - /* 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 (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 (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)); + } - /* put something sane in the date fields */ - ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, st.st_mtime); - ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, st.st_mtime); - ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, st.st_mtime); - ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START); + /* 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; } @@ -324,8 +415,10 @@ static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) len = ntohl( len ); buf += sizeof( len ); - if (eid && eid < ADEID_MAX && off < sizeof(ad->ad_data) && - (off + len <= sizeof(ad->ad_data) || eid == ADEID_RFORK)) { + if (eid + && eid < ADEID_MAX + && off < sizeof(ad->ad_data) + && (off + len <= sizeof(ad->ad_data) || eid == ADEID_RFORK)) { ad->ad_eid[ eid ].ade_off = off; ad->ad_eid[ eid ].ade_len = len; } else if (!warning) { @@ -342,7 +435,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(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; @@ -351,7 +444,7 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) struct stat st; /* read the header */ - if ((header_len = adf_pread( ad->ad_mdp, buf, sizeof(ad->ad_data), 0)) < 0) { + if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ2, 0)) < 0) { return -1; } if (header_len < AD_HEADER_LEN) { @@ -417,16 +510,127 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) return 0; } -static int ad_header_read_ea(struct adouble *ad, struct stat *hst _U_) +/* 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_afpd, "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_error, logtype_afpd, "ad_valid_header_osx: not an adouble:ox file"); + EC_FAIL; + } + +EC_CLEANUP: + LOG(log_debug, logtype_afpd, "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) +{ + EC_INIT; + struct adouble adosx; + char *buf = &adosx.ad_data[0]; + uint16_t nentries; + int len; + ssize_t header_len; + struct stat st; + + memset(buf, 0, sizeof(adosx.ad_data)); + + /* read the header */ + EC_NEG1( header_len = adf_pread(ad->ad_rfp, buf, AD_DATASZ_OSX, 0) ); + + if (header_len < AD_HEADER_LEN) { + errno = EIO; + return -1; + } + + 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_error, logtype_afpd, "ad_header_read_osx: can't parse AppleDouble header"); + errno = EIO; + return -1; + } + + memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries )); + nentries = ntohs(nentries); + len = nentries * AD_ENTRY_LEN; + + if (len + AD_HEADER_LEN > sizeof(adosx.ad_data)) + len = sizeof(adosx.ad_data) - AD_HEADER_LEN; + + 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."); + errno = EIO; + return -1; + } + + nentries = len / AD_ENTRY_LEN; + parse_entries(&adosx, buf, nentries); + + if (ad_getentryoff(&adosx, ADEID_RFORK) == 0 + || 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."); + errno = EIO; + return -1; + } + + if (hst == NULL) { + hst = &st; + EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); + } + + ad_setentryoff(ad, ADEID_RFORK, ad_getentryoff(&adosx, ADEID_RFORK)); + ad->ad_rlen = hst->st_size - ad_getentryoff(ad, ADEID_RFORK); + +EC_CLEANUP: + EC_EXIT; +} + +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 ((header_len = sys_fgetxattr(ad_data_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA)) < 1) { - LOG(log_debug, logtype_default, "ad_header_read_ea: %s (%u)", strerror(errno), errno); + 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)); return -1; } @@ -464,9 +668,17 @@ static int ad_header_read_ea(struct adouble *ad, struct stat *hst _U_) /* Now parse entries */ parse_entries(ad, buf + AD_HEADER_LEN, nentries); + return 0; } +/*! + * Takes a path to an AppleDouble file and creates the parrent .AppleDouble directory + * + * Example: + * path: "/path/.AppleDouble/file" + * => mkdir("/path/.AppleDouble/") (in ad_mkdir()) + */ static int ad_mkrf(const char *path) { char *slash; @@ -491,6 +703,11 @@ static int ad_mkrf_ea(const char *path _U_) return 0; } +static int ad_mkrf_osx(const char *path _U_) +{ + return 0; +} + /* ---------------- if we are root change path user/ group It can be a native function for BSD cf. FAQ.Q10 @@ -521,7 +738,7 @@ static int ad_chown(const char *path, struct stat *stbuf) /* ---------------- return access right and inode of path parent directory */ -static int ad_mode_st(const char *path, int *mode, struct stat *stbuf) +static int ad_mode_st(const char *path, mode_t *mode, struct stat *stbuf) { if (*mode == 0) { return -1; @@ -557,28 +774,39 @@ static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _U_) static int ad_error(struct adouble *ad, int adflags) { int err = errno; - if ((adflags & ADFLAGS_NOHF)) { /* 1 */ - /* FIXME double check : set header offset ?*/ + if (adflags & ADFLAGS_NOHF) { /* 1 */ return 0; } - if ((adflags & ADFLAGS_DF)) { /* 2 */ + if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 2 */ 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) && (adflags & ADFLAGS_SETSHRMD)) - oflags |= O_RDWR; - else - oflags |= O_RDONLY; + if (adflags & ADFLAGS_RDONLY) { + 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; + } if (adflags & ADFLAGS_CREATE) oflags |= O_CREAT; if (adflags & ADFLAGS_EXCL) @@ -589,16 +817,126 @@ static int ad2openflags(int adflags) return oflags; } +static char emptyfilad[32] = {0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0}; + +static char emptydirad[32] = {0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,1,0, + 0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0}; + +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; + uint32_t ctime, mtime, afpinfo = 0; + char *emptyad; + + 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) ); + + /* Check if it's a non-empty header */ + if (S_ISREG(sp->st_mode)) + emptyad = &emptyfilad[0]; + else + emptyad = &emptydirad[0]; + + if (ad_getentrylen(&adv2, ADEID_COMMENT) != 0) + goto copy; + if (ad_getentryoff(&adv2, ADEID_FINDERI) + && (ad_getentrylen(&adv2, ADEID_FINDERI) == ADEDLEN_FINDERI) + && (memcmp(ad_entry(&adv2, ADEID_FINDERI), emptyad, ADEDLEN_FINDERI) != 0)) + goto copy; + if (ad_getentryoff(&adv2, ADEID_FILEDATESI)) { + EC_ZERO_LOG( ad_getdate(&adv2, AD_DATE_CREATE | AD_DATE_UNIX, &ctime) ); + EC_ZERO_LOG( ad_getdate(&adv2, AD_DATE_MODIFY | AD_DATE_UNIX, &mtime) ); + if ((ctime != mtime) || (mtime != sp->st_mtime)) + goto copy; + } + if (ad_getentryoff(&adv2, ADEID_AFPFILEI)) { + if (memcmp(ad_entry(&adv2, ADEID_AFPFILEI), &afpinfo, ADEDLEN_AFPFILEI) != 0) + goto copy; + } + + LOG(log_debug, logtype_default,"ad_conv_v22ea_hf(\"%s\"): default adouble", fullpathname(path), ret); + goto EC_CLEANUP; + +copy: + /* Create a adouble:ea meta EA */ + LOG(log_debug, logtype_default,"ad_conv_v22ea_hf(\"%s\"): copying adouble", fullpathname(path), ret); + 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) ); + LOG(log_debug, logtype_default,"ad_conv_v22ea_hf(\"%s\"): END: %d", fullpathname(path), ret); + 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) ); + + /* 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) ); + LOG(log_debug, logtype_default,"ad_conv_v22ea_rf(\"%s\"): END: %d", fullpathname(path), ret); + EC_EXIT; +} + 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_default, + "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: */ @@ -609,12 +947,12 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble return -1; } /* it's not new anymore */ - ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT ); + 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 = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags); admode = mode; if ((adflags & ADFLAGS_CREATE)) { @@ -633,8 +971,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; @@ -642,13 +979,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 */ break; default: - return -1; + EC_FAIL; } } @@ -659,41 +996,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_default, + "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; } 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_default, + "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_RDONLY) && + if ((adflags & ADFLAGS_RDWR) && /* and it was already denied: */ - !(ad->ad_mdp->adf_flags & O_RDWR)) { + (ad->ad_mdp->adf_flags & O_RDONLY)) { errno = EACCES; - return -1; + EC_FAIL; } - ad_refresh(ad); + 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 = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_HF, adflags); + LOG(log_debug, logtype_default,"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) { @@ -703,18 +1057,16 @@ 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 - * if ((oflags & O_CREAT) ==> (oflags & O_RDWR) */ LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file", fullpathname(path)); @@ -725,9 +1077,7 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou admode = mode; admode = ad_hf_mode(admode); if (errno == ENOENT) { - if (ad->ad_ops->ad_mkrf( ad_p) < 0) { - return ad_error(ad, adflags); - } + 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)) @@ -736,20 +1086,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) { @@ -761,95 +1111,129 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou } } - ad->ad_mdp->adf_refcount = 1; adf_lock_init(ad->ad_mdp); + ad->ad_mdp->adf_refcount = 1; if ((ad->ad_mdp->adf_flags & ( O_TRUNC | O_CREAT ))) { /* This is a new adouble header file, create it */ - if (new_ad_header(path, ad, 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( 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_default, + "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; } static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad) { + EC_INIT; ssize_t rforklen; - int oflags = O_NOFOLLOW; + int oflags; + int opened = 0; - oflags = ad2openflags(adflags) & ~(O_CREAT | O_TRUNC); + LOG(log_debug, logtype_default, + "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); - if (ad_meta_fileno(ad) == -1) { - if ((ad_meta_fileno(ad) = open(path, oflags)) == -1) - goto error; - ad->ad_mdp->adf_flags = oflags; - ad->ad_mdp->adf_refcount = 1; - adf_lock_init(ad->ad_mdp); + oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC)); + + if (ad_meta_fileno(ad) == -2) + /* symlink */ + EC_EXIT; + + if (ad_meta_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((oflags & O_RDWR) && + /* 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", + fullpathname(path), strerror(errno)); + errno = EACCES; + EC_FAIL; + } + /* it's not new anymore */ + ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT ); + } else { + 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); + 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(ad, NULL) != 0) { - if (!(adflags & ADFLAGS_CREATE)) - goto error; + 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); + errno = ENOENT; + EC_FAIL; + } + + LOG(log_debug, logtype_default, "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; + EC_FAIL; } /* Create one */ - if (new_ad_header(path, ad, 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); } - ad->ad_mdp->adf_refcount++; - - if ((rforklen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) > 0) - ad->ad_rlen = rforklen; - - return 0; + if (ad_meta_fileno(ad) != -1) + ad->ad_mdp->adf_refcount++; + (void)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; - } - return ad_error(ad, adflags); + ad->ad_mdp->adf_refcount = 0; + } + LOG(log_debug, logtype_default, + "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_flags) { + switch (ad->ad_vers) { case AD_VERSION2: ret = ad_open_hf_v2(path, adflags, mode, ad); break; @@ -861,61 +1245,178 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a break; } + if (ret != 0) + 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 */ -static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad) +static int ad_reso_size(const char *path, int adflags, struct adouble *ad) { - int ret = 0; + EC_INIT; + struct stat st; - if (ad->ad_flags != AD_VERSION_EA) - return 0; + LOG(log_debug, logtype_default, "ad_reso_size(\"%s\")", path); - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %04o)", - path, mode); +#ifdef HAVE_EAFD + ssize_t easz; - if ((ad->ad_rlen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) <= 0) { - switch (errno) { - case ENOATTR: - ad->ad_rlen = 0; - break; - default: - LOG(log_warning, logtype_default, "ad_open_rf(\"%s\"): %s", - fullpathname(path), strerror(errno)); - ret = -1; - goto exit; - } + if (ad_reso_fileno(ad) != -1) { + EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); + ad->ad_rlen = st.st_size; + } else if (ad_meta_fileno(ad) != -1) { + EC_NEG1( easz = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0) ); + ad->ad_rlen = easz; + } else { + EC_FAIL; } - /* Round up and allocate buffer */ - size_t roundup = ((ad->ad_rlen / RFORK_EA_ALLOCSIZE) + 1) * RFORK_EA_ALLOCSIZE; - if ((ad->ad_resforkbuf = malloc(roundup)) == NULL) { - ret = -1; - goto exit; - } +#else + const char *rfpath; + EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags)); + EC_ZERO( lstat(rfpath, &st)); + if (st.st_size > ADEDOFF_RFORK_OSX) + ad->ad_rlen = st.st_size - ADEDOFF_RFORK_OSX; + else + ad->ad_rlen = 0; +#endif - ad->ad_resforkbufsize = roundup; + LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen); - /* Read the EA into the buffer */ - if (ad->ad_rlen > 0) { - if (sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, ad->ad_resforkbuf, ad->ad_rlen) == -1) { - ret = -1; - goto exit; - } +EC_CLEANUP: + if (ret != 0) + ad->ad_rlen = 0; + EC_EXIT; +} + +static int ad_open_rf_v2(const char *path, int adflags, int mode, struct adouble *ad) +{ + /* + * 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; +} + +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 + + LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path)); + + oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT); + + if (ad_reso_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((oflags & O_RDWR) + /* and it was already denied: */ + && (ad->ad_rfp->adf_flags & O_RDONLY)) { + errno = EACCES; + EC_FAIL; + } + ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_rfp->adf_refcount++; + EC_NEG1_LOG( ad_reso_size(path, adflags, ad)); + goto EC_CLEANUP; } +#ifdef HAVE_EAFD + if (ad_meta_fileno(ad) == -1) + EC_FAIL; + if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) { + if (!(adflags & ADFLAGS_CREATE)) { + errno = ENOENT; + EC_FAIL; + } + oflags |= O_CREAT; + EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(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); + } +#endif + opened = 1; + ad->ad_rfp->adf_refcount = 1; + ad->ad_rfp->adf_flags = oflags; -exit: +#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\"", + path, rfpath); + LOG(log_debug, logtype_default, "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\"", + path, rfpath); + EC_NEG1_LOG( ad_header_read_osx(NULL, ad, &st) ); + } +#endif + + (void)ad_reso_size(path, adflags, ad); + +EC_CLEANUP: if (ret != 0) { - free(ad->ad_resforkbuf); - ad->ad_resforkbuf = NULL; + if (opened && (ad_reso_fileno(ad) != -1)) { + close(ad_reso_fileno(ad)); + ad_reso_fileno(ad) = -1; + ad->ad_rfp->adf_refcount = 0; + } + if (adflags & ADFLAGS_NORF) { + ret = 0; + } else { + int err = errno; + (void)ad_close(ad, closeflags); + errno = err; + } ad->ad_rlen = 0; - ad->ad_resforkbufsize = 0; + } + + LOG(log_debug, logtype_default, "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; @@ -925,11 +1426,58 @@ exit: * 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; } +const char *ad_path_osx(const char *path, int adflags _U_) +{ + static char pathbuf[ MAXPATHLEN + 1]; + char c, *slash, buf[MAXPATHLEN + 1]; + + if (!strcmp(path,".")) { + /* fixme */ + getcwd(buf, MAXPATHLEN); + } + else { + strlcpy(buf, path, MAXPATHLEN +1); + } + if (NULL != ( slash = strrchr( buf, '/' )) ) { + c = *++slash; + *slash = '\0'; + strlcpy( pathbuf, buf, MAXPATHLEN +1); + *slash = c; + } else { + pathbuf[ 0 ] = '\0'; + slash = buf; + } + strlcat( pathbuf, "._", MAXPATHLEN +1); + strlcat( pathbuf, slash, MAXPATHLEN +1); + return pathbuf; +} + /* * Put the .AppleDouble where it needs to be: * @@ -1051,7 +1599,7 @@ int ad_stat(const char *path, struct stat *stbuf) /* ---------------- return access right of path parent directory */ -int ad_mode( const char *path, int mode) +int ad_mode( const char *path, mode_t mode) { struct stat stbuf; ad_mode_st(path, &mode, &stbuf); @@ -1061,7 +1609,7 @@ int ad_mode( const char *path, int mode) /* * Use mkdir() with mode bits taken from ad_mode(). */ -int ad_mkdir( const char *path, int mode) +int ad_mkdir( const char *path, mode_t mode) { int ret; int st_invalid; @@ -1079,9 +1627,9 @@ int ad_mkdir( const char *path, int mode) return ret; } -void ad_init(struct adouble *ad, int flags, int options) +static void ad_init_func(struct adouble *ad) { - switch (flags) { + switch (ad->ad_vers) { case AD_VERSION2: ad->ad_ops = &ad_adouble; ad->ad_rfp = &ad->ad_resource_fork; @@ -1089,29 +1637,35 @@ void ad_init(struct adouble *ad, int flags, int options) break; case AD_VERSION_EA: ad->ad_ops = &ad_adouble_ea; - ad->ad_rfp = &ad->ad_data_fork; + ad->ad_rfp = &ad->ad_resource_fork; ad->ad_mdp = &ad->ad_data_fork; break; default: - LOG(log_error, logtype_default, "ad_init: unknown AD version"); - errno = EIO; - return; + AFP_PANIC("ad_init: unknown AD version"); } - ad->ad_flags = flags; - ad->ad_options = options; + ad_data_fileno(ad) = -1; ad_reso_fileno(ad) = -1; ad_meta_fileno(ad) = -1; - memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); - ad->ad_rlen = 0; ad->ad_refcount = 1; - ad->ad_open_forks = 0; - ad->ad_resource_fork.adf_refcount = 0; - ad->ad_resforkbuf = NULL; - ad->ad_data_fork.adf_refcount = 0; - ad->ad_data_fork.adf_syml=0; - ad->ad_inited = 0; + return; +} + +void ad_init_old(struct adouble *ad, int flags, int options) +{ + memset(ad, 0, sizeof(struct adouble)); + ad->ad_vers = flags; + ad->ad_options = options; + ad_init_func(ad); +} + +void ad_init(struct adouble *ad, const struct vol * restrict vol) +{ + memset(ad, 0, sizeof(struct adouble)); + ad->ad_vers = vol->v_adouble; + ad->ad_options = vol->v_ad_options; + ad_init_func(ad); } /*! @@ -1130,17 +1684,31 @@ void ad_init(struct adouble *ad, int flags, int options) * * @param ad (rw) pointer to struct adouble * @param path (r) Path to file or directory - * @param adflags (r) ADFLAGS_DF: open data fork \n - * ADFLAGS_RF: open ressource fork \n - * ADFLAGS_HF: open header (metadata) file \n - * ADFLAGS_NOHF: it's not an error if header file couldn't be created \n - * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags \n + * @param adflags (r) Flags specifying which fork to open, can be or'd: + * 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 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: + * ADFLAGS_RDONLY: open read only + * ADFLAGS_RDWR: open read write + * + * Creation flags: + * ADFLAGS_CREATE: create if not existing + * ADFLAGS_TRUNC: truncate + * + * Special flags: + * ADFLAGS_CHECK_OF: check for open forks from us and other afpd's + * ADFLAGS_SETSHRMD: this adouble struct will be used to set sharemode locks. + * This basically results in the files being opened RW instead of RDONLY. + * @param mode (r) mode used with O_CREATE + * * The open mode flags (rw vs ro) have to take into account all the following requirements: * - we remember open fds for files because me must avoid a single close releasing fcntl locks for other * fds of the same file - * - a file may be opened first ro, then rw and theres no way to upgrade this -> fork.c always opens rw - * ADFLAGS_CHECK_OF: check for open forks from us and other afpd's - * @param mode (r) mode used with O_CREATE * * @returns 0 on success, any other value indicates an error */ @@ -1150,8 +1718,27 @@ 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_default, + "ad_open(\"%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 (adflags & ADFLAGS_CHECK_OF) + /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */ + adflags |= ADFLAGS_SETSHRMD; + + 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; @@ -1179,8 +1766,19 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) EC_ZERO( ad_open_rf(path, adflags, mode, ad) ); } + if (adflags & ADFLAGS_CHECK_OF) { + ad->ad_open_forks |= ad_openforks(ad, ad->ad_open_forks); + } + EC_CLEANUP: - return ret; + LOG(log_debug, logtype_default, + "ad_open(\"%s\"): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", + fullpathname(path), 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; } /*! @@ -1199,9 +1797,10 @@ int ad_metadata(const char *name, int flags, struct adouble *adp) uid_t uid; int ret, err, oflags; - oflags = (flags & ADFLAGS_DIR) | ADFLAGS_HF | ADFLAGS_RDONLY; + /* Sanitize flags */ + oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY; - if ((ret = ad_open(adp, name, oflags | ADFLAGS_SETSHRMD)) < 0 && errno == EACCES) { + 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)); @@ -1218,15 +1817,6 @@ int ad_metadata(const char *name, int flags, struct adouble *adp) errno = err; } - if ((ret == 0) && (ADFLAGS_CHECK_OF & flags)) { - /* - we need to check if the file is open by another process. - it's slow so we only do it if we have to: - - it's requested. - - we don't already have the answer! - */ - adp->ad_open_forks |= ad_openforks(adp, adp->ad_open_forks); - } return ret; } @@ -1251,6 +1841,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"); exit(EXITERR_SYS); @@ -1265,13 +1856,50 @@ exit: } -int ad_refresh(struct adouble *ad) +int ad_refresh(const char *path, struct adouble *ad) { + switch (ad->ad_vers) { + case AD_VERSION2: + if (ad_meta_fileno(ad) == -1) + return -1; + return ad->ad_ops->ad_header_read(NULL, ad, NULL); + break; + case AD_VERSION_EA: +#ifdef HAVE_EAFD + if (AD_META_OPEN(ad)) { + if (ad_data_fileno(ad) == -1) + return -1; + // TODO: read meta EA + } - if (ad_meta_fileno(ad) == -1) + if (AD_RSRC_OPEN(ad)) { + if (ad_reso_fileno(ad) == -1) + return -1; + struct stat st; + if (fstat(ad_reso_fileno(ad), &st) == -1) + return -1; + ad->ad_rlen = st.st_size; + } +#else + if (AD_META_OPEN(ad)) { + if (ad_data_fileno(ad) == -1) + return -1; + // TODO: read meta EA + } + if (AD_RSRC_OPEN(ad)) { + if (ad_reso_fileno(ad) == -1) + return -1; + if (ad_header_read_osx(path, ad, NULL) < 0) + return -1; + } +#endif + return ad->ad_ops->ad_header_read(path, ad, NULL); + break; + default: return -1; + break; + } - return ad->ad_ops->ad_header_read(ad, NULL); } int ad_openat(struct adouble *ad, @@ -1308,3 +1936,55 @@ 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; + + LOG(log_debug, logtype_default,"ad_convert(\"%s\"): BEGIN", fullpathname(path)); + + 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: + LOG(log_debug, logtype_default,"ad_convert(\"%s\"): END: %d", fullpathname(path), ret); + 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), + */ +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; +}