X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=b2b291b659a2e1d3e7666fa53d5ef5123d490f60;hp=043cd1f1629a8fa514128db766fb25db1b6d781f;hb=b362b6f7b22b6e4e9e74760989f389149677917b;hpb=1ac3841619c70992db91353e1a7cee61c94fbb83 diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 043cd1f1..b2b291b6 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -1,6 +1,4 @@ /* - * $Id: ad_open.c,v 1.41 2009-06-10 08:37:25 franklahm Exp $ - * * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. @@ -15,16 +13,22 @@ * permission. This software is supplied as is without expressed or * implied warranties of any kind. * - * Research Systems Unix Group - * The University of Michigan - * c/o Mike Clark - * 535 W. William Street - * Ann Arbor, Michigan - * +1-313-763-0525 - * netatalk@itd.umich.edu - * - * NOTE: I don't use inline because a good compiler should be - * able to optimize all the static below. Didier + * Research Systems Unix Group + * The University of Michigan + * c/o Mike Clark + * 535 W. William Street + * Ann Arbor, Michigan + * +1-313-763-0525 + * netatalk@itd.umich.edu + * + */ + +/*! + * @file + * Part of Netatalk's AppleDouble implementatation + * @note We don't use inlines because a good compiler should be + * able to optimize all the static funcs below. + * @sa include/atalk/adouble.h */ #ifdef HAVE_CONFIG_H @@ -52,8 +56,8 @@ * The layout looks like this: * * this is the v1 layout: - * 255 200 16 32 N - * | NAME | COMMENT | FILEI | FINDERI | RFORK | + * 255 200 16 32 N + * | NAME | COMMENT | FILEI | FINDERI | RFORK | * * we need to change it to look like this: * @@ -62,19 +66,19 @@ * NAME 255 * COMMENT 200 * FILEDATESI 16 replaces FILEI - * FINDERI 32 + * FINDERI 32 * DID 4 new * AFPFILEI 4 new * SHORTNAME 12 8.3 new * RFORK N - * + * * so, all we need to do is replace FILEI with FILEDATESI, move RFORK, * and add in the new fields. * * NOTE: the HFS module will need similar modifications to interact with * afpd correctly. */ - + #define ADEDOFF_MAGIC (0) #define ADEDOFF_VERSION (ADEDOFF_MAGIC + ADEDLEN_MAGIC) #define ADEDOFF_FILLER (ADEDOFF_VERSION + ADEDLEN_VERSION) @@ -88,20 +92,20 @@ #undef ADEDOFF_FILEI #endif /* ADEDOFF_FILEI */ -#define ADEDOFF_NAME_V1 (AD_HEADER_LEN + ADEID_NUM_V1*AD_ENTRY_LEN) +#define ADEDOFF_NAME_V1 (AD_HEADER_LEN + ADEID_NUM_V1*AD_ENTRY_LEN) #define ADEDOFF_COMMENT_V1 (ADEDOFF_NAME_V1 + ADEDLEN_NAME) #define ADEDOFF_FILEI (ADEDOFF_COMMENT_V1 + ADEDLEN_COMMENT) #define ADEDOFF_FINDERI_V1 (ADEDOFF_FILEI + ADEDLEN_FILEI) #define ADEDOFF_RFORK_V1 (ADEDOFF_FINDERI_V1 + ADEDLEN_FINDERI) -/* i stick things in a slightly different order than their eid order in - * case i ever want to separate RootInfo behaviour from the rest of the +/* i stick things in a slightly different order than their eid order in + * case i ever want to separate RootInfo behaviour from the rest of the * stuff. */ #define ADEDOFF_NAME_V2 (AD_HEADER_LEN + ADEID_NUM_V2*AD_ENTRY_LEN) #define ADEDOFF_COMMENT_V2 (ADEDOFF_NAME_V2 + ADEDLEN_NAME) #define ADEDOFF_FILEDATESI (ADEDOFF_COMMENT_V2 + ADEDLEN_COMMENT) #define ADEDOFF_FINDERI_V2 (ADEDOFF_FILEDATESI + ADEDLEN_FILEDATESI) -#define ADEDOFF_DID (ADEDOFF_FINDERI_V2 + ADEDLEN_FINDERI) +#define ADEDOFF_DID (ADEDOFF_FINDERI_V2 + ADEDLEN_FINDERI) #define ADEDOFF_AFPFILEI (ADEDOFF_DID + ADEDLEN_DID) #define ADEDOFF_SHORTNAME (ADEDOFF_AFPFILEI + ADEDLEN_AFPFILEI) #define ADEDOFF_PRODOSFILEI (ADEDOFF_SHORTNAME + ADEDLEN_SHORTNAME) @@ -116,7 +120,7 @@ #define ADEDOFF_FINDERI_OSX (AD_HEADER_LEN + ADEID_NUM_OSX*AD_ENTRY_LEN) #define ADEDOFF_RFORK_OSX (ADEDOFF_FINDERI_OSX + ADEDLEN_FINDERI) -/* we keep local copies of a bunch of stuff so that we can initialize things +/* we keep local copies of a bunch of stuff so that we can initialize things * correctly. */ /* this is to prevent changing timezones from causing problems with @@ -126,24 +130,24 @@ struct entry { - u_int32_t id, offset, len; + u_int32_t id, offset, len; }; static const struct entry entry_order1[ADEID_NUM_V1 +1] = { - {ADEID_NAME, ADEDOFF_NAME_V1, ADEDLEN_INIT}, /* 3 */ - {ADEID_COMMENT, ADEDOFF_COMMENT_V1, ADEDLEN_INIT}, /* 4 */ - {ADEID_FILEI, ADEDOFF_FILEI, ADEDLEN_FILEI}, /* 7 */ - {ADEID_FINDERI, ADEDOFF_FINDERI_V1, ADEDLEN_FINDERI}, /* 9 */ - {ADEID_RFORK, ADEDOFF_RFORK_V1, ADEDLEN_INIT}, /* 2 */ - {0, 0, 0} + {ADEID_NAME, ADEDOFF_NAME_V1, ADEDLEN_INIT}, /* 3 */ + {ADEID_COMMENT, ADEDOFF_COMMENT_V1, ADEDLEN_INIT}, /* 4 */ + {ADEID_FILEI, ADEDOFF_FILEI, ADEDLEN_FILEI}, /* 7 */ + {ADEID_FINDERI, ADEDOFF_FINDERI_V1, ADEDLEN_FINDERI}, /* 9 */ + {ADEID_RFORK, ADEDOFF_RFORK_V1, ADEDLEN_INIT}, /* 2 */ + {0, 0, 0} }; -#if AD_VERSION == AD_VERSION1 +#if AD_VERSION == AD_VERSION1 #define DISK_EID(ad, a) (a) #else /* AD_VERSION == AD_VERSION2 */ -static u_int32_t get_eid(struct adouble *ad, u_int32_t eid) +static u_int32_t get_eid(struct adouble *ad, u_int32_t eid) { if (eid <= 15) return eid; @@ -164,39 +168,39 @@ static u_int32_t get_eid(struct adouble *ad, u_int32_t eid) #define DISK_EID(ad, a) get_eid(ad, a) static const struct entry entry_order2[ADEID_NUM_V2 +1] = { - {ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT}, - {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT}, - {ADEID_FILEDATESI, ADEDOFF_FILEDATESI, ADEDLEN_FILEDATESI}, - {ADEID_FINDERI, ADEDOFF_FINDERI_V2, ADEDLEN_FINDERI}, - {ADEID_DID, ADEDOFF_DID, ADEDLEN_DID}, - {ADEID_AFPFILEI, ADEDOFF_AFPFILEI, ADEDLEN_AFPFILEI}, - {ADEID_SHORTNAME, ADEDOFF_SHORTNAME, ADEDLEN_INIT}, - {ADEID_PRODOSFILEI, ADEDOFF_PRODOSFILEI, ADEDLEN_PRODOSFILEI}, - {ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_INIT}, - {ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_INIT}, - {ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_INIT}, - {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT}, - {ADEID_RFORK, ADEDOFF_RFORK_V2, ADEDLEN_INIT}, - - {0, 0, 0} + {ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT}, + {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT}, + {ADEID_FILEDATESI, ADEDOFF_FILEDATESI, ADEDLEN_FILEDATESI}, + {ADEID_FINDERI, ADEDOFF_FINDERI_V2, ADEDLEN_FINDERI}, + {ADEID_DID, ADEDOFF_DID, ADEDLEN_DID}, + {ADEID_AFPFILEI, ADEDOFF_AFPFILEI, ADEDLEN_AFPFILEI}, + {ADEID_SHORTNAME, ADEDOFF_SHORTNAME, ADEDLEN_INIT}, + {ADEID_PRODOSFILEI, ADEDOFF_PRODOSFILEI, ADEDLEN_PRODOSFILEI}, + {ADEID_PRIVDEV, ADEDOFF_PRIVDEV, ADEDLEN_INIT}, + {ADEID_PRIVINO, ADEDOFF_PRIVINO, ADEDLEN_INIT}, + {ADEID_PRIVSYN, ADEDOFF_PRIVSYN, ADEDLEN_INIT}, + {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT}, + {ADEID_RFORK, ADEDOFF_RFORK_V2, ADEDLEN_INIT}, + + {0, 0, 0} }; /* OS X adouble finder info and resource fork only -*/ + */ 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_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI}, + {ADEID_RFORK, ADEDOFF_RFORK_OSX, ADEDLEN_INIT}, - {0, 0, 0} + {0, 0, 0} }; #define ADEID_NUM_SFM 3 static const struct entry entry_order_sfm[ADEID_NUM_SFM +1] = { - {ADEID_FINDERI, 16, ADEDLEN_FINDERI}, /* 9 */ - {ADEID_SFMRESERVE2, 16+32, 6}, /* 21 */ - {ADEID_FILEI, 60, ADEDLEN_FILEI}, /* 7 */ + {ADEID_FINDERI, 16, ADEDLEN_FINDERI}, /* 9 */ + {ADEID_SFMRESERVE2, 16+32, 6}, /* 21 */ + {ADEID_FILEI, 60, ADEDLEN_FILEI}, /* 7 */ - {0, 0, 0} + {0, 0, 0} }; #endif /* AD_VERSION == AD_VERSION2 */ @@ -206,341 +210,315 @@ static const struct entry entry_order_sfm[ADEID_NUM_SFM +1] = { /* update a version 2 adouble resource fork with our private entries */ static int ad_update(struct adouble *ad, const char *path) { - struct stat st; - u_int16_t nentries = 0; - off_t off, shiftdata=0; - const struct entry *eid; - static off_t entry_len[ADEID_MAX]; - static char databuf[ADEID_MAX][256], *buf; - int fd; - int ret = -1; - - /* check to see if we should convert this header. */ - if (!path || ad->ad_flags != AD_VERSION2) - return 0; - - if (!(ad->ad_md->adf_flags & O_RDWR)) { - /* we were unable to open the file read write the last time */ - return 0; - } + struct stat st; + u_int16_t nentries = 0; + off_t off, shiftdata=0; + const struct entry *eid; + static off_t entry_len[ADEID_MAX]; + static char databuf[ADEID_MAX][256], *buf; + int fd; + int ret = -1; - if (ad->ad_eid[ADEID_RFORK].ade_off) { - shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off; - } + /* check to see if we should convert this header. */ + if (!path || ad->ad_flags != AD_VERSION2) + return 0; - memcpy(&nentries, ad->ad_data + ADEDOFF_NENTRIES, sizeof( nentries )); - nentries = ntohs( nentries ); + LOG(log_maxdebug, logtype_default, "ad_update: checking whether '%s' needs an upgrade.", path); - if ( shiftdata == 0 && nentries == ADEID_NUM_V2) - return 0; + if (!(ad->ad_md->adf_flags & O_RDWR)) { + /* we were unable to open the file read write the last time */ + return 0; + } + + if (ad->ad_eid[ADEID_RFORK].ade_off) { + shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off; + } + + memcpy(&nentries, ad->ad_data + ADEDOFF_NENTRIES, sizeof( nentries )); + nentries = ntohs( nentries ); + + if ( shiftdata == 0 && nentries == ADEID_NUM_V2) + return 0; + + memset(entry_len, 0, sizeof(entry_len)); + memset(databuf, 0, sizeof(databuf)); + + /* bail if we can't get a lock */ + if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0) + goto bail_err; + + fd = ad->ad_md->adf_fd; + + if (fstat(fd, &st)) { + goto bail_lock; + } + + if (st.st_size > 0x7fffffff) { + LOG(log_debug, logtype_default, "ad_update: file '%s' too big for update.", path); + errno = EIO; + goto bail_lock; + } + + off = ad->ad_eid[ADEID_RFORK].ade_off; + if (off > st.st_size) { + LOG(log_error, logtype_default, "ad_update: invalid resource fork offset. (off: %u)", off); + errno = EIO; + goto bail_lock; + } + + if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) { + LOG(log_error, logtype_default, "ad_update: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len); + errno = EIO; + goto bail_lock; + } + + if ((void *) (buf = (char *) + mmap(NULL, st.st_size + shiftdata, + PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == + MAP_FAILED) { + goto bail_lock; + } + + /* last place for failure. */ + if (sys_ftruncate(fd, st.st_size + shiftdata) < 0) { + munmap(buf, st.st_size + shiftdata); + goto bail_lock; + } + + /* move the RFORK. this assumes that the RFORK is at the end */ + if (off) { + memmove(buf + ADEDOFF_RFORK_V2, buf + off, ad->ad_eid[ADEID_RFORK].ade_len); + } + + munmap(buf, st.st_size + shiftdata); + + /* now, fix up our copy of the header */ + memset(ad->ad_filler, 0, sizeof(ad->ad_filler)); + + /* save the header entries */ + eid = entry_order2; + while (eid->id) { + if( ad->ad_eid[eid->id].ade_off != 0) { + if ( eid->id > 2 && ad->ad_eid[eid->id].ade_len < 256) + memcpy( databuf[eid->id], ad->ad_data +ad->ad_eid[eid->id].ade_off, ad->ad_eid[eid->id].ade_len); + entry_len[eid->id] = ad->ad_eid[eid->id].ade_len; + } + eid++; + } + + memset(ad->ad_data + AD_HEADER_LEN, 0, AD_DATASZ - AD_HEADER_LEN); + + /* copy the saved entries to the new header */ + eid = entry_order2; + while (eid->id) { + if ( eid->id > 2 && entry_len[eid->id] > 0) { + memcpy(ad->ad_data+eid->offset, databuf[eid->id], entry_len[eid->id]); + } + ad->ad_eid[eid->id].ade_off = eid->offset; + ad->ad_eid[eid->id].ade_len = entry_len[eid->id]; + eid++; + } - memset(entry_len, 0, sizeof(entry_len)); - memset(databuf, 0, sizeof(databuf)); - - /* bail if we can't get a lock */ - if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0) - goto bail_err; - - fd = ad->ad_md->adf_fd; - - if (fstat(fd, &st)) { - goto bail_lock; - } - - if (st.st_size > 0x7fffffff) { - LOG(log_debug, logtype_default, "ad_update: file '%s' too big for update.", path); - errno = EIO; - goto bail_lock; - } - - off = ad->ad_eid[ADEID_RFORK].ade_off; - if (off > st.st_size) { - LOG(log_error, logtype_default, "ad_update: invalid resource fork offset. (off: %u)", off); - errno = EIO; - goto bail_lock; - } - - if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) { - LOG(log_error, logtype_default, "ad_update: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len); - errno = EIO; - goto bail_lock; - } - - if ((void *) (buf = (char *) - mmap(NULL, st.st_size + shiftdata, - PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == - MAP_FAILED) { - goto bail_lock; - } - - /* last place for failure. */ - if (sys_ftruncate(fd, st.st_size + shiftdata) < 0) { - goto bail_lock; - } - - /* move the RFORK. this assumes that the RFORK is at the end */ - if (off) { - memmove(buf + ADEDOFF_RFORK_V2, buf + off, ad->ad_eid[ADEID_RFORK].ade_len); - } - - munmap(buf, st.st_size + shiftdata); - - /* now, fix up our copy of the header */ - memset(ad->ad_filler, 0, sizeof(ad->ad_filler)); - - /* save the header entries */ - eid = entry_order2; - while (eid->id) { - if( ad->ad_eid[eid->id].ade_off != 0) { - if ( eid->id > 2 && ad->ad_eid[eid->id].ade_len < 256) - memcpy( databuf[eid->id], ad->ad_data +ad->ad_eid[eid->id].ade_off, ad->ad_eid[eid->id].ade_len); - entry_len[eid->id] = ad->ad_eid[eid->id].ade_len; - } - eid++; - } - - memset(ad->ad_data + AD_HEADER_LEN, 0, AD_DATASZ - AD_HEADER_LEN); - - /* copy the saved entries to the new header */ - eid = entry_order2; - while (eid->id) { - if ( eid->id > 2 && entry_len[eid->id] > 0) { - memcpy(ad->ad_data+eid->offset, databuf[eid->id], entry_len[eid->id]); - } - ad->ad_eid[eid->id].ade_off = eid->offset; - ad->ad_eid[eid->id].ade_len = entry_len[eid->id]; - eid++; - } - - /* rebuild the header and cleanup */ - LOG(log_debug, logtype_default, "updated AD2 header %s", path); - ad_flush(ad ); - ret = 0; + /* rebuild the header and cleanup */ + LOG(log_debug, logtype_default, "updated AD2 header %s", path); + ad_flush(ad ); + ret = 0; bail_lock: - ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0); + ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0); bail_err: - return ret; + return ret; } /* ------------------------------------------ - FIXME work only if < 2GB + FIXME work only if < 2GB */ static int ad_convert(struct adouble *ad, const char *path) { - struct stat st; - u_int16_t attr; - char *buf; - int fd, off; - int ret = -1; - /* use resource fork offset from file */ - int shiftdata; - int toV2; - int toV1; - - if (!path) { - return 0; - } - - if (!(ad->ad_md->adf_flags & ( O_RDWR))) { - /* we were unable to open the file read write the last time */ - return 0; - } - - /* check to see if we should convert this header. */ - toV2 = ad->ad_version == AD_VERSION1 && ad->ad_flags == AD_VERSION2; - toV1 = ad->ad_version == AD_VERSION2 && ad->ad_flags == AD_VERSION1; - - if (!toV2 && !toV1) - return 0; - - /* convert from v1 to v2. what does this mean? - * 1) change FILEI into FILEDATESI - * 2) create space for SHORTNAME, AFPFILEI, DID, and PRODOSI - * 3) move FILEI attributes into AFPFILEI - * 4) initialize ACCESS field of FILEDATESI. - * 5) move the resource fork - */ - - /* bail if we can't get a lock */ - if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0) - goto bail_err; - - /* we reuse fd from the resource fork */ - fd = ad->ad_md->adf_fd; - - if (ad->ad_eid[ADEID_RFORK].ade_off) { - shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off; - } - else { - shiftdata = ADEDOFF_RFORK_V2 -ADEDOFF_RFORK_V1; /* 136 */ - } - - if (fstat(fd, &st)) { - goto bail_lock; - } - - if (st.st_size > 0x7fffffff -shiftdata) { - LOG(log_debug, logtype_default, "ad_v1tov2: file too big."); - errno = EIO; - goto bail_lock; - } - - off = ad->ad_eid[ADEID_RFORK].ade_off; - - if (off > st.st_size) { - LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork offset. (off: %u)", off); - errno = EIO; - goto bail_lock; - } - - if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) { - LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len); - errno = EIO; - goto bail_lock; - } - - if ((void *) (buf = (char *) - mmap(NULL, st.st_size + shiftdata, - PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == - MAP_FAILED) { - goto bail_lock; - } - - /* last place for failure. */ - - if (sys_ftruncate(fd, st.st_size + shiftdata) < 0) { - goto bail_lock; - } - - /* move the RFORK. this assumes that the RFORK is at the end */ - if (off) { - memmove(buf + ADEDOFF_RFORK_V2, buf + off, ad->ad_eid[ADEID_RFORK].ade_len); - } - - munmap(buf, st.st_size + shiftdata); - - /* now, fix up our copy of the header */ - memset(ad->ad_filler, 0, sizeof(ad->ad_filler)); - - /* replace FILEI with FILEDATESI */ - ad_getattr(ad, &attr); - ad->ad_eid[ADEID_FILEDATESI].ade_off = ADEDOFF_FILEDATESI; - ad->ad_eid[ADEID_FILEDATESI].ade_len = ADEDLEN_FILEDATESI; - ad->ad_eid[ADEID_FILEI].ade_off = 0; - ad->ad_eid[ADEID_FILEI].ade_len = 0; - - /* add in the new entries */ - ad->ad_eid[ADEID_DID].ade_off = ADEDOFF_DID; - ad->ad_eid[ADEID_DID].ade_len = ADEDLEN_DID; - ad->ad_eid[ADEID_AFPFILEI].ade_off = ADEDOFF_AFPFILEI; - ad->ad_eid[ADEID_AFPFILEI].ade_len = ADEDLEN_AFPFILEI; - ad->ad_eid[ADEID_SHORTNAME].ade_off = ADEDOFF_SHORTNAME; - ad->ad_eid[ADEID_SHORTNAME].ade_len = ADEDLEN_INIT; - ad->ad_eid[ADEID_PRODOSFILEI].ade_off = ADEDOFF_PRODOSFILEI; - ad->ad_eid[ADEID_PRODOSFILEI].ade_len = ADEDLEN_PRODOSFILEI; - - ad->ad_eid[ADEID_PRIVDEV].ade_off = ADEDOFF_PRIVDEV; - ad->ad_eid[ADEID_PRIVDEV].ade_len = ADEDLEN_INIT; - ad->ad_eid[ADEID_PRIVINO].ade_off = ADEDOFF_PRIVINO; - ad->ad_eid[ADEID_PRIVINO].ade_len = ADEDLEN_INIT; - ad->ad_eid[ADEID_PRIVSYN].ade_off = ADEDOFF_PRIVSYN; - ad->ad_eid[ADEID_PRIVSYN].ade_len = ADEDLEN_INIT; - ad->ad_eid[ADEID_PRIVID].ade_off = ADEDOFF_PRIVID; - ad->ad_eid[ADEID_PRIVID].ade_len = ADEDLEN_INIT; - - /* shift the old entries (NAME, COMMENT, FINDERI, RFORK) */ - ad->ad_eid[ADEID_NAME].ade_off = ADEDOFF_NAME_V2; - ad->ad_eid[ADEID_COMMENT].ade_off = ADEDOFF_COMMENT_V2; - ad->ad_eid[ADEID_FINDERI].ade_off = ADEDOFF_FINDERI_V2; - ad->ad_eid[ADEID_RFORK].ade_off = ADEDOFF_RFORK_V2; - - /* switch to dest version */ - ad->ad_version = (toV2)?AD_VERSION2:AD_VERSION1; - - /* move our data buffer to make space for the new entries. */ - memmove(ad->ad_data + ADEDOFF_NAME_V2, ad->ad_data + ADEDOFF_NAME_V1, - ADEDOFF_RFORK_V1 - ADEDOFF_NAME_V1); - - /* now, fill in the space with appropriate stuff. we're - operating as a v2 file now. */ - ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, st.st_mtime); - memset(ad_entry(ad, ADEID_DID), 0, ADEDLEN_DID); - memset(ad_entry(ad, ADEID_AFPFILEI), 0, ADEDLEN_AFPFILEI); - ad_setattr(ad, attr); - memset(ad_entry(ad, ADEID_SHORTNAME), 0, ADEDLEN_SHORTNAME); - memset(ad_entry(ad, ADEID_PRODOSFILEI), 0, ADEDLEN_PRODOSFILEI); - - /* rebuild the header and cleanup */ - ad_flush(ad ); - ret = 0; - + struct stat st; + u_int16_t attr; + char *buf; + int fd, off; + int ret = -1; + /* use resource fork offset from file */ + int shiftdata; + int toV2; + int toV1; + + if (!path) { + return 0; + } + + if (!(ad->ad_md->adf_flags & ( O_RDWR))) { + /* we were unable to open the file read write the last time */ + return 0; + } + + /* check to see if we should convert this header. */ + toV2 = ad->ad_version == AD_VERSION1 && ad->ad_flags == AD_VERSION2; + toV1 = ad->ad_version == AD_VERSION2 && ad->ad_flags == AD_VERSION1; + + if (!toV2 && !toV1) + return 0; + + /* convert from v1 to v2. what does this mean? + * 1) change FILEI into FILEDATESI + * 2) create space for SHORTNAME, AFPFILEI, DID, and PRODOSI + * 3) move FILEI attributes into AFPFILEI + * 4) initialize ACCESS field of FILEDATESI. + * 5) move the resource fork + */ + + /* bail if we can't get a lock */ + if (ad_tmplock(ad, ADEID_RFORK, ADLOCK_WR, 0, 0, 0) < 0) + goto bail_err; + + /* we reuse fd from the resource fork */ + fd = ad->ad_md->adf_fd; + + if (ad->ad_eid[ADEID_RFORK].ade_off) { + shiftdata = ADEDOFF_RFORK_V2 -ad->ad_eid[ADEID_RFORK].ade_off; + } + else { + shiftdata = ADEDOFF_RFORK_V2 -ADEDOFF_RFORK_V1; /* 136 */ + } + + if (fstat(fd, &st)) { + goto bail_lock; + } + + if (st.st_size > 0x7fffffff -shiftdata) { + LOG(log_debug, logtype_default, "ad_v1tov2: file too big."); + errno = EIO; + goto bail_lock; + } + + off = ad->ad_eid[ADEID_RFORK].ade_off; + + if (off > st.st_size) { + LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork offset. (off: %u)", off); + errno = EIO; + goto bail_lock; + } + + if (ad->ad_eid[ADEID_RFORK].ade_len > st.st_size - off) { + LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork length. (rfork len: %u)", ad->ad_eid[ADEID_RFORK].ade_len); + errno = EIO; + goto bail_lock; + } + + if ((void *) (buf = (char *) + mmap(NULL, st.st_size + shiftdata, + PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == + MAP_FAILED) { + goto bail_lock; + } + + /* last place for failure. */ + + if (sys_ftruncate(fd, st.st_size + shiftdata) < 0) { + goto bail_lock; + } + + /* move the RFORK. this assumes that the RFORK is at the end */ + if (off) { + memmove(buf + ADEDOFF_RFORK_V2, buf + off, ad->ad_eid[ADEID_RFORK].ade_len); + } + + munmap(buf, st.st_size + shiftdata); + + /* now, fix up our copy of the header */ + memset(ad->ad_filler, 0, sizeof(ad->ad_filler)); + + /* replace FILEI with FILEDATESI */ + ad_getattr(ad, &attr); + ad->ad_eid[ADEID_FILEDATESI].ade_off = ADEDOFF_FILEDATESI; + ad->ad_eid[ADEID_FILEDATESI].ade_len = ADEDLEN_FILEDATESI; + ad->ad_eid[ADEID_FILEI].ade_off = 0; + ad->ad_eid[ADEID_FILEI].ade_len = 0; + + /* add in the new entries */ + ad->ad_eid[ADEID_DID].ade_off = ADEDOFF_DID; + ad->ad_eid[ADEID_DID].ade_len = ADEDLEN_DID; + ad->ad_eid[ADEID_AFPFILEI].ade_off = ADEDOFF_AFPFILEI; + ad->ad_eid[ADEID_AFPFILEI].ade_len = ADEDLEN_AFPFILEI; + ad->ad_eid[ADEID_SHORTNAME].ade_off = ADEDOFF_SHORTNAME; + ad->ad_eid[ADEID_SHORTNAME].ade_len = ADEDLEN_INIT; + ad->ad_eid[ADEID_PRODOSFILEI].ade_off = ADEDOFF_PRODOSFILEI; + ad->ad_eid[ADEID_PRODOSFILEI].ade_len = ADEDLEN_PRODOSFILEI; + + ad->ad_eid[ADEID_PRIVDEV].ade_off = ADEDOFF_PRIVDEV; + ad->ad_eid[ADEID_PRIVDEV].ade_len = ADEDLEN_INIT; + ad->ad_eid[ADEID_PRIVINO].ade_off = ADEDOFF_PRIVINO; + ad->ad_eid[ADEID_PRIVINO].ade_len = ADEDLEN_INIT; + ad->ad_eid[ADEID_PRIVSYN].ade_off = ADEDOFF_PRIVSYN; + ad->ad_eid[ADEID_PRIVSYN].ade_len = ADEDLEN_INIT; + ad->ad_eid[ADEID_PRIVID].ade_off = ADEDOFF_PRIVID; + ad->ad_eid[ADEID_PRIVID].ade_len = ADEDLEN_INIT; + + /* shift the old entries (NAME, COMMENT, FINDERI, RFORK) */ + ad->ad_eid[ADEID_NAME].ade_off = ADEDOFF_NAME_V2; + ad->ad_eid[ADEID_COMMENT].ade_off = ADEDOFF_COMMENT_V2; + ad->ad_eid[ADEID_FINDERI].ade_off = ADEDOFF_FINDERI_V2; + ad->ad_eid[ADEID_RFORK].ade_off = ADEDOFF_RFORK_V2; + + /* switch to dest version */ + ad->ad_version = (toV2)?AD_VERSION2:AD_VERSION1; + + /* move our data buffer to make space for the new entries. */ + memmove(ad->ad_data + ADEDOFF_NAME_V2, ad->ad_data + ADEDOFF_NAME_V1, + ADEDOFF_RFORK_V1 - ADEDOFF_NAME_V1); + + /* now, fill in the space with appropriate stuff. we're + operating as a v2 file now. */ + ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, st.st_mtime); + memset(ad_entry(ad, ADEID_DID), 0, ADEDLEN_DID); + memset(ad_entry(ad, ADEID_AFPFILEI), 0, ADEDLEN_AFPFILEI); + ad_setattr(ad, attr); + memset(ad_entry(ad, ADEID_SHORTNAME), 0, ADEDLEN_SHORTNAME); + memset(ad_entry(ad, ADEID_PRODOSFILEI), 0, ADEDLEN_PRODOSFILEI); + + /* rebuild the header and cleanup */ + ad_flush(ad ); + ret = 0; + bail_lock: - ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0); + ad_tmplock(ad, ADEID_RFORK, ADLOCK_CLR, 0, 0, 0); bail_err: - return ret; + return ret; } #endif /* AD_VERSION == AD_VERSION2 */ -/* --------------------------- */ -#ifdef ATACC -mode_t ad_hf_mode (mode_t mode) -{ - /* we always need RW mode for file owner */ -#if 0 - mode |= S_IRUSR; -#endif - 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; -} - -#endif - -/* ------------------------------------- - read in the entries +/* ------------------------------------- + read in the entries */ static void parse_entries(struct adouble *ad, char *buf, - u_int16_t nentries) + u_int16_t nentries) { - u_int32_t eid, len, off; + u_int32_t eid, len, off; int warning = 0; /* now, read in the entry bits */ for (; nentries > 0; nentries-- ) { - memcpy(&eid, buf, sizeof( eid )); - eid = DISK_EID(ad, ntohl( eid )); - buf += sizeof( eid ); - memcpy(&off, buf, sizeof( off )); - off = ntohl( off ); - buf += sizeof( off ); - memcpy(&len, buf, sizeof( len )); - 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)) { - ad->ad_eid[ eid ].ade_off = off; - ad->ad_eid[ eid ].ade_len = len; - } else if (!warning) { - warning = 1; - LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d", - nentries, eid ); - } + memcpy(&eid, buf, sizeof( eid )); + eid = DISK_EID(ad, ntohl( eid )); + buf += sizeof( eid ); + memcpy(&off, buf, sizeof( off )); + off = ntohl( off ); + buf += sizeof( off ); + memcpy(&len, buf, sizeof( len )); + 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)) { + ad->ad_eid[ eid ].ade_off = off; + ad->ad_eid[ eid ].ade_len = len; + } else if (!warning) { + warning = 1; + LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d", + nentries, eid ); + } } } @@ -563,7 +541,7 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) /* read the header */ if ((header_len = adf_pread( ad->ad_md, buf, sizeof(ad->ad_data), 0)) < 0) { - return -1; + return -1; } if (header_len < AD_HEADER_LEN) { errno = EIO; @@ -573,56 +551,56 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) memcpy(&ad->ad_magic, buf, sizeof( ad->ad_magic )); memcpy(&ad->ad_version, buf + ADEDOFF_VERSION, sizeof( ad->ad_version )); - /* tag broken v1 headers. just assume they're all right. + /* tag broken v1 headers. just assume they're all right. * we detect two cases: null magic/version * byte swapped magic/version - * XXX: in the future, you'll need the v1compat flag. + * XXX: in the future, you'll need the v1compat flag. * (ad->ad_flags & ADFLAGS_V1COMPAT) */ if (!ad->ad_magic && !ad->ad_version) { - if (!warning) { - LOG(log_debug, logtype_default, "notice: fixing up null v1 magic/version."); - warning++; - } - ad->ad_magic = AD_MAGIC; - ad->ad_version = AD_VERSION1; + if (!warning) { + LOG(log_debug, logtype_default, "notice: fixing up null v1 magic/version."); + warning++; + } + ad->ad_magic = AD_MAGIC; + ad->ad_version = AD_VERSION1; } else if (ad->ad_magic == AD_MAGIC && ad->ad_version == AD_VERSION1) { - if (!warning) { - LOG(log_debug, logtype_default, "notice: fixing up byte-swapped v1 magic/version."); - warning++; - } + if (!warning) { + LOG(log_debug, logtype_default, "notice: fixing up byte-swapped v1 magic/version."); + warning++; + } } else { - ad->ad_magic = ntohl( ad->ad_magic ); - ad->ad_version = ntohl( ad->ad_version ); + ad->ad_magic = ntohl( ad->ad_magic ); + ad->ad_version = ntohl( ad->ad_version ); } if ((ad->ad_magic != AD_MAGIC) || ((ad->ad_version != AD_VERSION1) #if AD_VERSION == AD_VERSION2 - && (ad->ad_version != AD_VERSION2) + && (ad->ad_version != AD_VERSION2) #endif /* AD_VERSION == AD_VERSION2 */ - )) { - errno = EIO; - LOG(log_debug, logtype_default, "ad_open: can't parse AppleDouble header."); - return -1; + )) { + LOG(log_debug, logtype_default, "ad_open: can't parse AppleDouble header."); + errno = EIO; + return -1; } memcpy(ad->ad_filler, buf + ADEDOFF_FILLER, sizeof( ad->ad_filler )); memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries )); nentries = ntohs( nentries ); - /* read in all the entry headers. if we have more than the + /* read in all the entry headers. if we have more than the * maximum, just hope that the rfork is specified early on. */ len = nentries*AD_ENTRY_LEN; if (len + AD_HEADER_LEN > sizeof(ad->ad_data)) - len = sizeof(ad->ad_data) - AD_HEADER_LEN; + len = sizeof(ad->ad_data) - AD_HEADER_LEN; buf += AD_HEADER_LEN; if (len > header_len - AD_HEADER_LEN) { + LOG(log_debug, logtype_default, "ad_header_read: can't read entry info."); errno = EIO; - LOG(log_debug, logtype_default, "ad_header_read: can't read entry info."); - return -1; + return -1; } /* figure out all of the entry offsets and lengths. if we aren't @@ -630,49 +608,49 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) nentries = len / AD_ENTRY_LEN; parse_entries(ad, buf, nentries); if (!ad_getentryoff(ad, ADEID_RFORK) - || (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data)) - ) { + || (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data)) + ) { + LOG(log_debug, logtype_default, "ad_header_read: problem with rfork entry offset."); errno = EIO; - LOG(log_debug, logtype_default, "ad_header_read: problem with rfork entry offset."); return -1; } if (ad_getentryoff(ad, ADEID_RFORK) > header_len) { - errno = EIO; - LOG(log_debug, logtype_default, "ad_header_read: can't read in entries."); - return -1; + LOG(log_debug, logtype_default, "ad_header_read: can't read in entries."); + errno = EIO; + return -1; } - + if (hst == NULL) { hst = &st; if (fstat(ad->ad_md->adf_fd, &st) < 0) { - return 1; /* fail silently */ - } + return 1; /* fail silently */ + } } ad->ad_rlen = hst->st_size - ad_getentryoff(ad, ADEID_RFORK); /* fix up broken dates */ if (ad->ad_version == AD_VERSION1) { - u_int32_t aint; - - /* check to see if the ad date is wrong. just see if we have - * a modification date in the future. */ - if (((ad_getdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, &aint)) == 0) && - (aint > TIMEWARP_DELTA + hst->st_mtime)) { - ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, aint - AD_DATE_DELTA); - ad_getdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, &aint); - ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, aint - AD_DATE_DELTA); - ad_getdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, &aint); - ad_setdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, aint - AD_DATE_DELTA); - } + u_int32_t aint; + + /* check to see if the ad date is wrong. just see if we have + * a modification date in the future. */ + if (((ad_getdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, &aint)) == 0) && + (aint > TIMEWARP_DELTA + hst->st_mtime)) { + ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, aint - AD_DATE_DELTA); + ad_getdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, &aint); + ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, aint - AD_DATE_DELTA); + ad_getdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, &aint); + ad_setdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, aint - AD_DATE_DELTA); + } } return 0; } /* --------------------------- - SFM structure - */ + SFM structure +*/ #if 0 typedef struct { byte afpi_Signature[4]; /* Must be 0x00504641 */ @@ -682,7 +660,7 @@ typedef struct { byte finderinfo[32]; /* Finder info */ byte afpi_ProDosInfo[6]; /* ProDos Info */ byte afpi_Reserved2[6]; -} sfm_info; +} sfm_info; #endif static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) @@ -694,7 +672,7 @@ static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) /* read the header */ if ((header_len = adf_pread( ad->ad_md, buf, sizeof(ad->ad_data), 0)) < 0) { - return -1; + return -1; } if (header_len != AD_SFM_LEN) { errno = EIO; @@ -707,44 +685,44 @@ static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) /* FIXME in the great Microsoft tradition they aren't in network order */ #if 0 if (ad->ad_magic == SFM_MAGIC && ad->ad_version == AD_VERSION1) { - static int warning = 0; - if (!warning) { - LOG(log_debug, logtype_default, "notice: fixing up byte-swapped v1 magic/version."); - warning++; - } + static int warning = 0; + if (!warning) { + LOG(log_debug, logtype_default, "notice: fixing up byte-swapped v1 magic/version."); + warning++; + } } else { - ad->ad_magic = ntohl( ad->ad_magic ); - ad->ad_version = ntohl( ad->ad_version ); + ad->ad_magic = ntohl( ad->ad_magic ); + ad->ad_version = ntohl( ad->ad_version ); } #endif if ((ad->ad_magic != SFM_MAGIC) || ((ad->ad_version != AD_VERSION1) )) { - errno = EIO; - LOG(log_debug, logtype_default, "ad_header_sfm_read: can't parse AppleDouble header."); - return -1; + errno = EIO; + LOG(log_debug, logtype_default, "ad_header_sfm_read: can't parse AppleDouble header."); + return -1; } /* reinit adouble table */ eid = entry_order_sfm; while (eid->id) { ad->ad_eid[eid->id].ade_off = eid->offset; - ad->ad_eid[eid->id].ade_len = eid->len; - eid++; + ad->ad_eid[eid->id].ade_len = eid->len; + eid++; } /* steal some prodos for attribute */ { - + u_int16_t attribute; memcpy(&attribute, buf + 48 +4, sizeof(attribute)); ad_setattr(ad, attribute ); } - + if (ad->ad_resource_fork.adf_fd != -1) { /* we have a resource fork use it rather than the metadata */ if (fstat(ad->ad_resource_fork.adf_fd, &st) < 0) { /* XXX set to zero ? - ad->ad_rlen = 0; + ad->ad_rlen = 0; */ return 1; } @@ -754,24 +732,24 @@ static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) else if (hst == NULL) { hst = &st; if (fstat(ad->ad_md->adf_fd, &st) < 0) { - return 1; /* fail silently */ - } + return 1; /* fail silently */ + } } /* fix up broken dates */ if (ad->ad_version == AD_VERSION1) { - u_int32_t aint; - - /* check to see if the ad date is wrong. just see if we have - * a modification date in the future. */ - if (((ad_getdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, &aint)) == 0) && - (aint > TIMEWARP_DELTA + hst->st_mtime)) { - ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, aint - AD_DATE_DELTA); - ad_getdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, &aint); - ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, aint - AD_DATE_DELTA); - ad_getdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, &aint); - ad_setdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, aint - AD_DATE_DELTA); - } + u_int32_t aint; + + /* check to see if the ad date is wrong. just see if we have + * a modification date in the future. */ + if (((ad_getdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, &aint)) == 0) && + (aint > TIMEWARP_DELTA + hst->st_mtime)) { + ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, aint - AD_DATE_DELTA); + ad_getdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, &aint); + ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, aint - AD_DATE_DELTA); + ad_getdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, &aint); + ad_setdate(ad, AD_DATE_BACKUP | AD_DATE_UNIX, aint - AD_DATE_DELTA); + } } return 0; @@ -780,42 +758,41 @@ static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) /* --------------------------------------- * Put the .AppleDouble where it needs to be: * - * / a/.AppleDouble/b - * a/b - * \ b/.AppleDouble/.Parent + * / a/.AppleDouble/b + * a/b + * \ b/.AppleDouble/.Parent * * FIXME: should do something for pathname > MAXPATHLEN */ char * -ad_path( path, adflags ) - const char *path; - int adflags; +ad_path( const char *path, int adflags) { - static char pathbuf[ MAXPATHLEN + 1]; - char c, *slash, buf[MAXPATHLEN + 1]; - size_t l; + static char pathbuf[ MAXPATHLEN + 1]; + const char *slash; + size_t l ; - l = strlcpy(buf, path, MAXPATHLEN +1); if ( adflags & ADFLAGS_DIR ) { - strcpy( pathbuf, buf); - if ( *buf != '\0' && l < MAXPATHLEN) { - pathbuf[l++] = '/'; - pathbuf[l] = 0; - } - slash = ".Parent"; + l = strlcpy( pathbuf, path, sizeof(pathbuf)); + + if ( l && l < MAXPATHLEN) { + pathbuf[l++] = '/'; + } + strlcpy(pathbuf +l, ".AppleDouble/.Parent", sizeof(pathbuf) -l); } else { - if (NULL != ( slash = strrchr( buf, '/' )) ) { - c = *++slash; - *slash = '\0'; - strcpy( pathbuf, buf); - *slash = c; - } else { - pathbuf[ 0 ] = '\0'; - slash = buf; - } + if (NULL != ( slash = strrchr( path, '/' )) ) { + slash++; + l = slash - path; + /* XXX we must return NULL here and test in the caller */ + if (l > MAXPATHLEN) + l = MAXPATHLEN; + memcpy( pathbuf, path, l); + } else { + l = 0; + slash = path; + } + l += strlcpy( pathbuf +l, ".AppleDouble/", sizeof(pathbuf) -l); + strlcpy( pathbuf + l, slash, sizeof(pathbuf) -l); } - strlcat( pathbuf, ".AppleDouble/", MAXPATHLEN +1); - strlcat( pathbuf, slash, MAXPATHLEN +1); return( pathbuf ); } @@ -827,16 +804,16 @@ static int ad_mkrf(char *path) /* * Probably .AppleDouble doesn't exist, try to mkdir it. */ - if (NULL == ( slash = strrchr( path, '/' )) ) { - return -1; - } - *slash = '\0'; - errno = 0; - if ( ad_mkdir( path, 0777 ) < 0 ) { - return -1; - } - *slash = '/'; - return 0; + if (NULL == ( slash = strrchr( path, '/' )) ) { + return -1; + } + *slash = '\0'; + errno = 0; + if ( ad_mkdir( path, 0777 ) < 0 ) { + return -1; + } + *slash = '/'; + return 0; } /* --------------------------------------- @@ -846,26 +823,26 @@ static int ad_mkrf(char *path) char * ad_path_osx(const char *path, int adflags _U_) { - static char pathbuf[ MAXPATHLEN + 1]; - char c, *slash, buf[MAXPATHLEN + 1]; - + static char pathbuf[ MAXPATHLEN + 1]; + char c, *slash, buf[MAXPATHLEN + 1]; + if (!strcmp(path,".")) { - /* fixme */ + /* 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; + c = *++slash; + *slash = '\0'; + strlcpy( pathbuf, buf, MAXPATHLEN +1); + *slash = c; } else { - pathbuf[ 0 ] = '\0'; - slash = buf; + pathbuf[ 0 ] = '\0'; + slash = buf; } - strlcat( pathbuf, "._", MAXPATHLEN +1); + strlcat( pathbuf, "._", MAXPATHLEN +1); strlcat( pathbuf, slash, MAXPATHLEN +1); return pathbuf; } @@ -878,76 +855,36 @@ static int ad_mkrf_osx(char *path _U_) /* --------------------------------------- * Put the .AppleDouble where it needs to be: * - * / a/.AppleDouble/b/Afp_AfpInfo - * a/b - * \ b/.AppleDouble/.Parent/Afp_AfpInfo + * / a/.AppleDouble/b/AFP_AfpInfo + * a/b + * \ b/.AppleDouble/.Parent/AFP_AfpInfo * */ char * -ad_path_ads( path, adflags ) - const char *path; - int adflags; +ad_path_sfm( const char *path, int adflags) { - static char pathbuf[ MAXPATHLEN + 1]; - char c, *slash, buf[MAXPATHLEN + 1]; + static char pathbuf[ MAXPATHLEN + 1]; + char c, *slash, buf[MAXPATHLEN + 1]; size_t l; l = strlcpy(buf, path, MAXPATHLEN +1); if ( adflags & ADFLAGS_DIR ) { - strcpy( pathbuf, buf); - if ( *buf != '\0' && l < MAXPATHLEN) { - pathbuf[l++] = '/'; - pathbuf[l] = 0; - } - slash = ".Parent"; - } else { - if (NULL != ( slash = strrchr( buf, '/' )) ) { - c = *++slash; - *slash = '\0'; - strcpy( pathbuf, buf); - *slash = c; - } else { - pathbuf[ 0 ] = '\0'; - slash = buf; - } - } - strlcat( pathbuf, ".AppleDouble/", MAXPATHLEN +1); - strlcat( pathbuf, slash, MAXPATHLEN +1); - - strlcat( pathbuf, "/Afp_AfpInfo", MAXPATHLEN +1); - return( pathbuf ); -} - -/* ---------------------- - * mostly the same as ads, only case change Afp --> AFP and AFP_Resoure -*/ -char * -ad_path_sfm( path, adflags ) - const char *path; - int adflags; -{ - static char pathbuf[ MAXPATHLEN + 1]; - char c, *slash, buf[MAXPATHLEN + 1]; - size_t l; - - l = strlcpy(buf, path, MAXPATHLEN +1); - if ( adflags & ADFLAGS_DIR ) { - strcpy( pathbuf, buf); - if ( *buf != '\0' && l < MAXPATHLEN) { - pathbuf[l++] = '/'; - pathbuf[l] = 0; - } - slash = ".Parent"; + strcpy( pathbuf, buf); + if ( *buf != '\0' && l < MAXPATHLEN) { + pathbuf[l++] = '/'; + pathbuf[l] = 0; + } + slash = ".Parent"; } else { - if (NULL != ( slash = strrchr( buf, '/' )) ) { - c = *++slash; - *slash = '\0'; - strcpy( pathbuf, buf); - *slash = c; - } else { - pathbuf[ 0 ] = '\0'; - slash = buf; - } + if (NULL != ( slash = strrchr( buf, '/' )) ) { + c = *++slash; + *slash = '\0'; + strcpy( pathbuf, buf); + *slash = c; + } else { + pathbuf[ 0 ] = '\0'; + slash = buf; + } } strlcat( pathbuf, ".AppleDouble/", MAXPATHLEN +1); strlcat( pathbuf, slash, MAXPATHLEN +1); @@ -962,36 +899,36 @@ ad_path_sfm( path, adflags ) } /* -------------------- */ -static int ad_mkrf_ads(char *path) +static int ad_mkrf_sfm(char *path) { char *slash; /* * Probably .AppleDouble doesn't exist, try to mkdir it. */ - if (NULL == ( slash = strrchr( path, '/' )) ) { - return -1; - } - *slash = 0; - errno = 0; - if ( ad_mkdir( path, 0777 ) < 0 ) { - if ( errno == ENOENT ) { - char *slash1; - - if (NULL == ( slash1 = strrchr( path, '/' )) ) - return -1; - errno = 0; - *slash1 = 0; - if ( ad_mkdir( path, 0777 ) < 0 ) - return -1; - *slash1 = '/'; - if ( ad_mkdir( path, 0777 ) < 0 ) - return -1; - } - else + if (NULL == ( slash = strrchr( path, '/' )) ) { + return -1; + } + *slash = 0; + errno = 0; + if ( ad_mkdir( path, 0777 ) < 0 ) { + if ( errno == ENOENT ) { + char *slash1; + + if (NULL == ( slash1 = strrchr( path, '/' )) ) + return -1; + errno = 0; + *slash1 = 0; + if ( ad_mkdir( path, 0777 ) < 0 ) + return -1; + *slash1 = '/'; + if ( ad_mkdir( path, 0777 ) < 0 ) + return -1; + } + else return -1; - } - *slash = '/'; - return 0; + } + *slash = '/'; + return 0; } /* ------------------------- @@ -1000,44 +937,53 @@ static int ad_mkrf_ads(char *path) * and that value is returned. */ -#define DEFMASK 07700 /* be conservative */ +#define DEFMASK 07700 /* be conservative */ -char -*ad_dir(path) - const char *path; +char +*ad_dir(const char *path) { - static char modebuf[ MAXPATHLEN + 1]; - char *slash; - size_t len; - - if ( (len = strlen( path )) >= MAXPATHLEN ) { - errno = ENAMETOOLONG; - return NULL; /* can't do it */ - } - + static char modebuf[ MAXPATHLEN + 1]; + char *slash; /* * For a path with directories in it, remove the final component * (path or subdirectory name) to get the name we want to stat. * For a path which is just a filename, use "." instead. */ - strcpy( modebuf, path ); - slash = strrchr( modebuf, '/' ); - /* is last char a '/' */ - if (slash && slash[1] == 0) { - while (modebuf < slash && slash[-1] == '/') { - --slash; - } - if (modebuf < slash) { - *slash = '\0'; /* remove pathname component */ - slash = strrchr( modebuf, '/' ); - } - } + slash = strrchr( path, '/' ); if (slash) { - *slash = '\0'; /* remove pathname component */ - } else { - modebuf[0] = '.'; /* use current directory */ - modebuf[1] = '\0'; + size_t len; + + len = slash - path; + if (len >= MAXPATHLEN) { + errno = ENAMETOOLONG; + return NULL; /* can't do it */ + } + memcpy( modebuf, path, len ); + modebuf[len] = '\0'; + /* is last char a '/' ? */ + if (slash[1] == 0) { + slash = modebuf+ len; + /* remove them */ + while (modebuf < slash && slash[-1] == '/') { + --slash; + } + if (modebuf == slash) { + goto use_cur; + } + *slash = '\0'; + while (modebuf < slash && *slash != '/') { + --slash; + } + if (modebuf == slash) { + goto use_cur; + } + *slash = '\0'; /* remove pathname component */ + } + return modebuf; } +use_cur: + modebuf[0] = '.'; /* use current directory */ + modebuf[1] = '\0'; return modebuf; } @@ -1051,12 +997,12 @@ int ad_setfuid(const uid_t id) } /* ---------------- */ -uid_t ad_getfuid(void) +uid_t ad_getfuid(void) { return default_uid; } -/* ---------------- +/* ---------------- return inode of path parent directory */ int ad_stat(const char *path, struct stat *stbuf) @@ -1068,59 +1014,57 @@ int ad_stat(const char *path, struct stat *stbuf) return -1; } - return stat( p, stbuf ); + return stat(p, stbuf); } -/* ---------------- +/* ---------------- if we are root change path user/ group It can be a native function for BSD cf. FAQ.Q10 - path: pathname to chown + path: pathname to chown stbuf: parent directory inode - + use fstat and fchown or lchown with linux? */ #define EMULATE_SUIDDIR - + static int ad_chown(const char *path, struct stat *stbuf) { -int ret = 0; + int ret = 0; #ifdef EMULATE_SUIDDIR -uid_t id; + uid_t id; - if (default_uid != (uid_t)-1) { + if (default_uid != (uid_t)-1) { /* we are root (admin) */ id = (default_uid)?default_uid:stbuf->st_uid; - ret = chown( path, id, stbuf->st_gid ); + ret = chown(path, id, stbuf->st_gid); } -#endif +#endif return ret; } -/* ---------------- +/* ---------------- return access right and inode of path parent directory */ static int ad_mode_st(const char *path, int *mode, struct stat *stbuf) { if (*mode == 0) { - return -1; + return -1; } if (ad_stat(path, stbuf) != 0) { - *mode &= DEFMASK; - return -1; + *mode &= DEFMASK; + return -1; } *mode &= stbuf->st_mode; - return 0; + return 0; } -/* ---------------- +/* ---------------- return access right of path parent directory */ int -ad_mode( path, mode ) - const char *path; - int mode; +ad_mode( const char *path, int mode) { - struct stat stbuf; + struct stat stbuf; ad_mode_st(path, &mode, &stbuf); return mode; } @@ -1129,38 +1073,35 @@ ad_mode( path, mode ) * Use mkdir() with mode bits taken from ad_mode(). */ int -ad_mkdir( path, mode ) - const char *path; - int mode; +ad_mkdir( const char *path, int mode) { -int ret; -int st_invalid; -struct stat stbuf; + int ret; + int st_invalid; + struct stat stbuf; -#ifdef DEBUG - LOG(log_info, logtype_default, "ad_mkdir: Creating directory with mode %d", mode); -#endif /* DEBUG */ + LOG(log_debug, logtype_default, "ad_mkdir(\"%s\", %04o) {cwd: \"%s\"}", + path, mode, getcwdpath()); st_invalid = ad_mode_st(path, &mode, &stbuf); ret = mkdir( path, mode ); if (ret || st_invalid) - return ret; + return ret; ad_chown(path, &stbuf); - return ret; + return ret; } /* ----------------- */ static int ad_error(struct adouble *ad, int adflags) { -int err = errno; + int err = errno; if ((adflags & ADFLAGS_NOHF)) { /* FIXME double check : set header offset ?*/ return 0; } if ((adflags & ADFLAGS_DF)) { - ad_close( ad, ADFLAGS_DF ); - err = errno; + ad_close( ad, ADFLAGS_DF ); + err = errno; } return -1 ; } @@ -1168,25 +1109,25 @@ int err = errno; static int new_rfork(const char *path, struct adouble *ad, int adflags); #ifdef HAVE_PREAD -#define AD_SET(a) -#else +#define AD_SET(a) +#else #define AD_SET(a) a = 0 #endif /* --------------------------- */ -static int ad_check_size(struct adouble *ad, struct stat *st) +static int ad_check_size(struct adouble *ad _U_, struct stat *st) { - if (st->st_size > 0 && st->st_size < AD_DATASZ1) - return 1; - return 0; + if (st->st_size > 0 && st->st_size < AD_DATASZ1) + return 1; + return 0; } /* --------------------------- */ -static int ad_check_size_sfm(struct adouble *ad, struct stat *st) +static int ad_check_size_sfm(struct adouble *ad _U_, struct stat *st) { - if (st->st_size > 0 && st->st_size < AD_SFM_LEN) - return 1; - return 0; + if (st->st_size > 0 && st->st_size < AD_SFM_LEN) + return 1; + return 0; } /* --------------------------- */ @@ -1195,327 +1136,381 @@ static int ad_header_upgrade(struct adouble *ad, char *name) #if AD_VERSION == AD_VERSION2 int ret; if ( (ret = ad_convert(ad, name)) < 0 || (ret = ad_update(ad, name) < 0)) { - return ret; + return ret; } #endif return 0; } /* --------------------------- */ -static int ad_header_upgrade_none(struct adouble *ad, char *name) +static int ad_header_upgrade_none(struct adouble *ad _U_, char *name _U_) { return 0; } /* --------------------------- */ static struct adouble_fops ad_osx = { - &ad_path_osx, - &ad_mkrf_osx, - &ad_rebuild_adouble_header, - &ad_check_size, - - &ad_header_read, - &ad_header_upgrade, -}; - -static struct adouble_fops ad_ads = { - &ad_path_ads, - &ad_mkrf_ads, - &ad_rebuild_adouble_header, - &ad_check_size, + &ad_path_osx, + &ad_mkrf_osx, + &ad_rebuild_adouble_header, + &ad_check_size, - &ad_header_read, - &ad_header_upgrade, + &ad_header_read, + &ad_header_upgrade, }; static struct adouble_fops ad_sfm = { - &ad_path_sfm, - &ad_mkrf_ads, - &ad_rebuild_sfm_header, - &ad_check_size_sfm, - - &ad_header_sfm_read, - &ad_header_upgrade_none, + &ad_path_sfm, + &ad_mkrf_sfm, + &ad_rebuild_sfm_header, + &ad_check_size_sfm, + + &ad_header_sfm_read, + &ad_header_upgrade_none, }; static struct adouble_fops ad_adouble = { - &ad_path, - &ad_mkrf, - &ad_rebuild_adouble_header, - &ad_check_size, + &ad_path, + &ad_mkrf, + &ad_rebuild_adouble_header, + &ad_check_size, - &ad_header_read, - &ad_header_upgrade, + &ad_header_read, + &ad_header_upgrade, }; void ad_init(struct adouble *ad, int flags, int options) { - memset( ad, 0, sizeof( struct adouble ) ); + ad->ad_inited = 0; ad->ad_flags = flags; if (flags == AD_VERSION2_OSX) { ad->ad_ops = &ad_osx; - } - else if (flags == AD_VERSION1_ADS) { - ad->ad_ops = &ad_ads; + ad->ad_md = &ad->ad_resource_fork; } else if (flags == AD_VERSION1_SFM) { ad->ad_ops = &ad_sfm; + ad->ad_md = &ad->ad_metadata_fork; } else { ad->ad_ops = &ad_adouble; + ad->ad_md = &ad->ad_resource_fork; } ad->ad_options = options; + + ad_data_fileno(ad) = -1; + ad_reso_fileno(ad) = -1; + ad_meta_fileno(ad) = -1; + /* following can be read even if there's no + * meda data. + */ + memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); + ad->ad_rlen = 0; } -/* ------------------- - * It's not possible to open the header file O_RDONLY -- the read - * will fail and return an error. this refcounts things now. +/*! + * Open data-, metadata(header)- or ressource fork + * + * You must call ad_init() before ad_open, usually you'll just call it like this: \n + * @code + * struct adoube ad; + * ad_init(&ad, vol->v_adouble, vol->v_ad_options); + * @endcode + * + * @param path Path to file or directory + * + * @param adflags ADFLAGS_DF: open data file/fork\n + * ADFLAGS_HF: open header (metadata) file\n + * ADFLAGS_RF: open ressource fork *** FIXME: not used ?! *** \n + * ADFLAGS_CREATE: indicate creation\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 + * ADFLAGS_NOADOUBLE: dont create adouble files if not necessary\n + * ADFLAGS_RDONLY: open read only\n + * ADFLAGS_OPENFORKS: check for open forks from other processes\n + * ADFLAGS_MD: alias for ADFLAGS_HF\n + * ADFLAGS_V1COMPAT: obsolete + * + * @param oflags flags passed through to open syscall: \n + * O_RDONLY: *** FIXME *** \n + * O_RDWR: *** FIXME *** \n + * O_CREAT: create fork\n + * O_EXCL: fail if exists with O_CREAT + * + * @param mode passed to open with O_CREAT + * + * @param ad pointer to struct adouble + * + * @returns 0 on success + * + * @note It's not possible to open the header file O_RDONLY -- the read + * will fail and return an error. this refcounts things now.\n + * metadata(ressource)-fork only gets created with O_CREAT. */ -int ad_open( path, adflags, oflags, mode, ad ) - const char *path; - int adflags, oflags, mode; - struct adouble *ad; +int ad_open( const char *path, int adflags, int oflags, int mode, struct adouble *ad) { struct stat st_dir; struct stat st_meta; struct stat *pst = NULL; - char *ad_p; - int hoflags, admode; + char *ad_p; + int hoflags, admode; int st_invalid = -1; int open_df = 0; - + if (ad->ad_inited != AD_INITED) { - ad_data_fileno(ad) = -1; - ad_reso_fileno(ad) = -1; - adf_lock_init(&ad->ad_data_fork); - adf_lock_init(&ad->ad_resource_fork); - if (ad->ad_flags != AD_VERSION1_SFM) { - ad->ad_md = &ad->ad_resource_fork; - } - else { - adf_lock_init(&ad->ad_metadata_fork); - ad->ad_md = &ad->ad_metadata_fork; - ad_meta_fileno(ad) = -1; - } ad->ad_inited = AD_INITED; ad->ad_refcount = 1; ad->ad_open_forks = 0; + ad->ad_adflags = adflags; + ad->ad_resource_fork.adf_refcount = 0; + ad->ad_data_fork.adf_refcount = 0; + ad->ad_data_fork.adf_syml=0; } else { - ad->ad_open_forks = ((ad->ad_data_fork.adf_refcount > 0) ? ATTRBIT_DOPEN : 0); - /* XXX not true if we have a meta data fork ? */ - if ((ad->ad_resource_fork.adf_refcount > ad->ad_data_fork.adf_refcount)) - ad->ad_open_forks |= ATTRBIT_ROPEN; + ad->ad_open_forks = ((ad->ad_data_fork.adf_refcount > 0) ? ATTRBIT_DOPEN : 0); + /* XXX not true if we have a meta data fork ? */ + if ((ad->ad_resource_fork.adf_refcount > ad->ad_data_fork.adf_refcount)) + ad->ad_open_forks |= ATTRBIT_ROPEN; } - if ((adflags & ADFLAGS_DF)) { + if ((adflags & ADFLAGS_DF)) { if (ad_data_fileno(ad) == -1) { - hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR; - admode = mode; - if ((oflags & O_CREAT)) { - st_invalid = ad_mode_st(path, &admode, &st_dir); - if ((ad->ad_options & ADVOL_UNIXPRIV)) { - admode = mode; - } - } - ad->ad_data_fork.adf_fd =open( path, hoflags, admode ); - if (ad->ad_data_fork.adf_fd < 0 ) { - if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { - hoflags = oflags; - ad->ad_data_fork.adf_fd = open( path, hoflags, admode ); - } - } - if ( ad->ad_data_fork.adf_fd < 0) - return -1; - - AD_SET(ad->ad_data_fork.adf_off); - ad->ad_data_fork.adf_flags = hoflags; - if (!st_invalid) { - /* just created, set owner if admin (root) */ - ad_chown(path, &st_dir); - } - } + hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR; + admode = mode; + if ((oflags & O_CREAT)) { + st_invalid = ad_mode_st(path, &admode, &st_dir); + if ((ad->ad_options & ADVOL_UNIXPRIV)) { + admode = mode; + } + } + + ad->ad_data_fork.adf_fd = open(path, hoflags | ad_get_syml_opt(ad), admode); + + if (ad->ad_data_fork.adf_fd == -1) { + if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { + hoflags = oflags; + ad->ad_data_fork.adf_fd = open( path, hoflags | ad_get_syml_opt(ad), admode ); + } + if (ad->ad_data_fork.adf_fd == -1 && errno == OPEN_NOFOLLOW_ERRNO) { + int lsz; + + ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1); + lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN); + if (lsz <= 0) { + free(ad->ad_data_fork.adf_syml); + return -1; + } + ad->ad_data_fork.adf_syml[lsz] = 0; + ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */ + } + } + + if ( ad->ad_data_fork.adf_fd == -1 ) + return -1; + + AD_SET(ad->ad_data_fork.adf_off); + ad->ad_data_fork.adf_flags = hoflags; + if (!st_invalid) { + /* just created, set owner if admin (root) */ + ad_chown(path, &st_dir); + } + adf_lock_init(&ad->ad_data_fork); + } else { /* the file is already open... but */ if ((oflags & ( O_RDWR | O_WRONLY)) && /* we want write access */ - !(ad->ad_data_fork.adf_flags & ( O_RDWR | O_WRONLY))) /* and it was denied the first time */ + !(ad->ad_data_fork.adf_flags & ( O_RDWR | O_WRONLY))) /* and it was denied the first time */ { - errno = EACCES; - return -1; + errno = EACCES; + return -1; } - /* FIXME - * for now ad_open is never called with O_TRUNC or O_EXCL if the file is - * already open. Should we check for it? ie - * O_EXCL --> error - * O_TRUNC --> truncate the fork. - * idem for ressource fork. - */ - } - open_df = ADFLAGS_DF; - ad->ad_data_fork.adf_refcount++; - } - - if (!(adflags & ADFLAGS_HF)) + /* FIXME + * for now ad_open is never called with O_TRUNC or O_EXCL if the file is + * already open. Should we check for it? ie + * O_EXCL --> error + * O_TRUNC --> truncate the fork. + * idem for ressource fork. + */ + } + open_df = ADFLAGS_DF; + ad->ad_data_fork.adf_refcount++; + } + + if (!(adflags & ADFLAGS_HF)) return 0; /* ****************************************** */ - + if (ad_meta_fileno(ad) != -1) { /* the file is already open */ - if ((oflags & ( O_RDWR | O_WRONLY)) && - !(ad->ad_md->adf_flags & ( O_RDWR | O_WRONLY))) { - if (open_df) { + if ((oflags & ( O_RDWR | O_WRONLY)) && + !(ad->ad_md->adf_flags & ( O_RDWR | O_WRONLY))) { + if (open_df) { /* don't call with ADFLAGS_HF because we didn't open ressource fork */ - ad_close( ad, open_df ); - } + ad_close( ad, open_df ); + } errno = EACCES; - return -1; - } - ad_refresh(ad); - ad->ad_md->adf_refcount++; - goto sfm; + return -1; + } + ad_refresh(ad); + /* it's not new anymore */ + ad->ad_md->adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_md->adf_refcount++; + goto sfm; } + memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); + ad->ad_rlen = 0; ad_p = ad->ad_ops->ad_path( path, adflags ); - hoflags = oflags & ~O_CREAT; + hoflags = oflags & ~(O_CREAT | O_EXCL); if (!(adflags & ADFLAGS_RDONLY)) { hoflags = (hoflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR; } - ad->ad_md->adf_fd = open( ad_p, hoflags, 0 ); + ad->ad_md->adf_fd = open(ad_p, hoflags | ad_get_syml_opt(ad), 0); if (ad->ad_md->adf_fd < 0 ) { if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { - hoflags = oflags & ~O_CREAT; - ad->ad_md->adf_fd = open( ad_p, hoflags, 0 ); - } + hoflags = oflags & ~(O_CREAT | O_EXCL); + ad->ad_md->adf_fd = open(ad_p, hoflags | ad_get_syml_opt(ad), 0); + } } - if ( ad->ad_md->adf_fd < 0 ) { + if ( ad->ad_md->adf_fd < 0 ) { if (errno == ENOENT && (oflags & O_CREAT) ) { - /* - * We're expecting to create a new adouble header file, - * here. - * if ((oflags & O_CREAT) ==> (oflags & O_RDWR) - */ - admode = mode; - errno = 0; - st_invalid = ad_mode_st(ad_p, &admode, &st_dir); - if ((ad->ad_options & ADVOL_UNIXPRIV)) { - admode = mode; - } - admode = ad_hf_mode(admode); - if ( errno == ENOENT && !(adflags & ADFLAGS_NOADOUBLE) && ad->ad_flags != AD_VERSION2_OSX) { - if (ad->ad_ops->ad_mkrf( ad_p) < 0) { - return ad_error(ad, adflags); - } - admode = mode; - st_invalid = ad_mode_st(ad_p, &admode, &st_dir); - if ((ad->ad_options & ADVOL_UNIXPRIV)) { - admode = mode; - } - admode = ad_hf_mode(admode); - } - /* retry with O_CREAT */ - ad->ad_md->adf_fd = open( ad_p, oflags,admode ); - if ( ad->ad_md->adf_fd < 0 ) { - return ad_error(ad, adflags); - } - ad->ad_md->adf_flags = oflags; - /* just created, set owner if admin owner (root) */ - if (!st_invalid) { - ad_chown(ad_p, &st_dir); - } - } - else { - return ad_error(ad, adflags); - } - } else if (fstat(ad->ad_md->adf_fd, &st_meta) == 0 && st_meta.st_size == 0) { - /* for 0 length files, treat them as new. */ - ad->ad_md->adf_flags = hoflags| O_TRUNC; + /* + * 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\"): {cwd: \"%s\"} creating adouble file", + ad_p, getcwdpath()); + admode = mode; + errno = 0; + st_invalid = ad_mode_st(ad_p, &admode, &st_dir); + if ((ad->ad_options & ADVOL_UNIXPRIV)) { + admode = mode; + } + admode = ad_hf_mode(admode); + if ((errno == ENOENT) && (ad->ad_flags != AD_VERSION2_OSX)) { + if (ad->ad_ops->ad_mkrf(ad_p) < 0) { + return ad_error(ad, adflags); + } + admode = mode; + st_invalid = ad_mode_st(ad_p, &admode, &st_dir); + if ((ad->ad_options & ADVOL_UNIXPRIV)) { + admode = mode; + } + admode = ad_hf_mode(admode); + } + /* retry with O_CREAT */ + ad->ad_md->adf_fd = open( ad_p, oflags,admode ); + if ( ad->ad_md->adf_fd < 0 ) { + return ad_error(ad, adflags); + } + ad->ad_md->adf_flags = oflags; + /* just created, set owner if admin owner (root) */ + if (!st_invalid) { + ad_chown(ad_p, &st_dir); + } + } + else { + return ad_error(ad, adflags); + } } else { ad->ad_md->adf_flags = hoflags; + if (fstat(ad->ad_md->adf_fd, &st_meta) == 0 && st_meta.st_size == 0) { + /* for 0 length files, treat them as new. */ + ad->ad_md->adf_flags |= O_TRUNC; + } + else { + /* we have valid data in st_meta stat structure, reused it + in ad_header_read + */ + pst = &st_meta; + } } AD_SET(ad->ad_md->adf_off); - - memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); - ad->ad_md->adf_refcount++; + + ad->ad_md->adf_refcount = 1; + adf_lock_init(ad->ad_md); if ((ad->ad_md->adf_flags & ( O_TRUNC | O_CREAT ))) { /* * This is a new adouble header file. Initialize the structure, * instead of reading it. - */ + */ if (new_rfork(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; - } + return -1; + } + 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) - { + /* 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; - } + return -1; + } } /* ****************************************** */ /* open the resource fork if SFM */ sfm: if (ad->ad_flags != AD_VERSION1_SFM) { - return 0; + return 0; } if ((adflags & ADFLAGS_DIR)) { - /* no resource fork for directories / volumes XXX it's false! */ - return 0; + /* no resource fork for directories / volumes XXX it's false! */ + return 0; } /* untrue yet but ad_close will decremente it*/ ad->ad_resource_fork.adf_refcount++; if (ad_reso_fileno(ad) != -1) { /* the file is already open */ - if ((oflags & ( O_RDWR | O_WRONLY)) && - !(ad->ad_resource_fork.adf_flags & ( O_RDWR | O_WRONLY))) { + if ((oflags & ( O_RDWR | O_WRONLY)) && + !(ad->ad_resource_fork.adf_flags & ( O_RDWR | O_WRONLY))) { ad_close( ad, open_df | ADFLAGS_HF); errno = EACCES; - return -1; - } - return 0; + return -1; + } + return 0; } ad_p = ad->ad_ops->ad_path( path, ADFLAGS_RF ); - hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR; - ad->ad_resource_fork.adf_fd = open( ad_p, hoflags, admode ); admode = mode; st_invalid = ad_mode_st(ad_p, &admode, &st_dir); - + if ((ad->ad_options & ADVOL_UNIXPRIV)) { - admode = mode; + admode = mode; } - + + hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR; + ad->ad_resource_fork.adf_fd = open( ad_p, hoflags, admode ); + if (ad->ad_resource_fork.adf_fd < 0 ) { - if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { - hoflags = oflags; - ad->ad_resource_fork.adf_fd =open( ad_p, hoflags, admode ); - } + if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { + hoflags = oflags; + ad->ad_resource_fork.adf_fd =open( ad_p, hoflags, admode ); + } } if ( ad->ad_resource_fork.adf_fd < 0) { - int err = errno; - - ad_close( ad, adflags ); - errno = err; - return -1; + int err = errno; + + ad_close( ad, adflags ); + errno = err; + return -1; } - + adf_lock_init(&ad->ad_resource_fork); AD_SET(ad->ad_resource_fork.adf_off); ad->ad_resource_fork.adf_flags = hoflags; if ((oflags & O_CREAT) && !st_invalid) { @@ -1528,18 +1523,36 @@ sfm: return 0 ; } -/* ----------------------------------- - * return only metadata but try very hard -*/ +/*! + * @brief open metadata, possibly as root + * + * Return only metadata but try very hard ie at first try as user, then try as root. + * + * @param name name of file/dir + * @param flags ADFLAGS_DIR: name is a directory \n + * ADFLAGS_CREATE: force creation of header file, but only as user, not as root\n + * ADFLAGS_OPENFORKS: test if name is open by another afpd process + * + * @param adp pointer to struct adouble + * + * @note caller MUST pass ADFLAGS_DIR for directories. Whether ADFLAGS_CREATE really creates + * a adouble file depends on various other volume options, eg. ADVOL_CACHE + */ int ad_metadata(const char *name, int flags, struct adouble *adp) { uid_t uid; - int ret, err; - int dir = flags & ADFLAGS_DIR; + int ret, err, dir; + int create = O_RDONLY; + + dir = flags & ADFLAGS_DIR; - /* Open with O_CREAT, thus enumarating a dir will create missing adouble files, see: */ - /* http://marc.info/?l=netatalk-devel&m=124039156832408&w=2 */ - if ((ret = ad_open(name, ADFLAGS_HF | dir, O_RDWR | O_CREAT, 0666, adp)) < 0 && errno == EACCES) { + /* Check if we shall call ad_open with O_CREAT */ + if ( (adp->ad_options & ADVOL_CACHE) + && ! (adp->ad_options & ADVOL_NOADOUBLE) + && (flags & ADFLAGS_CREATE) ) { + create = O_CREAT | O_RDWR; + } + if ((ret = ad_open(name, ADFLAGS_HF | dir, create, 0666, adp)) < 0 && errno == EACCES) { uid = geteuid(); if (seteuid(0)) { LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno)); @@ -1557,29 +1570,52 @@ int ad_metadata(const char *name, int flags, struct adouble *adp) } if (!ret && (ADFLAGS_OPENFORKS & flags)) { - u_int16_t attrbits = adp->ad_open_forks; - - /* - 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! - */ - - if (!(attrbits & ATTRBIT_ROPEN)) { - attrbits |= ad_testlock(adp, ADEID_RFORK, AD_FILELOCK_OPEN_RD) > 0? ATTRBIT_ROPEN : 0; - attrbits |= ad_testlock(adp, ADEID_RFORK, AD_FILELOCK_OPEN_WR) > 0? ATTRBIT_ROPEN : 0; - } - - if (!(attrbits & ATTRBIT_DOPEN)) { - attrbits |= ad_testlock(adp, ADEID_DFORK, AD_FILELOCK_OPEN_RD) > 0? ATTRBIT_DOPEN : 0; - attrbits |= ad_testlock(adp, ADEID_DFORK, AD_FILELOCK_OPEN_WR) > 0? ATTRBIT_DOPEN : 0; - } - adp->ad_open_forks = attrbits; + /* + 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; } +/* + * @brief openat like wrapper for ad_metadata + */ +int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp) +{ + int ret = 0; + int cwdfd = -1; + + if (dirfd != -1) { + if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) { + ret = -1; + goto exit; + } + } + + if (ad_metadata(name, flags, adp) < 0) { + ret = -1; + goto exit; + } + + if (dirfd != -1) { + if (fchdir(cwdfd) != 0) { + LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting"); + exit(EXITERR_SYS); + } + } + +exit: + if (cwdfd != -1) + close(cwdfd); + + return ret; + +} + /* ----------------------------------- */ static int new_rfork(const char *path, struct adouble *ad, int adflags) { @@ -1598,49 +1634,49 @@ static int new_rfork(const char *path, struct adouble *ad, int adflags) #if AD_VERSION == AD_VERSION2 if (ad->ad_flags == AD_VERSION2) - eid = entry_order2; + eid = entry_order2; else if (ad->ad_flags == AD_VERSION2_OSX) - eid = entry_order_osx; + eid = entry_order_osx; else if (ad->ad_flags == AD_VERSION1_SFM) { - ad->ad_magic = SFM_MAGIC; - eid = entry_order_sfm; + ad->ad_magic = SFM_MAGIC; + eid = entry_order_sfm; } else #endif - eid = entry_order1; + eid = entry_order1; while (eid->id) { ad->ad_eid[eid->id].ade_off = eid->offset; - ad->ad_eid[eid->id].ade_len = eid->len; - eid++; + ad->ad_eid[eid->id].ade_len = eid->len; + eid++; } - + /* 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)); + 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); + 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) && !(adflags & ADFLAGS_CREATE) && - (*path == '.') && strcmp(path, ".") && strcmp(path, "..")) + if ((ad->ad_options & ADVOL_INVDOTS) && !(adflags & ADFLAGS_CREATE) && + (*path == '.') && strcmp(path, ".") && strcmp(path, "..")) { ashort = htons(ATTRBIT_INVISIBLE); - ad_setattr(ad, ashort); - ashort = htons(FINDERINFO_INVISIBLE); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); + ad_setattr(ad, ashort); + ashort = htons(FINDERINFO_INVISIBLE); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); } - if (stat(path, &st) < 0) { - return -1; + if (ostat(path, &st, ad_get_syml_opt(ad)) < 0) { + return -1; } - + /* 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); @@ -1654,8 +1690,44 @@ static int new_rfork(const char *path, struct adouble *ad, int adflags) int ad_refresh(struct adouble *ad) { - if (ad_meta_fileno(ad) < 0) - return -1; + if (ad_meta_fileno(ad) < 0) + return -1; + + return ad->ad_ops->ad_header_read(ad, NULL); +} + +int ad_openat(int dirfd, /* dir fd openat like */ + const char *path, + int adflags, + int oflags, + int mode, + struct adouble *ad) +{ + int ret = 0; + int cwdfd = -1; - return ad->ad_ops->ad_header_read(ad, NULL); + if (dirfd != -1) { + if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) { + ret = -1; + goto exit; + } + } + + if (ad_open(path, adflags, oflags, mode, ad) < 0) { + ret = -1; + goto exit; + } + + if (dirfd != -1) { + if (fchdir(cwdfd) != 0) { + LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting"); + exit(EXITERR_SYS); + } + } + +exit: + if (cwdfd != -1) + close(cwdfd); + + return ret; }