X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=d3a4c6b3ace9e8a246a1b43e0e7591af28bbb0a4;hb=18b886e36518cc7c8d570857131e1c8bdc116952;hp=6e9dc85c33eb1f7e74db2c041d6aa17ddc02d416;hpb=78d8d7d0d01eacc9f585125d388061927729eff6;p=netatalk.git diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 6e9dc85c..d3a4c6b3 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -1,8 +1,8 @@ /* - * $Id: ad_open.c,v 1.71 2010-03-07 18:27:59 didg Exp $ - * * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) * Copyright (c) 1990,1991 Regents of The University of Michigan. + * Copyright (c) 2010 Frank Lahm + * * All Rights Reserved. * * Permission to use, copy, modify, and distribute this software and @@ -28,8 +28,6 @@ /*! * @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 */ @@ -38,48 +36,23 @@ #endif /* HAVE_CONFIG_H */ #include - -#include #include -#include - -#include -#include - -#include "ad_private.h" #include +#include +#include +#include -#ifndef MAX -#define MAX(a, b) ((a) < (b) ? (b) : (a)) -#endif /* ! MAX */ +#include +#include +#include +#include +#include +#include +#include +#include +#include -/* - * AppleDouble entry default offsets. - * The layout looks like this: - * - * this is the v1 layout: - * 255 200 16 32 N - * | NAME | COMMENT | FILEI | FINDERI | RFORK | - * - * we need to change it to look like this: - * - * v2 layout: - * field length (in bytes) - * NAME 255 - * COMMENT 200 - * FILEDATESI 16 replaces FILEI - * 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. - */ +#include "ad_lock.h" #define ADEDOFF_MAGIC (0) #define ADEDOFF_VERSION (ADEDOFF_MAGIC + ADEDLEN_MAGIC) @@ -89,25 +62,16 @@ /* initial lengths of some of the fields */ #define ADEDLEN_INIT 0 -/* make sure we don't redefine ADEDOFF_FILEI */ -#ifdef ADEDOFF_FILEI -#undef ADEDOFF_FILEI -#endif /* ADEDOFF_FILEI */ - -#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 * stuff. */ + +/* ad:v2 */ #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) @@ -115,394 +79,275 @@ #define ADEDOFF_PRIVINO (ADEDOFF_PRIVDEV + ADEDLEN_PRIVDEV) #define ADEDOFF_PRIVSYN (ADEDOFF_PRIVINO + ADEDLEN_PRIVINO) #define ADEDOFF_PRIVID (ADEDOFF_PRIVSYN + ADEDLEN_PRIVSYN) - #define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVID + ADEDLEN_PRIVID) -#define ADEID_NUM_OSX 2 -#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 - * correctly. */ +/* 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) /* 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. */ + localtime volumes. the screw-up is 30 years. we use a delta of 5 years */ #define TIMEWARP_DELTA 157680000 - struct entry { - u_int32_t id, offset, len; + uint32_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} -}; +/* --------------------------- */ +static uid_t default_uid = -1; -#if AD_VERSION == AD_VERSION1 -#define DISK_EID(ad, a) (a) +/* Forward declarations */ +static int ad_mkrf(const char *path); +static int ad_header_read(const char *path, struct adouble *ad, struct stat *hst); +static int ad_header_upgrade(struct adouble *ad, const char *name); -#else /* AD_VERSION == AD_VERSION2 */ +static int ad_mkrf_ea(const char *path); +static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst); +static int ad_header_upgrade_ea(struct adouble *ad, const char *name); -static u_int32_t get_eid(struct adouble *ad, u_int32_t eid) -{ - if (eid <= 15) - return eid; - if (ad->ad_version == AD_VERSION1) - return 0; - if (eid == AD_DEV) - return ADEID_PRIVDEV; - if (eid == AD_INO) - return ADEID_PRIVINO; - if (eid == AD_SYN) - return ADEID_PRIVSYN; - if (eid == AD_ID) - return ADEID_PRIVID; - return 0; -} +static const char *ad_path_osx(const char *path, int adflags); +static int ad_mkrf_osx(const char *path); + + +static struct adouble_fops ad_adouble = { + &ad_path, + &ad_mkrf, + &ad_rebuild_adouble_header, + &ad_header_read, + &ad_header_upgrade, +}; + +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, +}; -#define DISK_EID(ad, a) get_eid(ad, a) +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}, - {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}, +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}, + {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} +}; +/* Using Extended Attributes */ +static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = { + {ADEID_FINDERI, ADEDOFF_FINDERI_EA, ADEDLEN_FINDERI}, + {ADEID_COMMENT, ADEDOFF_COMMENT_EA, ADEDLEN_INIT}, + {ADEID_FILEDATESI, ADEDOFF_FILEDATESI_EA, ADEDLEN_FILEDATESI}, + {ADEID_AFPFILEI, ADEDOFF_AFPFILEI_EA, ADEDLEN_AFPFILEI}, + {ADEID_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT}, {0, 0, 0} }; -/* OS X adouble finder info and resource fork only - */ +/* fallback for EAs */ static const struct entry entry_order_osx[ADEID_NUM_OSX +1] = { {ADEID_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI}, {ADEID_RFORK, ADEDOFF_RFORK_OSX, ADEDLEN_INIT}, - {0, 0, 0} }; -#define 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 */ - - {0, 0, 0} -}; +#define ADFLAGS2LOGSTRBUFSIZ 128 +const char *adflags2logstr(int adflags) +{ + int first = 1; + static char buf[ADFLAGS2LOGSTRBUFSIZ]; + + buf[0] = 0; + + if (adflags & ADFLAGS_DF) { + strlcat(buf, "DF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_RF) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "RF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_HF) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "HF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_NOHF) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "NOHF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_DIR) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "DIR", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_CHECK_OF) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "OF", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_RDWR) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_RDWR", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_RDONLY) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_RDONLY", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_CREATE) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_CREAT", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_EXCL) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_EXCL", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + if (adflags & ADFLAGS_TRUNC) { + if (!first) + strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ); + strlcat(buf, "O_TRUNC", ADFLAGS2LOGSTRBUFSIZ); + first = 0; + } + + return buf; +} -#endif /* AD_VERSION == AD_VERSION2 */ +static uint32_t get_eid(uint32_t eid) +{ + if (eid <= 15) + return eid; + if (eid == AD_DEV) + return ADEID_PRIVDEV; + if (eid == AD_INO) + return ADEID_PRIVINO; + if (eid == AD_SYN) + return ADEID_PRIVSYN; + if (eid == AD_ID) + return ADEID_PRIVID; -#if AD_VERSION == AD_VERSION2 + return 0; +} -/* update a version 2 adouble resource fork with our private entries */ -static int ad_update(struct adouble *ad, const char *path) +/* ----------------------------------- */ +static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, int adflags) { - 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; - - LOG(log_maxdebug, logtype_default, "ad_update: checking whether '%s' needs an upgrade.", path); - - 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; - } + uint16_t ashort; + struct stat st; - if ((void *) (buf = (char *) - mmap(NULL, st.st_size + shiftdata, - PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == - MAP_FAILED) { - goto bail_lock; - } + LOG(log_debug, logtype_default, "new_ad_header(\"%s\")", path); - /* last place for failure. */ - if (sys_ftruncate(fd, st.st_size + shiftdata) < 0) { - goto bail_lock; + if (stp == NULL) { + stp = &st; + if (lstat(path, &st) != 0) + return -1; } - /* 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); + ad->ad_magic = AD_MAGIC; + ad->ad_version = ad->ad_vers & 0x0f0000; + if (!ad->ad_version) { + ad->ad_version = AD_VERSION; } - munmap(buf, st.st_size + shiftdata); - /* now, fix up our copy of the header */ - memset(ad->ad_filler, 0, sizeof(ad->ad_filler)); + memset(ad->ad_data, 0, sizeof(ad->ad_data)); - /* 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++; + if (ad->ad_vers == AD_VERSION2) + eid = entry_order2; + else if (ad->ad_vers == AD_VERSION_EA) + eid = entry_order_ea; + else if (ad->ad_vers == AD_VERSION2_OSX) + eid = entry_order_osx; + else { + return -1; } - 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]; + ad->ad_eid[eid->id].ade_len = eid->len; eid++; } - /* 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); -bail_err: - return ret; -} - -/* ------------------------------------------ - 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; - } + /* put something sane in the directory finderinfo */ + if (ad->ad_vers != AD_VERSION2_OSX) { + if ((adflags & ADFLAGS_DIR)) { + /* set default view */ + ashort = htons(FINDERINFO_CLOSEDVIEW); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); + } else { + /* set default creator/type fields */ + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4); + } - off = ad->ad_eid[ADEID_RFORK].ade_off; + /* 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 (off > st.st_size) { - LOG(log_error, logtype_default, "ad_v1tov2: invalid resource fork offset. (off: %u)", off); - errno = EIO; - goto bail_lock; + /* 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); } - - 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); -bail_err: - return ret; + return 0; } -#endif /* AD_VERSION == AD_VERSION2 */ /* ------------------------------------- read in the entries */ -static void parse_entries(struct adouble *ad, char *buf, - u_int16_t nentries) +static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) { - u_int32_t eid, len, off; - int warning = 0; + uint32_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 )); + eid = get_eid(ntohl(eid)); buf += sizeof( eid ); memcpy(&off, buf, sizeof( off )); off = ntohl( off ); @@ -511,19 +356,19 @@ static void parse_entries(struct adouble *ad, char *buf, 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) { warning = 1; - LOG(log_debug, logtype_default, "ad_refresh: nentries %hd eid %d", - nentries, eid ); + LOG(log_warning, logtype_default, "parse_entries: bogus eid: %d", eid); } } } - /* this reads enough of the header so that we can figure out all of * the entry lengths and offsets. once that's done, we just read/mmap * the rest of the header in. @@ -531,17 +376,16 @@ static void parse_entries(struct adouble *ad, char *buf, * 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, struct stat *hst) { char *buf = ad->ad_data; - u_int16_t nentries; + uint16_t nentries; int len; ssize_t header_len; - static int warning = 0; struct stat st; /* read the header */ - if ((header_len = adf_pread( ad->ad_md, buf, sizeof(ad->ad_data), 0)) < 0) { + if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ, 0)) < 0) { return -1; } if (header_len < AD_HEADER_LEN) { @@ -551,42 +395,15 @@ 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 )); + ad->ad_magic = ntohl( ad->ad_magic ); + ad->ad_version = ntohl( ad->ad_version ); - /* 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. - * (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; - - } 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++; - } - - } else { - 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) -#endif /* AD_VERSION == AD_VERSION2 */ - )) { - LOG(log_debug, logtype_default, "ad_open: can't parse AppleDouble header."); + if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) { + LOG(log_error, 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 ); @@ -599,7 +416,7 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) buf += AD_HEADER_LEN; if (len > header_len - AD_HEADER_LEN) { - LOG(log_debug, logtype_default, "ad_header_read: can't read entry info."); + LOG(log_error, logtype_default, "ad_header_read: can't read entry info."); errno = EIO; return -1; } @@ -611,195 +428,168 @@ static int ad_header_read(struct adouble *ad, struct stat *hst) if (!ad_getentryoff(ad, ADEID_RFORK) || (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data)) ) { - LOG(log_debug, logtype_default, "ad_header_read: problem with rfork entry offset."); + LOG(log_error, logtype_default, "ad_header_read: problem with rfork entry offset."); errno = EIO; return -1; } if (ad_getentryoff(ad, ADEID_RFORK) > header_len) { - LOG(log_debug, logtype_default, "ad_header_read: can't read in entries."); + LOG(log_error, 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) { + if (fstat(ad->ad_mdp->adf_fd, &st) < 0) { 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); - } - } + ad->ad_rlen = hst->st_size - ad_getentryoff(ad, ADEID_RFORK); return 0; } -/* --------------------------- - SFM structure -*/ -#if 0 -typedef struct { - byte afpi_Signature[4]; /* Must be 0x00504641 */ - byte afpi_Version[4]; /* Must be 0x00010000 */ - byte afpi_Reserved1[4]; - byte afpi_BackupTime[4]; /* Backup time for the file/dir */ - byte finderinfo[32]; /* Finder info */ - byte afpi_ProDosInfo[6]; /* ProDos Info */ - byte afpi_Reserved2[6]; -} sfm_info; -#endif - -static int ad_header_sfm_read(struct adouble *ad, struct stat *hst) +/* Read an ._ file, only uses the resofork, finderinfo is taken from EA */ +static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct stat *hst) { - char *buf = ad->ad_data; - const struct entry *eid; + 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 */ - if ((header_len = adf_pread( ad->ad_md, buf, sizeof(ad->ad_data), 0)) < 0) { + EC_NEG1( header_len = adf_pread(ad->ad_rfp, buf, AD_DATASZ_OSX, 0) ); + + if (header_len < AD_HEADER_LEN) { + errno = EIO; return -1; } - if (header_len != AD_SFM_LEN) { + + 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(&ad->ad_magic, buf, sizeof( ad->ad_magic )); - memcpy(&ad->ad_version, buf + 4, sizeof( ad->ad_version )); - - /* 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++; - } + memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries )); + nentries = ntohs(nentries); + len = nentries * AD_ENTRY_LEN; - } else { - ad->ad_magic = ntohl( ad->ad_magic ); - ad->ad_version = ntohl( ad->ad_version ); + 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; } -#endif - if ((ad->ad_magic != SFM_MAGIC) || ((ad->ad_version != AD_VERSION1) )) { + + 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; - 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++; + if (hst == NULL) { + hst = &st; + EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); } - /* steal some prodos for attribute */ - { + 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, struct stat *hst _U_) +{ + uint16_t nentries; + int len; + ssize_t header_len; + char *buf = ad->ad_data; - u_int16_t attribute; - memcpy(&attribute, buf + 48 +4, sizeof(attribute)); - ad_setattr(ad, attribute ); + /* read the header */ + if ((ad_meta_fileno(ad) == -1) + && (ad->ad_adflags & ADFLAGS_RDWR)) { + LOG(log_error, logtype_default, "ad_header_read_ea: need filedescriptor for rw access"); + return -1; } - if (ad->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; - */ - return 1; - } - ad->ad_rlen = st.st_size; - hst = &st; + 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; } - else if (hst == NULL) { - hst = &st; - if (fstat(ad->ad_md->adf_fd, &st) < 0) { - return 1; /* fail silently */ - } + + if (header_len < AD_HEADER_LEN) { + LOG(log_error, logtype_default, "ad_header_read_ea: bogus AppleDouble header."); + errno = EIO; + return -1; } - /* fix up broken dates */ - if (ad->ad_version == AD_VERSION1) { - u_int32_t aint; + memcpy(&ad->ad_magic, buf, sizeof( ad->ad_magic )); + memcpy(&ad->ad_version, buf + ADEDOFF_VERSION, sizeof( ad->ad_version )); - /* 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); - } + ad->ad_magic = ntohl( ad->ad_magic ); + ad->ad_version = ntohl( ad->ad_version ); + + if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) { + LOG(log_error, logtype_default, "ad_header_read_ea: wrong magic or version"); + errno = EIO; + return -1; + } + + memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries )); + nentries = ntohs( nentries ); + + /* Protect against bogus nentries */ + len = nentries * AD_ENTRY_LEN; + if (len + AD_HEADER_LEN > sizeof(ad->ad_data)) + len = sizeof(ad->ad_data) - AD_HEADER_LEN; + if (len > header_len - AD_HEADER_LEN) { + LOG(log_error, logtype_default, "ad_header_read_ea: can't read entry info."); + errno = EIO; + return -1; } + nentries = len / AD_ENTRY_LEN; + + /* Now parse entries */ + parse_entries(ad, buf + AD_HEADER_LEN, nentries); return 0; } -/* --------------------------------------- - * Put the .AppleDouble where it needs to be: +/*! + * Takes a path to an AppleDouble file and creates the parrent .AppleDouble directory * - * / a/.AppleDouble/b - * a/b - * \ b/.AppleDouble/.Parent - * - * FIXME: should do something for pathname > MAXPATHLEN + * Example: + * path: "/path/.AppleDouble/file" + * => mkdir("/path/.AppleDouble/") (in ad_mkdir()) */ -char * -ad_path( const char *path, int adflags) -{ - static char pathbuf[ MAXPATHLEN + 1]; - const char *slash; - size_t l ; - - if ( adflags & ADFLAGS_DIR ) { - 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( 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); - } - - return( pathbuf ); -} - -/* -------------------- */ -static int ad_mkrf(char *path) +static int ad_mkrf(const char *path) { char *slash; /* @@ -817,12 +607,523 @@ static int ad_mkrf(char *path) return 0; } -/* --------------------------------------- - * Put the resource fork where it needs to be: - * ._name +static int ad_mkrf_ea(const char *path _U_) +{ + AFP_PANIC("ad_mkrf_ea: dont use"); + 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 + 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; +#ifdef EMULATE_SUIDDIR + uid_t id; + + if (default_uid != (uid_t)-1) { + /* we are root (admin) */ + id = (default_uid)?default_uid:stbuf->st_uid; + ret = lchown( path, id, stbuf->st_gid ); + } +#endif + return ret; +} + +#define DEFMASK 07700 /* be conservative */ + +/* ---------------- + return access right and inode of path parent directory +*/ +static int ad_mode_st(const char *path, mode_t *mode, struct stat *stbuf) +{ + if (*mode == 0) { + return -1; + } + if (ad_stat(path, stbuf) != 0) { + *mode &= DEFMASK; + return -1; + } + *mode &= stbuf->st_mode; + return 0; +} + +/* --------------------------- */ +static int ad_header_upgrade(struct adouble *ad _U_, const char *name _U_) +{ + return 0; +} + +static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _U_) +{ + AFP_PANIC("ad_header_upgrade_ea: dont use"); + return 0; +} + +/*! + * Error handling for adouble header(=metadata) file open error + * + * We're called because opening ADFLAGS_HF caused an error. + * 1. In case ad_open is called with ADFLAGS_NOHF the error is suppressed. + * 2. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus + * ought to close it before returning with an error condition. */ -char * -ad_path_osx(const char *path, int adflags _U_) +static int ad_error(struct adouble *ad, int adflags) +{ + int err = errno; + if (adflags & ADFLAGS_NOHF) { /* 1 */ + ad->ad_adflags &= ~ADFLAGS_HF; + return 0; + } + if (adflags & ADFLAGS_DF) { /* 2 */ + ad_close( ad, ADFLAGS_DF ); + err = errno; + } + return -1 ; +} + +/* Map ADFLAGS to open() flags */ +static int ad2openflags(int adflags) +{ + int oflags = 0; + + if (adflags & ADFLAGS_RDWR) + oflags |= O_RDWR; + if (adflags & ADFLAGS_RDONLY) { + if (adflags & ADFLAGS_SETSHRMD) + oflags |= O_RDWR; + else + oflags |= O_RDONLY; + } + if (adflags & ADFLAGS_CREATE) + oflags |= O_CREAT; + if (adflags & ADFLAGS_EXCL) + oflags |= O_EXCL; + if (adflags & ADFLAGS_TRUNC) + oflags |= O_TRUNC; + + return oflags; +} + +static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad) +{ + 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); + + if (ad_data_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((adflags & ADFLAGS_RDWR) + /* and it was denied the first time: */ + && (ad->ad_data_fork.adf_flags & O_RDONLY)) { + errno = EACCES; + return -1; + } + /* it's not new anymore */ + ad->ad_data_fork.adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_data_fork.adf_refcount++; + return 0; + } + + oflags = O_NOFOLLOW | ad2openflags(adflags); + + admode = mode; + if ((adflags & ADFLAGS_CREATE)) { + 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, oflags, admode); + + if (ad->ad_data_fork.adf_fd == -1) { + switch (errno) { + case EACCES: + case EPERM: + case EROFS: + 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; + break; + } + return -1; + case OPEN_NOFOLLOW_ERRNO: + 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; + } + ad->ad_data_fork.adf_syml[lsz] = 0; + ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */ + break; + default: + return -1; + } + } + + if (!st_invalid) + ad_chown(path, &st_dir); /* just created, set owner if admin (root) */ + + ad->ad_data_fork.adf_flags = oflags; + adf_lock_init(&ad->ad_data_fork); + ad->ad_data_fork.adf_refcount++; + + return 0; +} + +/* TODO: error handling */ +static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adouble *ad) +{ + struct stat st_dir; + struct stat st_meta; + struct stat *pst = NULL; + const char *ad_p; + int oflags, nocreatflags; + mode_t admode; + int st_invalid = -1; + + if (ad_meta_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((adflags & ADFLAGS_RDWR) && + /* and it was already denied: */ + (ad->ad_mdp->adf_flags & O_RDONLY)) { + errno = EACCES; + return -1; + } + 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; + } + + ad_p = ad->ad_ops->ad_path(path, adflags); + oflags = O_NOFOLLOW | ad2openflags(adflags); + nocreatflags = oflags & ~(O_CREAT | O_EXCL); + + ad->ad_mdp->adf_fd = open(ad_p, nocreatflags); + + if (ad->ad_mdp->adf_fd != -1) { + ad->ad_mdp->adf_flags = nocreatflags; + } else { + switch (errno) { + case EACCES: + case EPERM: + case EROFS: + 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; + ad->ad_mdp->adf_flags = nocreatflags; + break; + } + return -1; + case ENOENT: + if (!(oflags & O_CREAT)) + return ad_error(ad, adflags); + /* + * We're expecting to create a new adouble header file here + */ + LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file", + fullpathname(path)); + 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_vers != 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_mdp->adf_fd = open(ad_p, oflags, admode); + if ( ad->ad_mdp->adf_fd < 0 ) + return ad_error(ad, adflags); + + 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; + } + } + + 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) { + if (st_meta.st_size == 0) + ad->ad_mdp->adf_flags |= O_TRUNC; + else + /* we have valid data in st_meta stat structure, reused it in ad_header_read */ + pst = &st_meta; + } + } + + 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(ad, path, pst, adflags) < 0) { + int err = errno; + /* the file is already deleted, perm, whatever, so return an error */ + ad_close(ad, adflags); + errno = err; + return -1; + } + ad_flush(ad); + } else { + /* Read the adouble header in and parse it.*/ + if (ad->ad_ops->ad_header_read(path, ad, pst) < 0 + || ad->ad_ops->ad_header_upgrade(ad, ad_p) < 0) { + int err = errno; + ad_close(ad, adflags); + errno = err; + return -1; + } + } + + return 0; +} + +/* TODO: error handling */ +static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad) +{ + ssize_t rforklen; + int oflags; + + LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\", %s, %04o)", + path, adflags2logstr(adflags), mode); + + oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~(O_CREAT | O_TRUNC)); + + if (ad_meta_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((adflags & ADFLAGS_RDWR) && + /* and it was already denied: */ + (ad->ad_mdp->adf_flags & O_RDONLY)) { + LOG(log_error, logtype_default, "ad_open_hf_ea(%s): rw request for ro file: %s", + fullpathname(path), strerror(errno)); + errno = EACCES; + return -1; + } + /* it's not new anymore */ + ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_mdp->adf_refcount++; + } else { + if (adflags & ADFLAGS_RDWR) { + /* Fo a RDONLY adouble we just use sys_lgetxattr instead if sys_fgetxattr */ + LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): opening for base file for meta adouble EA", path); + if ((ad_meta_fileno(ad) = open(path, oflags)) == -1) + goto error; + ad->ad_mdp->adf_flags = oflags; + } + ad->ad_mdp->adf_refcount = 1; + } + + /* Read the adouble header in and parse it.*/ + if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) { + LOG(log_error, logtype_default, "ad_open_hf_ea: no EA adouble"); + + if (!(adflags & ADFLAGS_CREATE)) + goto error; + + 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; + } + + /* Create one */ + if (new_ad_header(ad, path, NULL, adflags) < 0) { + LOG(log_error, logtype_default, "ad_open_hf_ea: can't create new header: %s", + fullpathname(path)); + goto error; + } + 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); + } + + /* TODO: ad_rlen calculation */ + ad->ad_rlen = 0; + + return 0; + +error: + if (ad_meta_fileno(ad) != -1) { + close(ad_meta_fileno(ad)); + ad_meta_fileno(ad) = -1; + ad->ad_mdp->adf_refcount = 0; + } + return ad_error(ad, adflags); +} + +static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *ad) +{ + int ret = 0; + + LOG(log_debug, logtype_default, "ad_open_hf(\"%s\", %04o)", path, mode); + + memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); + ad->ad_rlen = 0; + + switch (ad->ad_vers) { + case AD_VERSION2: + ret = ad_open_hf_v2(path, adflags, mode, ad); + break; + case AD_VERSION_EA: + ret = ad_open_hf_ea(path, adflags, mode, ad); + break; + default: + ret = -1; + break; + } + + if (ret != 0) { + return 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. + */ +static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad) +{ + EC_INIT; + int oflags; + int closeflags = adflags & (ADFLAGS_DF | ADFLAGS_HF); + ssize_t rlen; +#ifndef HAVE_EAFD + const char *rfpath; + struct stat st; +#endif + + if (ad->ad_vers != AD_VERSION_EA) + return 0; + + LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %04o)", path, mode); + + oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~O_CREAT); + + if (ad_reso_fileno(ad) != -1) { + /* the file is already open, but we want write access: */ + if ((adflags & ADFLAGS_RDWR) + /* and it was already denied: */ + && (ad->ad_rfp->adf_flags & O_RDONLY)) { + errno = EACCES; + return -1; + } + ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_rfp->adf_refcount++; + return 0; + } +#ifdef HAVE_EAFD + if ((ad_reso_fileno(ad) = sys_getxattrfd(path, oflags)) == -1) { + if (!(adflags & ADFLAGS_CREATE)) + EC_FAIL; + oflags |= O_CREAT; + EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(path, oflags, 0666) ); + } +#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 + + ad->ad_rfp->adf_refcount = 1; + ad->ad_rfp->adf_flags = oflags; + +#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); +// EC_NEG1_LOG( new_ad_header(ad, rfpath, &st, adflags) ); + 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 + +EC_CLEANUP: + if (ret != 0) { + if (ad_reso_fileno(ad) != -1) { + close(ad_reso_fileno(ad)); + ad_reso_fileno(ad) = -1; + ad->ad_rfp->adf_refcount = 0; + } + int err = errno; + (void)ad_close(ad, closeflags); + errno = err; + ad->ad_rlen = 0; + } + + LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END", path); + + EC_EXIT; +} + +/*********************************************************************************** + * API functions + ********************************************************************************* */ + +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]; @@ -847,101 +1148,54 @@ ad_path_osx(const char *path, int adflags _U_) strlcat( pathbuf, slash, MAXPATHLEN +1); return pathbuf; } -/* -------------------- */ -static int ad_mkrf_osx(char *path _U_) -{ - return 0; -} -/* --------------------------------------- +/* * Put the .AppleDouble where it needs to be: * - * / a/.AppleDouble/b/AFP_AfpInfo + * / a/.AppleDouble/b * a/b - * \ b/.AppleDouble/.Parent/AFP_AfpInfo + * \ b/.AppleDouble/.Parent * + * FIXME: should do something for pathname > MAXPATHLEN */ -char * -ad_path_sfm( const char *path, int adflags) +const char *ad_path( const char *path, int adflags) { static char pathbuf[ MAXPATHLEN + 1]; - char c, *slash, buf[MAXPATHLEN + 1]; - size_t l; + const char *slash; + size_t l ; - l = strlcpy(buf, path, MAXPATHLEN +1); if ( adflags & ADFLAGS_DIR ) { - strcpy( pathbuf, buf); - if ( *buf != '\0' && l < MAXPATHLEN) { + l = strlcpy( pathbuf, path, sizeof(pathbuf)); + + if ( l && l < MAXPATHLEN) { pathbuf[l++] = '/'; - pathbuf[l] = 0; } - slash = ".Parent"; + strlcpy(pathbuf +l, ".AppleDouble/.Parent", sizeof(pathbuf) -l); } else { - if (NULL != ( slash = strrchr( buf, '/' )) ) { - c = *++slash; - *slash = '\0'; - strcpy( pathbuf, buf); - *slash = c; + 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 { - pathbuf[ 0 ] = '\0'; - slash = buf; + 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); - if ((adflags == ADFLAGS_RF)) { - strlcat( pathbuf, "/AFP_Resource", MAXPATHLEN +1); - } - else { - strlcat( pathbuf, "/AFP_AfpInfo", MAXPATHLEN +1); - } return( pathbuf ); } -/* -------------------- */ -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 - return -1; - } - *slash = '/'; - return 0; -} - /* ------------------------- * Support inherited protection modes for AppleDouble files. The supplied * mode is ANDed with the parent directory's mask value in lieu of "umask", * and that value is returned. */ - -#define DEFMASK 07700 /* be conservative */ - -char -*ad_dir(const char *path) +char *ad_dir(const char *path) { static char modebuf[ MAXPATHLEN + 1]; char *slash; @@ -988,9 +1242,6 @@ use_cur: return modebuf; } -/* ---------------- */ -static uid_t default_uid = -1; - int ad_setfuid(const uid_t id) { default_uid = id; @@ -998,72 +1249,28 @@ int ad_setfuid(const uid_t id) } /* ---------------- */ -uid_t ad_getfuid(void) -{ - return default_uid; -} - -/* ---------------- - return inode of path parent directory -*/ -int ad_stat(const char *path, struct stat *stbuf) -{ - char *p; - - p = ad_dir(path); - if (!p) { - return -1; - } -//FIXME! - return lstat( 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 - 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; -#ifdef EMULATE_SUIDDIR - uid_t id; - - if (default_uid != (uid_t)-1) { - /* we are root (admin) */ - id = (default_uid)?default_uid:stbuf->st_uid; - ret = lchown( path, id, stbuf->st_gid ); - } -#endif - return ret; +uid_t ad_getfuid(void) +{ + return default_uid; } /* ---------------- - return access right and inode of path parent directory + stat path parent directory */ -static int ad_mode_st(const char *path, int *mode, struct stat *stbuf) +int ad_stat(const char *path, struct stat *stbuf) { - if (*mode == 0) { - return -1; - } - if (ad_stat(path, stbuf) != 0) { - *mode &= DEFMASK; + char *p; + + p = ad_dir(path); + if (!p) return -1; - } - *mode &= stbuf->st_mode; - return 0; + return lstat( p, 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); @@ -1073,15 +1280,14 @@ 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; struct stat stbuf; - LOG(log_debug, logtype_default, "ad_mkdir: creating ad-directory '%s/%s' with mode %04o", - getcwdpath(), path, mode); + 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 ); @@ -1092,440 +1298,142 @@ ad_mkdir( const char *path, int mode) return ret; } -/* ----------------- */ -static int ad_error(struct adouble *ad, int adflags) +static void ad_init_func(struct adouble *ad) { - 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; + switch (ad->ad_vers) { + case AD_VERSION2: + ad->ad_ops = &ad_adouble; + ad->ad_rfp = &ad->ad_resource_fork; + ad->ad_mdp = &ad->ad_resource_fork; + break; + case AD_VERSION_EA: + ad->ad_ops = &ad_adouble_ea; + ad->ad_rfp = &ad->ad_resource_fork; + ad->ad_mdp = &ad->ad_data_fork; + break; + default: + AFP_PANIC("ad_init: unknown AD version"); } - return -1 ; -} - -static int new_rfork(const char *path, struct adouble *ad, int adflags); - -#ifdef HAVE_PREAD -#define AD_SET(a) -#else -#define AD_SET(a) a = 0 -#endif - -/* --------------------------- */ -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; -} -/* --------------------------- */ -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; -} -/* --------------------------- */ -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; - } -#endif - return 0; + ad_data_fileno(ad) = -1; + ad_reso_fileno(ad) = -1; + ad_meta_fileno(ad) = -1; + ad->ad_refcount = 1; + return; } -/* --------------------------- */ -static int ad_header_upgrade_none(struct adouble *ad _U_, char *name _U_) +void ad_init_old(struct adouble *ad, int flags, int options) { - return 0; + memset(ad, 0, sizeof(struct adouble)); + ad->ad_vers = flags; + ad->ad_options = options; + ad_init_func(ad); } -/* --------------------------- */ -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_sfm = { - &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_header_read, - &ad_header_upgrade, -}; - - -void ad_init(struct adouble *ad, int flags, int options) +void ad_init(struct adouble *ad, const struct vol * restrict vol) { - ad->ad_inited = 0; - ad->ad_flags = flags; - if (flags == AD_VERSION2_OSX) { - ad->ad_ops = &ad_osx; - 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; + memset(ad, 0, sizeof(struct adouble)); + ad->ad_vers = vol->v_adouble; + ad->ad_options = vol->v_ad_options; + ad_init_func(ad); } /*! * Open data-, metadata(header)- or ressource fork * + * ad_open(struct adouble *ad, const char *path, int adflags, int flags) + * ad_open(struct adouble *ad, const char *path, int adflags, int flags, mode_t mode) + * * 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 + * Open a files data fork, metadata fork or ressource fork. * - * @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 ad (rw) pointer to struct adouble + * @param path (r) Path to file or directory + * @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 created + * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags * - * @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 + * Access mode for the forks: + * ADFLAGS_RDONLY: open read only + * ADFLAGS_RDWR: open read write * - * @param mode passed to open with O_CREAT + * Creation flags: + * ADFLAGS_CREATE: create if not existing + * ADFLAGS_TRUNC: truncate * - * @param ad pointer to struct adouble + * 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 * - * @returns 0 on success + * 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 * - * @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. + * @returns 0 on success, any other value indicates an error */ -int ad_open( const char *path, int adflags, int oflags, int mode, struct adouble *ad) +int ad_open(struct adouble *ad, const char *path, int adflags, ...) { - struct stat st_dir; - struct stat st_meta; - struct stat *pst = NULL; - char *ad_p; - int hoflags, admode; - int st_invalid = -1; - int open_df = 0; - - if (ad->ad_inited != AD_INITED) { - 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; - } - - 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 | O_NOFOLLOW, 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 | O_NOFOLLOW, admode ); - } - if (ad->ad_data_fork.adf_fd < 0 && errno == ELOOP) { - int lsz; - - if (oflags != O_RDONLY) - return -1; - - ad->ad_data_fork.adf_syml = malloc(PATH_MAX+1); - lsz = readlink(path, ad->ad_data_fork.adf_syml, PATH_MAX); - 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_syml = realloc(ad->ad_data_fork.adf_syml,lsz+1); - // XX - ad->ad_data_fork.adf_fd = 0; - } - } - - 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); - } - 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 */ - { - 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)) - return 0; - - /* ****************************************** */ + EC_INIT; + va_list args; + mode_t mode = 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) { - /* don't call with ADFLAGS_HF because we didn't open ressource fork */ - ad_close( ad, open_df ); - } - errno = EACCES; - 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 ); + LOG(log_debug, logtype_default, "ad_open(\"%s\", %s)", + fullpathname(path), adflags2logstr(adflags)); - 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 | O_NOFOLLOW, 0 ); - if (ad->ad_md->adf_fd < 0 ) { - if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) { - hoflags = oflags & ~(O_CREAT | O_EXCL); - ad->ad_md->adf_fd = open( ad_p, hoflags | O_NOFOLLOW, 0 ); - } - } + if (adflags & ADFLAGS_CHECK_OF) + /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */ + adflags |= ADFLAGS_SETSHRMD; - 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) - */ - LOG(log_debug, logtype_default, "ad_open: creating new adouble file: %s/%s", getcwdpath(), ad_p); - 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); + if ((ad->ad_vers == AD_VERSION_EA) && (adflags & ADFLAGS_SETSHRMD)) + /* adouble:ea sets sharemode locks on the datafork */ + adflags |= ADFLAGS_DF; - 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; - } - ad_flush(ad); + if (ad->ad_inited != AD_INITED) { + ad->ad_adflags = adflags; + ad->ad_inited = AD_INITED; } 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; - } + ad->ad_open_forks = ((ad->ad_data_fork.adf_refcount > 0) ? ATTRBIT_DOPEN : 0); + if (ad->ad_resource_fork.adf_refcount > 0) + ad->ad_open_forks |= ATTRBIT_ROPEN; } - /* ****************************************** */ - /* open the resource fork if SFM */ -sfm: - if (ad->ad_flags != AD_VERSION1_SFM) { - return 0; - } + va_start(args, adflags); + if (adflags & ADFLAGS_CREATE) + mode = va_arg(args, mode_t); + va_end(args); - if ((adflags & ADFLAGS_DIR)) { - /* no resource fork for directories / volumes XXX it's false! */ - return 0; + if (adflags & ADFLAGS_DF) { + EC_ZERO( ad_open_df(path, adflags, mode, ad) ); + ad->ad_adflags |= ADFLAGS_DF; } - /* 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))) { - - ad_close( ad, open_df | ADFLAGS_HF); - errno = EACCES; - return -1; - } - return 0; + if (adflags & ADFLAGS_HF) { + EC_ZERO( ad_open_hf(path, adflags, mode, ad) ); + ad->ad_adflags |= ADFLAGS_HF; } - ad_p = ad->ad_ops->ad_path( path, ADFLAGS_RF ); - - admode = mode; - st_invalid = ad_mode_st(ad_p, &admode, &st_dir); - - if ((ad->ad_options & ADVOL_UNIXPRIV)) { - admode = mode; + if (adflags & ADFLAGS_RF) { + EC_ZERO( ad_open_rf(path, adflags, mode, ad) ); + ad->ad_adflags |= ADFLAGS_RF; } - 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 (adflags & ADFLAGS_CHECK_OF) { + ad->ad_open_forks |= ad_openforks(ad, ad->ad_open_forks); } - if ( ad->ad_resource_fork.adf_fd < 0) { - 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) { - /* just created, set owner if admin (root) */ - ad_chown(ad_p, &st_dir); - } - else if (!fstat(ad->ad_resource_fork.adf_fd, &st_meta)) { - ad->ad_rlen = st_meta.st_size; - } - return 0 ; +EC_CLEANUP: + return ret; } /*! @@ -1535,29 +1443,19 @@ sfm: * * @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 + * ADFLAGS_CHECK_OF: test if name is open by us or 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, dir; - int create = O_RDONLY; + int ret, err, oflags; - dir = flags & ADFLAGS_DIR; + /* Sanitize flags */ + oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY; - /* 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) { + 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)); @@ -1565,7 +1463,7 @@ int ad_metadata(const char *name, int flags, struct adouble *adp) return -1; } /* we are root open read only */ - ret = ad_open(name, ADFLAGS_HF|ADFLAGS_RDONLY| dir, O_RDONLY, 0, adp); + ret = ad_open(adp, name, oflags); err = errno; if ( seteuid(uid) < 0) { LOG(log_error, logtype_default, "ad_metadata: can't seteuid back"); @@ -1574,94 +1472,121 @@ int ad_metadata(const char *name, int flags, struct adouble *adp) errno = err; } - if (!ret && (ADFLAGS_OPENFORKS & 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; } -/* ----------------------------------- */ -static int new_rfork(const char *path, struct adouble *ad, int adflags) +/* + * @brief openat like wrapper for ad_metadata + */ +int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp) { - const struct entry *eid; - u_int16_t ashort; - struct stat st; + int ret = 0; + int cwdfd = -1; - ad->ad_magic = AD_MAGIC; - ad->ad_version = ad->ad_flags & 0x0f0000; - if (!ad->ad_version) { - ad->ad_version = AD_VERSION; + if (dirfd != -1) { + if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) { + ret = -1; + goto exit; + } } - memset(ad->ad_filler, 0, sizeof( ad->ad_filler )); - memset(ad->ad_data, 0, sizeof(ad->ad_data)); - -#if AD_VERSION == AD_VERSION2 - if (ad->ad_flags == AD_VERSION2) - eid = entry_order2; - else if (ad->ad_flags == AD_VERSION2_OSX) - eid = entry_order_osx; - else if (ad->ad_flags == AD_VERSION1_SFM) { - ad->ad_magic = SFM_MAGIC; - eid = entry_order_sfm; + if (ad_metadata(name, flags, adp) < 0) { + ret = -1; + goto exit; } - else -#endif - 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++; + if (dirfd != -1) { + if (fchdir(cwdfd) != 0) { + LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting"); + exit(EXITERR_SYS); + } } - /* 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); - } +exit: + if (cwdfd != -1) + close(cwdfd); - /* make things invisible */ - 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)); - } + return ret; + +} + +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 (lstat(path, &st) < 0) { + if (AD_RSRC_OPEN(ad)) { + if (ad_reso_fileno(ad) == -1) + return -1; + ssize_t len; + if ((len = fstat(ad_reso_fileno(ad))) == -1) + return -1; + ad->ad_rlen = len; + } +#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; } - /* 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); - return 0; } -/* to do this with mmap, we need the hfs fs to understand how to mmap - header files. */ -int ad_refresh(struct adouble *ad) +int ad_openat(struct adouble *ad, + int dirfd, /* dir fd openat like */ + const char *path, + int adflags, ...) { + EC_INIT; + int cwdfd = -1; + va_list args; + mode_t mode; - if (ad_meta_fileno(ad) < 0) - return -1; + if (dirfd != -1) { + if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) + EC_FAIL; + } + + va_start(args, adflags); + if (adflags & ADFLAGS_CREATE) + mode = va_arg(args, mode_t); + va_end(args); + + EC_NEG1( ad_open(ad, path, adflags, mode) ); + + if (dirfd != -1) { + if (fchdir(cwdfd) != 0) { + AFP_PANIC("ad_openat: cant chdir back"); + } + } - return ad->ad_ops->ad_header_read(ad, NULL); +EC_CLEANUP: + if (cwdfd != -1) + close(cwdfd); + + return ret; }