X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffile.c;h=39b61c1a92c081e789105271aecde74922f7aecc;hb=160c265b93257c13ee21f944fe3f4c5d9e79a697;hp=a2afbab4c90fa0448d0ff60138b053e6501bbba0;hpb=1633aa342734017ff317e48f4c122831bb92d1d9;p=netatalk.git diff --git a/etc/afpd/file.c b/etc/afpd/file.c index a2afbab4..39b61c1a 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -1,5 +1,5 @@ /* - * $Id: file.c,v 1.28 2001-09-04 13:52:45 rufustfirefly Exp $ + * $Id: file.c,v 1.47 2002-08-16 00:42:56 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -14,7 +14,22 @@ #ifdef HAVE_UNISTD_H #include #endif /* HAVE_UNISTD_H */ + +/* STDC check */ +#if STDC_HEADERS #include +#else /* STDC_HEADERS */ +#ifndef HAVE_STRCHR +#define strchr index +#define strrchr index +#endif /* HAVE_STRCHR */ +char *strchr (), *strrchr (); +#ifndef HAVE_MEMCPY +#define memcpy(d,s,n) bcopy ((s), (d), (n)) +#define memmove(d,s,n) bcopy ((s), (d), (n)) +#endif /* ! HAVE_MEMCPY */ +#endif /* STDC_HEADERS */ + #include #ifdef HAVE_FCNTL_H #include @@ -23,7 +38,7 @@ #include #include -#include +#include #include #include #include @@ -74,284 +89,335 @@ */ const u_char ufinderi[] = { - 'T', 'E', 'X', 'T', 'U', 'N', 'I', 'X', - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 -}; - -int getfilparams(struct vol *vol, - u_int16_t bitmap, - char *path, struct dir *dir, struct stat *st, - char *buf, int *buflen ) + 'T', 'E', 'X', 'T', 'U', 'N', 'I', 'X', + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 + }; + +int getmetadata(struct vol *vol, + u_int16_t bitmap, + char *path, struct dir *dir, struct stat *st, + char *buf, int *buflen, struct adouble *adp, int attrbits ) { #ifndef USE_LASTDID - struct stat hst, lst, *lstp; -#else /* USE_LASTDID */ - struct stat hst; + struct stat lst, *lstp; #endif /* USE_LASTDID */ - struct adouble ad, *adp; - struct ofork *of; + struct stat hst; struct extmap *em; char *data, *nameoff = NULL, *upath; - int bit = 0, isad = 1; + int bit = 0; u_int32_t aint; u_int16_t ashort; u_char achar, fdType[4]; #ifdef DEBUG - syslog(LOG_INFO, "begin getfilparams:"); + LOG(log_info, logtype_afpd, "begin getmetadata:"); #endif /* DEBUG */ upath = mtoupath(vol, path); - if ((of = of_findname(vol, curdir, path))) { - adp = of->of_ad; - } else { - memset(&ad, 0, sizeof(ad)); - adp = &ad; - } - - if ( ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, adp) < 0 ) { - isad = 0; - } else if ( fstat( ad_hfileno( adp ), &hst ) < 0 ) { - syslog( LOG_ERR, "getfilparams fstat: %s", strerror(errno) ); - } data = buf; while ( bitmap != 0 ) { - while (( bitmap & 1 ) == 0 ) { - bitmap = bitmap>>1; - bit++; - } - - switch ( bit ) { - case FILPBIT_ATTR : - if ( isad ) { - ad_getattr(adp, &ashort); - } else if (*upath == '.') { - ashort = htons(ATTRBIT_INVISIBLE); - } else - ashort = 0; - memcpy(data, &ashort, sizeof( ashort )); - data += sizeof( u_short ); - break; - - case FILPBIT_PDID : - memcpy(data, &dir->d_did, sizeof( u_int32_t )); - data += sizeof( u_int32_t ); - break; - - case FILPBIT_CDATE : - if (!isad || (ad_getdate(adp, AD_DATE_CREATE, &aint) < 0)) - aint = AD_DATE_FROM_UNIX(st->st_mtime); - memcpy(data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; - - case FILPBIT_MDATE : - if ( isad && (ad_getdate(adp, AD_DATE_MODIFY, &aint) == 0)) { - if ((st->st_mtime > AD_DATE_TO_UNIX(aint)) && - (hst.st_mtime < st->st_mtime)) { - aint = AD_DATE_FROM_UNIX(st->st_mtime); - } - } else { - aint = AD_DATE_FROM_UNIX(st->st_mtime); - } - memcpy(data, &aint, sizeof( int )); - data += sizeof( int ); - break; - - case FILPBIT_BDATE : - if (!isad || (ad_getdate(adp, AD_DATE_BACKUP, &aint) < 0)) - aint = AD_DATE_START; - memcpy(data, &aint, sizeof( int )); - data += sizeof( int ); - break; - - case FILPBIT_FINFO : - if (isad) - memcpy(data, ad_entry(adp, ADEID_FINDERI), 32); - else { - memcpy(data, ufinderi, 32); - if (*upath == '.') { /* make it invisible */ - ashort = htons(FINDERINFO_INVISIBLE); - memcpy(data + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); - } - } - - if ((!isad || (memcmp(ad_entry(adp, ADEID_FINDERI), - ufinderi, 8 ) == 0)) && - (em = getextmap( path ))) { - memcpy(data, em->em_type, sizeof( em->em_type )); - memcpy(data + 4, em->em_creator, sizeof(em->em_creator)); - } - data += 32; - break; - - case FILPBIT_LNAME : - nameoff = data; - data += sizeof( u_int16_t ); - break; - - case FILPBIT_SNAME : - memset(data, 0, sizeof(u_int16_t)); - data += sizeof( u_int16_t ); - break; - - case FILPBIT_FNUM : - aint = 0; + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch ( bit ) { + case FILPBIT_ATTR : + if ( adp ) { + ad_getattr(adp, &ashort); + } else if (*upath == '.') { + ashort = htons(ATTRBIT_INVISIBLE); + } else + ashort = 0; + if (attrbits) + ashort = htons(ntohs(ashort) | attrbits); + memcpy(data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + break; + + case FILPBIT_PDID : + memcpy(data, &dir->d_did, sizeof( u_int32_t )); + data += sizeof( u_int32_t ); + break; + + case FILPBIT_CDATE : + if (!adp || (ad_getdate(adp, AD_DATE_CREATE, &aint) < 0)) + aint = AD_DATE_FROM_UNIX(st->st_mtime); + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; + + case FILPBIT_MDATE : + if ( adp && (ad_getdate(adp, AD_DATE_MODIFY, &aint) == 0)) { + if ((st->st_mtime > AD_DATE_TO_UNIX(aint))) { + if ( fstat( ad_hfileno( adp ), &hst ) < 0 ) { + LOG(log_error, logtype_default, "getfilparams fstat: %s", strerror(errno) ); + } + else if (hst.st_mtime < st->st_mtime) + aint = AD_DATE_FROM_UNIX(st->st_mtime); + else + aint = AD_DATE_FROM_UNIX(hst.st_mtime); + } + } else { + aint = AD_DATE_FROM_UNIX(st->st_mtime); + } + memcpy(data, &aint, sizeof( int )); + data += sizeof( int ); + break; + + case FILPBIT_BDATE : + if (!adp || (ad_getdate(adp, AD_DATE_BACKUP, &aint) < 0)) + aint = AD_DATE_START; + memcpy(data, &aint, sizeof( int )); + data += sizeof( int ); + break; + + case FILPBIT_FINFO : + if (adp) + memcpy(data, ad_entry(adp, ADEID_FINDERI), 32); + else { + memcpy(data, ufinderi, 32); + if (*upath == '.') { /* make it invisible */ + ashort = htons(FINDERINFO_INVISIBLE); + memcpy(data + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); + } + } + + if ((!adp || (memcmp(ad_entry(adp, ADEID_FINDERI), + ufinderi, 8 ) == 0)) && + (em = getextmap( path ))) { + memcpy(data, em->em_type, sizeof( em->em_type )); + memcpy(data + 4, em->em_creator, sizeof(em->em_creator)); + } + data += 32; + break; + + case FILPBIT_LNAME : + nameoff = data; + data += sizeof( u_int16_t ); + break; + + case FILPBIT_SNAME : + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + break; + + case FILPBIT_FNUM : + aint = 0; #if AD_VERSION > AD_VERSION1 - /* look in AD v2 header */ - if (isad) - memcpy(&aint, ad_entry(adp, ADEID_DID), sizeof(aint)); + /* look in AD v2 header */ + if (adp) + memcpy(&aint, ad_entry(adp, ADEID_DID), sizeof(aint)); #endif /* AD_VERSION > AD_VERSION1 */ #ifdef CNID_DB - aint = cnid_add(vol->v_db, st, dir->d_did, upath, - strlen(upath), aint); + aint = cnid_add(vol->v_db, st, dir->d_did, upath, + strlen(upath), aint); + /* Throw errors if cnid_add fails. */ + if (aint == CNID_INVALID) { + switch (errno) { + case CNID_ERR_PARAM: + LOG(log_error, logtype_afpd, "getfilparams: Incorrect parameters passed to cnid_add"); + return(AFPERR_PARAM); + case CNID_ERR_PATH: + return(AFPERR_PARAM); + case CNID_ERR_DB: + case CNID_ERR_MAX: + return(AFPERR_MISC); + } + } #endif /* CNID_DB */ - if (aint == 0) { - /* - * What a fucking mess. First thing: DID and FNUMs are - * in the same space for purposes of enumerate (and several - * other wierd places). While we consider this Apple's bug, - * this is the work-around: In order to maintain constant and - * unique DIDs and FNUMs, we monotonically generate the DIDs - * during the session, and derive the FNUMs from the filesystem. - * Since the DIDs are small, we insure that the FNUMs are fairly - * large by setting thier high bits to the device number. - * - * AFS already does something very similar to this for the - * inode number, so we don't repeat the procedure. - * - * new algorithm: - * due to complaints over did's being non-persistent, - * here's the current hack to provide semi-persistent - * did's: - * 1) we reserve the first bit for file ids. - * 2) the next 7 bits are for the device. - * 3) the remaining 24 bits are for the inode. - * - * both the inode and device information are actually hashes - * that are then truncated to the requisite bit length. - * - * it should be okay to use lstat to deal with symlinks. - */ + if (aint == 0) { + /* + * What a fucking mess. First thing: DID and FNUMs are + * in the same space for purposes of enumerate (and several + * other wierd places). While we consider this Apple's bug, + * this is the work-around: In order to maintain constant and + * unique DIDs and FNUMs, we monotonically generate the DIDs + * during the session, and derive the FNUMs from the filesystem. + * Since the DIDs are small, we insure that the FNUMs are fairly + * large by setting thier high bits to the device number. + * + * AFS already does something very similar to this for the + * inode number, so we don't repeat the procedure. + * + * new algorithm: + * due to complaints over did's being non-persistent, + * here's the current hack to provide semi-persistent + * did's: + * 1) we reserve the first bit for file ids. + * 2) the next 7 bits are for the device. + * 3) the remaining 24 bits are for the inode. + * + * both the inode and device information are actually hashes + * that are then truncated to the requisite bit length. + * + * it should be okay to use lstat to deal with symlinks. + */ #ifdef USE_LASTDID - aint = htonl(( st->st_dev << 16 ) | (st->st_ino & 0x0000ffff)); + aint = htonl(( st->st_dev << 16 ) | (st->st_ino & 0x0000ffff)); #else /* USE_LASTDID */ - lstp = lstat(upath, &lst) < 0 ? st : &lst; + lstp = lstat(upath, &lst) < 0 ? st : &lst; #ifdef DID_MTAB - aint = htonl( afpd_st_cnid ( lstp ) ); + aint = htonl( afpd_st_cnid ( lstp ) ); #else /* DID_MTAB */ - aint = htonl(CNID(lstp, 1)); + aint = htonl(CNID(lstp, 1)); #endif /* DID_MTAB */ #endif /* USE_LASTDID */ - } - - memcpy(data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; - - case FILPBIT_DFLEN : - aint = htonl( st->st_size ); - memcpy(data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; - - case FILPBIT_RFLEN : - if ( isad ) { - aint = htonl( ad_getentrylen( adp, ADEID_RFORK )); - } else { - aint = 0; - } - memcpy(data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; - - /* Current client needs ProDOS info block for this file. - Use simple heuristic and let the Mac "type" string tell - us what the PD file code should be. Everything gets a - subtype of 0x0000 unless the original value was hashed - to "pXYZ" when we created it. See IA, Ver 2. - */ - case FILPBIT_PDINFO : - if ( isad ) { - memcpy(fdType, ad_entry( adp, ADEID_FINDERI ), 4 ); - - if ( memcmp( fdType, "TEXT", 4 ) == 0 ) { - achar = '\x04'; - ashort = 0x0000; - } - else if ( memcmp( fdType, "PSYS", 4 ) == 0 ) { - achar = '\xff'; - ashort = 0x0000; - } - else if ( memcmp( fdType, "PS16", 4 ) == 0 ) { - achar = '\xb3'; - ashort = 0x0000; - } - else if ( memcmp( fdType, "BINA", 4 ) == 0 ) { - achar = '\x00'; - ashort = 0x0000; - } - else if ( fdType[0] == 'p' ) { - achar = fdType[1]; - ashort = (fdType[2] * 256) + fdType[3]; - } - else { - achar = '\x00'; - ashort = 0x0000; - } - } - else { - achar = '\x00'; - ashort = 0x0000; - } - - *data++ = achar; - *data++ = 0; - memcpy(data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - memset(data, 0, sizeof( ashort )); - data += sizeof( ashort ); - break; - - default : - if ( isad ) { - ad_close( adp, ADFLAGS_HF ); - } - return( AFPERR_BITMAP ); - } - bitmap = bitmap>>1; - bit++; + } + + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; + + case FILPBIT_DFLEN : + aint = htonl( st->st_size ); + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; + + case FILPBIT_RFLEN : + if ( adp ) { + aint = htonl( ad_getentrylen( adp, ADEID_RFORK )); + } else { + aint = 0; + } + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; + + /* Current client needs ProDOS info block for this file. + Use simple heuristic and let the Mac "type" string tell + us what the PD file code should be. Everything gets a + subtype of 0x0000 unless the original value was hashed + to "pXYZ" when we created it. See IA, Ver 2. + */ + case FILPBIT_PDINFO : + if ( adp ) { + memcpy(fdType, ad_entry( adp, ADEID_FINDERI ), 4 ); + + if ( memcmp( fdType, "TEXT", 4 ) == 0 ) { + achar = '\x04'; + ashort = 0x0000; + } + else if ( memcmp( fdType, "PSYS", 4 ) == 0 ) { + achar = '\xff'; + ashort = 0x0000; + } + else if ( memcmp( fdType, "PS16", 4 ) == 0 ) { + achar = '\xb3'; + ashort = 0x0000; + } + else if ( memcmp( fdType, "BINA", 4 ) == 0 ) { + achar = '\x00'; + ashort = 0x0000; + } + else if ( fdType[0] == 'p' ) { + achar = fdType[1]; + ashort = (fdType[2] * 256) + fdType[3]; + } + else { + achar = '\x00'; + ashort = 0x0000; + } + } + else { + achar = '\x00'; + ashort = 0x0000; + } + + *data++ = achar; + *data++ = 0; + memcpy(data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + memset(data, 0, sizeof( ashort )); + data += sizeof( ashort ); + break; + + default : + return( AFPERR_BITMAP ); + } + bitmap = bitmap>>1; + bit++; } if ( nameoff ) { - ashort = htons( data - buf ); - memcpy(nameoff, &ashort, sizeof( ashort )); - if ((aint = strlen( path )) > MACFILELEN) - aint = MACFILELEN; - *data++ = aint; - memcpy(data, path, aint ); - data += aint; - } - if ( isad ) { - ad_close( adp, ADFLAGS_HF ); + ashort = htons( data - buf ); + memcpy(nameoff, &ashort, sizeof( ashort )); + if ((aint = strlen( path )) > MACFILELEN) + aint = MACFILELEN; + *data++ = aint; + memcpy(data, path, aint ); + data += aint; } *buflen = data - buf; + return (AFP_OK); +} + +/* ----------------------- */ +int getfilparams(struct vol *vol, + u_int16_t bitmap, + char *path, struct dir *dir, struct stat *st, + char *buf, int *buflen ) +{ + struct adouble ad, *adp; + struct ofork *of; + char *upath; + u_int16_t attrbits = 0; + int rc; +#ifdef DEBUG + LOG(log_info, logtype_default, "begin getfilparams:"); +#endif /* DEBUG */ + upath = mtoupath(vol, path); + if ((of = of_findname(vol, dir, path))) { + adp = of->of_ad; + attrbits = ((of->of_ad->ad_df.adf_refcount > 0) ? ATTRBIT_DOPEN : 0); + attrbits |= ((of->of_ad->ad_hf.adf_refcount > of->of_ad->ad_df.adf_refcount)? ATTRBIT_ROPEN : 0); + + } else { + memset(&ad, 0, sizeof(ad)); + adp = &ad; + } + + if ( ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, adp) < 0 ) { + adp = NULL; + } + else { +#if 0 + /* FIXME + we need to check if the file is open by another process. + it's slow so we only do it if we have to: + - bitmap is requested. + - we don't already have the answer! + */ + if ((bitmap & (1 << FILPBIT_ATTR))) { + if (!(attrbits & ATTRBIT_ROPEN)) { + } + if (!(attrbits & ATTRBIT_DOPEN)) { + } + } +#endif + } + rc = getmetadata(vol, bitmap, path, dir, st, buf, buflen, adp, attrbits); + if ( adp ) { + ad_close( adp, ADFLAGS_HF ); + } #ifdef DEBUG - syslog(LOG_INFO, "end getfilparams:"); + LOG(log_info, logtype_afpd, "end getfilparams:"); #endif /* DEBUG */ - return( AFP_OK ); + return( rc ); } +/* ----------------------------- */ int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct stat st; struct adouble ad, *adp; @@ -362,11 +428,11 @@ int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen ) int creatf, did, openf, retvalue = AFP_OK; u_int16_t vid; #ifdef FORCE_UIDGID - uidgidset *uidgid; + uidgidset *uidgid; #endif /* FORCE_UIDGID */ #ifdef DEBUG - syslog(LOG_INFO, "begin afp_createfile:"); + LOG(log_info, logtype_afpd, "begin afp_createfile:"); #endif /* DEBUG */ *rbuflen = 0; @@ -377,7 +443,7 @@ int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof( vid ); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (vol->v_flags & AFPVOL_RO) @@ -387,86 +453,83 @@ int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof( did ); if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); } if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); } - if ((vol->v_flags & AFPVOL_MSWINDOWS) && - strpbrk(path, MSWINDOWS_BADCHARS)) - return AFPERR_PARAM; - upath = mtoupath(vol, path); - - if ((vol->v_flags & AFPVOL_NOHEX) && strchr(upath, '/')) - return AFPERR_PARAM; - - if (!validupath(vol, upath)) - return AFPERR_EXIST; - - /* check for vetoed filenames */ - if (veto_file(vol->v_veto, upath)) - return AFPERR_EXIST; + { + int ret; + if (0 != (ret = check_name(vol, upath))) + return ret; + } if ((of = of_findname(vol, curdir, path))) { - adp = of->of_ad; + adp = of->of_ad; } else { - memset(&ad, 0, sizeof(ad)); - adp = &ad; + memset(&ad, 0, sizeof(ad)); + adp = &ad; } if ( creatf) { /* on a hard create, fail if file exists and is open */ if ((stat(upath, &st) == 0) && of) - return AFPERR_BUSY; - openf = O_RDWR|O_CREAT|O_TRUNC; + return AFPERR_BUSY; + openf = O_RDWR|O_CREAT|O_TRUNC; } else { - openf = O_RDWR|O_CREAT|O_EXCL; + /* on a soft create, if the file is open then ad_open won't failed + because open syscall is not called + */ + if (of) { + return AFPERR_EXIST; + } + openf = O_RDWR|O_CREAT|O_EXCL; } #ifdef FORCE_UIDGID - /* preserve current euid, egid */ - save_uidgid ( uidgid ); + /* preserve current euid, egid */ + save_uidgid ( uidgid ); - /* perform all switching of users */ - set_uidgid ( vol ); + /* perform all switching of users */ + set_uidgid ( vol ); #endif /* FORCE_UIDGID */ if ( ad_open( upath, vol_noadouble(vol)|ADFLAGS_DF|ADFLAGS_HF, - openf, 0666, adp) < 0 ) { - switch ( errno ) { - case EEXIST : + openf, 0666, adp) < 0 ) { + switch ( errno ) { + case EEXIST : #ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - restore_uidgid ( uidgid ); + /* bring everything back to old euid, egid */ + restore_uidgid ( uidgid ); #endif /* FORCE_UIDGID */ - return( AFPERR_EXIST ); - case EACCES : + return( AFPERR_EXIST ); + case EACCES : #ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - restore_uidgid ( uidgid ); + /* bring everything back to old euid, egid */ + restore_uidgid ( uidgid ); #endif /* FORCE_UIDGID */ - return( AFPERR_ACCESS ); + return( AFPERR_ACCESS ); case ENOENT: - /* on noadouble volumes, just creating the data fork is ok */ - if (vol_noadouble(vol) && (stat(upath, &st) == 0)) - goto createfile_done; - /* fallthrough */ - default : + /* on noadouble volumes, just creating the data fork is ok */ + if (vol_noadouble(vol) && (stat(upath, &st) == 0)) + goto createfile_done; + /* fallthrough */ + default : #ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - restore_uidgid ( uidgid ); + /* bring everything back to old euid, egid */ + restore_uidgid ( uidgid ); #endif /* FORCE_UIDGID */ - return( AFPERR_PARAM ); - } + return( AFPERR_PARAM ); + } } ad_setentrylen( adp, ADEID_NAME, strlen( path )); memcpy(ad_entry( adp, ADEID_NAME ), path, - ad_getentrylen( adp, ADEID_NAME )); + ad_getentrylen( adp, ADEID_NAME )); ad_flush( adp, ADFLAGS_DF|ADFLAGS_HF ); ad_close( adp, ADFLAGS_DF|ADFLAGS_HF ); @@ -474,28 +537,28 @@ createfile_done: #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { - retvalue = matchfile2dirperms(upath, vol, did); + retvalue = matchfile2dirperms(upath, vol, did); } #endif /* DROPKLUDGE */ setvoltime(obj, vol ); #ifdef DEBUG - syslog(LOG_INFO, "end afp_createfile"); + LOG(log_info, logtype_afpd, "end afp_createfile"); #endif /* DEBUG */ #ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - restore_uidgid ( uidgid ); + /* bring everything back to old euid, egid */ + restore_uidgid ( uidgid ); #endif /* FORCE_UIDGID */ return (retvalue); } int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct vol *vol; struct dir *dir; @@ -504,7 +567,7 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) u_int16_t vid, bitmap; #ifdef DEBUG - syslog(LOG_INFO, "begin afp_setfilparams:"); + LOG(log_info, logtype_afpd, "begin afp_setfilparams:"); #endif /* DEBUG */ *rbuflen = 0; @@ -513,7 +576,7 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (vol->v_flags & AFPVOL_RO) @@ -522,7 +585,7 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&did, ibuf, sizeof( did )); ibuf += sizeof( did ); if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); } memcpy(&bitmap, ibuf, sizeof( bitmap )); @@ -530,19 +593,23 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof( bitmap ); if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); + } + + if ( *path == '\0' ) { + return( AFPERR_BADTYPE ); /* it's a directory */ } if ((u_long)ibuf & 1 ) { - ibuf++; + ibuf++; } if (( rc = setfilparams(vol, path, bitmap, ibuf )) == AFP_OK ) { - setvoltime(obj, vol ); + setvoltime(obj, vol ); } #ifdef DEBUG - syslog(LOG_INFO, "end afp_setfilparams:"); + LOG(log_info, logtype_afpd, "end afp_setfilparams:"); #endif /* DEBUG */ return( rc ); @@ -550,7 +617,7 @@ int afp_setfilparams(obj, ibuf, ibuflen, rbuf, rbuflen ) int setfilparams(struct vol *vol, - char *path, u_int16_t bitmap, char *buf ) + char *path, u_int16_t bitmap, char *buf ) { struct adouble ad, *adp; struct ofork *of; @@ -563,161 +630,161 @@ int setfilparams(struct vol *vol, struct utimbuf ut; #ifdef FORCE_UIDGID - uidgidset *uidgid; + uidgidset *uidgid; - uidgid = malloc(sizeof(uidgidset)); + uidgid = malloc(sizeof(uidgidset)); #endif /* FORCE_UIDGID */ #ifdef DEBUG - syslog(LOG_INFO, "begin setfilparams:"); + LOG(log_info, logtype_afpd, "begin setfilparams:"); #endif /* DEBUG */ upath = mtoupath(vol, path); if ((of = of_findname(vol, curdir, path))) { - adp = of->of_ad; + adp = of->of_ad; } else { - memset(&ad, 0, sizeof(ad)); - adp = &ad; + memset(&ad, 0, sizeof(ad)); + adp = &ad; } #ifdef FORCE_UIDGID - save_uidgid ( uidgid ); - set_uidgid ( vol ); + save_uidgid ( uidgid ); + set_uidgid ( vol ); #endif /* FORCE_UIDGID */ - if (ad_open( upath, vol_noadouble(vol) | ADFLAGS_HF, - O_RDWR|O_CREAT, 0666, adp) < 0) { - /* for some things, we don't need an adouble header */ - if (bitmap & ~(1<>1; - bit++; - } - - switch( bit ) { - case FILPBIT_ATTR : - memcpy(&ashort, buf, sizeof( ashort )); - ad_getattr(adp, &bshort); - if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { - bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); - } else { - bshort &= ~ashort; - } - ad_setattr(adp, bshort); - buf += sizeof( ashort ); - break; - - case FILPBIT_CDATE : - memcpy(&aint, buf, sizeof(aint)); - ad_setdate(adp, AD_DATE_CREATE, aint); - buf += sizeof( aint ); - break; - - case FILPBIT_MDATE : - memcpy(&aint, buf, sizeof( aint )); - if (isad) - ad_setdate(adp, AD_DATE_MODIFY, aint); - ut.actime = ut.modtime = AD_DATE_TO_UNIX(aint); - utime(upath, &ut); - buf += sizeof( aint ); - break; - - case FILPBIT_BDATE : - memcpy(&aint, buf, sizeof(aint)); - ad_setdate(adp, AD_DATE_BACKUP, aint); - buf += sizeof( aint ); - break; - - case FILPBIT_FINFO : - if ((memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 ) == 0) - && (em = getextmap( path )) && - (memcmp(buf, em->em_type, sizeof( em->em_type )) == 0) && - (memcmp(buf + 4, em->em_creator, - sizeof( em->em_creator )) == 0)) { - memcpy(buf, ufinderi, 8 ); - } - memcpy(ad_entry( adp, ADEID_FINDERI ), buf, 32 ); - buf += 32; - break; - - /* Client needs to set the ProDOS file info for this file. - Use defined strings for the simple cases, and convert - all else into pXYY per Inside Appletalk. Always set - the creator as "pdos". */ - case FILPBIT_PDINFO : - achar = *buf; - buf += 2; - memcpy(&ashort, buf, sizeof( ashort )); - ashort = ntohs( ashort ); - buf += 2; - - switch ( (unsigned int) achar ) - { - case 0x04 : - fdType = ( u_char *) "TEXT"; - break; - - case 0xff : - fdType = ( u_char *) "PSYS"; - break; - - case 0xb3 : - fdType = ( u_char *) "PS16"; - break; - - case 0x00 : - fdType = ( u_char *) "BINA"; - break; - - default : - xyy[0] = ( u_char ) 'p'; - xyy[1] = achar; - xyy[2] = ( u_char ) ( ashort >> 8 ) & 0xff; - xyy[3] = ( u_char ) ashort & 0xff; - fdType = xyy; - break; - } - - memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 ); - memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 ); - break; - - - default : - err = AFPERR_BITMAP; - goto setfilparam_done; - } - - bitmap = bitmap>>1; - bit++; + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch( bit ) { + case FILPBIT_ATTR : + memcpy(&ashort, buf, sizeof( ashort )); + ad_getattr(adp, &bshort); + if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { + bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); + } else { + bshort &= ~ashort; + } + ad_setattr(adp, bshort); + buf += sizeof( ashort ); + break; + + case FILPBIT_CDATE : + memcpy(&aint, buf, sizeof(aint)); + ad_setdate(adp, AD_DATE_CREATE, aint); + buf += sizeof( aint ); + break; + + case FILPBIT_MDATE : + memcpy(&aint, buf, sizeof( aint )); + if (isad) + ad_setdate(adp, AD_DATE_MODIFY, aint); + ut.actime = ut.modtime = AD_DATE_TO_UNIX(aint); + utime(upath, &ut); + buf += sizeof( aint ); + break; + + case FILPBIT_BDATE : + memcpy(&aint, buf, sizeof(aint)); + ad_setdate(adp, AD_DATE_BACKUP, aint); + buf += sizeof( aint ); + break; + + case FILPBIT_FINFO : + if ((memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 ) == 0) + && (em = getextmap( path )) && + (memcmp(buf, em->em_type, sizeof( em->em_type )) == 0) && + (memcmp(buf + 4, em->em_creator, + sizeof( em->em_creator )) == 0)) { + memcpy(buf, ufinderi, 8 ); + } + memcpy(ad_entry( adp, ADEID_FINDERI ), buf, 32 ); + buf += 32; + break; + + /* Client needs to set the ProDOS file info for this file. + Use defined strings for the simple cases, and convert + all else into pXYY per Inside Appletalk. Always set + the creator as "pdos". */ + case FILPBIT_PDINFO : + achar = *buf; + buf += 2; + memcpy(&ashort, buf, sizeof( ashort )); + ashort = ntohs( ashort ); + buf += 2; + + switch ( (unsigned int) achar ) + { + case 0x04 : + fdType = ( u_char *) "TEXT"; + break; + + case 0xff : + fdType = ( u_char *) "PSYS"; + break; + + case 0xb3 : + fdType = ( u_char *) "PS16"; + break; + + case 0x00 : + fdType = ( u_char *) "BINA"; + break; + + default : + xyy[0] = ( u_char ) 'p'; + xyy[1] = achar; + xyy[2] = ( u_char ) ( ashort >> 8 ) & 0xff; + xyy[3] = ( u_char ) ashort & 0xff; + fdType = xyy; + break; + } + + memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 ); + memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 ); + break; + + + default : + err = AFPERR_BITMAP; + goto setfilparam_done; + } + + bitmap = bitmap>>1; + bit++; } setfilparam_done: if (isad) { - ad_flush( adp, ADFLAGS_HF ); - ad_close( adp, ADFLAGS_HF ); + ad_flush( adp, ADFLAGS_HF ); + ad_close( adp, ADFLAGS_HF ); #ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); + restore_uidgid ( uidgid ); #endif /* FORCE_UIDGID */ } #ifdef DEBUG - syslog(LOG_INFO, "end setfilparams:"); + LOG(log_info, logtype_afpd, "end setfilparams:"); #endif /* DEBUG */ return err; @@ -728,12 +795,20 @@ setfilparam_done: * and the new mac name. * NOTE: if we have to copy a file instead of renaming it, locks * will break. + * FIXME: locks on ressource fork will always break thanks to ad_close, done ? + * + * src the full source absolute path + * dst the dest filename in current dir + * newname the dest mac name + * adp adouble struct of src file, if open, or & zeroed one + * */ -int renamefile(src, dst, newname, noadouble ) - char *src, *dst, *newname; - const int noadouble; +int renamefile(src, dst, newname, noadouble, adp ) +char *src, *dst, *newname; +const int noadouble; +struct adouble *adp; { - struct adouble ad; + struct ofork *opened; char adsrc[ MAXPATHLEN + 1]; int len, rc; @@ -747,27 +822,27 @@ int renamefile(src, dst, newname, noadouble ) /* existence check moved to afp_moveandrename */ #ifdef DEBUG - syslog (LOG_INFO, "begin renamefile:"); + LOG(log_info, logtype_afpd, "begin renamefile:"); #endif /* DEBUG */ if ( rename( src, dst ) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - case EXDEV : /* Cross device move -- try copy */ - if (( rc = copyfile(src, dst, newname, noadouble )) != AFP_OK ) { - deletefile( dst ); - return( rc ); - } - return deletefile( src ); - default : - return( AFPERR_PARAM ); - } + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EPERM: + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + case EXDEV : /* Cross device move -- try copy */ + if (( rc = copyfile(src, dst, newname, noadouble )) != AFP_OK ) { + deletefile( dst, 0 ); + return( rc ); + } + return deletefile( src, 0); + default : + return( AFPERR_PARAM ); + } } strcpy( adsrc, ad_path( src, 0 )); @@ -776,58 +851,56 @@ rename_retry: if (rename( adsrc, ad_path( dst, 0 )) < 0 ) { struct stat st; - switch ( errno ) { - case ENOENT : - /* check for a source appledouble header. if it exists, make - * a dest appledouble directory and do the rename again. */ - memset(&ad, 0, sizeof(ad)); - if (rc || stat(adsrc, &st) || - (ad_open(dst, ADFLAGS_HF, O_RDWR | O_CREAT, 0666, &ad) < 0)) - return AFP_OK; - rc++; - ad_close(&ad, ADFLAGS_HF); - goto rename_retry; - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } - } - - memset(&ad, 0, sizeof(ad)); - if ( ad_open( dst, ADFLAGS_HF, O_RDWR, 0666, &ad) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } + switch ( errno ) { + case ENOENT : + /* check for a source appledouble header. if it exists, make + * a dest appledouble directory and do the rename again. */ + if (rc || stat(adsrc, &st) || + (ad_open(dst, ADFLAGS_HF, O_RDWR | O_CREAT, 0666, adp) < 0)) + return AFP_OK; + rc++; + ad_close(adp, ADFLAGS_HF); + goto rename_retry; + case EPERM: + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + default : + return( AFPERR_PARAM ); + } + } + + if ( ad_open( dst, ADFLAGS_HF, O_RDWR, 0666, adp) < 0 ) { + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + default : + return( AFPERR_PARAM ); + } } len = strlen( newname ); - ad_setentrylen( &ad, ADEID_NAME, len ); - memcpy(ad_entry( &ad, ADEID_NAME ), newname, len ); - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); + ad_setentrylen( adp, ADEID_NAME, len ); + memcpy(ad_entry( adp, ADEID_NAME ), newname, len ); + ad_flush( adp, ADFLAGS_HF ); + ad_close( adp, ADFLAGS_HF ); #ifdef DEBUG - syslog (LOG_INFO, "end renamefile:"); + LOG(log_info, logtype_afpd, "end renamefile:"); #endif /* DEBUG */ return( AFP_OK ); } int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct vol *vol; struct dir *dir; @@ -837,7 +910,7 @@ int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) u_int16_t svid, dvid; #ifdef DEBUG - syslog (LOG_INFO, "begin afp_copyfile:"); + LOG(log_info, logtype_afpd, "begin afp_copyfile:"); #endif /* DEBUG */ *rbuflen = 0; @@ -846,13 +919,13 @@ int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&svid, ibuf, sizeof( svid )); ibuf += sizeof( svid ); if (( vol = getvolbyvid( svid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } memcpy(&sdid, ibuf, sizeof( sdid )); ibuf += sizeof( sdid ); if (( dir = dirsearch( vol, sdid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } memcpy(&dvid, ibuf, sizeof( dvid )); @@ -861,10 +934,10 @@ int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof( ddid ); if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); } if ( *path == '\0' ) { - return( AFPERR_BADTYPE ); + return( AFPERR_BADTYPE ); } /* don't allow copies when the file is open. @@ -873,55 +946,55 @@ int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) * and locks need to stay coherent. as a result, * we just balk if the file is opened already. */ if (of_findname(vol, curdir, path)) - return AFPERR_DENYCONF; - + return AFPERR_DENYCONF; + newname = obj->newtmp; strcpy( newname, path ); p = ctoupath( vol, curdir, newname ); if (( vol = getvolbyvid( dvid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (vol->v_flags & AFPVOL_RO) return AFPERR_VLOCK; if (( dir = dirsearch( vol, ddid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + return( AFPERR_NOOBJ ); } if ( *path != '\0' ) { - return( AFPERR_BADTYPE ); + return( AFPERR_BADTYPE ); } /* one of the handful of places that knows about the path type */ if ( *ibuf++ != 2 ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - strncpy( newname, ibuf, plen ); - newname[ plen ] = '\0'; + strncpy( newname, ibuf, plen ); + newname[ plen ] = '\0'; } - if ( (err = copyfile(p, mtoupath(vol, newname ), newname, - vol_noadouble(vol))) < 0 ) { - return err; + if ( (err = copyfile(p, mtoupath(vol, newname ), newname, + vol_noadouble(vol))) < 0 ) { + return err; } setvoltime(obj, vol ); #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { - retvalue=matchfile2dirperms(newname, vol, sdid); + retvalue=matchfile2dirperms(newname, vol, sdid); } #endif /* DROPKLUDGE */ #ifdef DEBUG - syslog (LOG_INFO, "end afp_copyfile:"); + LOG(log_info, logtype_afpd, "end afp_copyfile:"); #endif /* DEBUG */ return( retvalue ); @@ -929,44 +1002,44 @@ int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen ) static __inline__ int copy_all(const int dfd, const void *buf, - size_t buflen) + size_t buflen) { - ssize_t cc; + ssize_t cc; #ifdef DEBUG - syslog(LOG_INFO, "begin copy_all:"); + LOG(log_info, logtype_afpd, "begin copy_all:"); #endif /* DEBUG */ - while (buflen > 0) { - if ((cc = write(dfd, buf, buflen)) < 0) { - switch (errno) { - case EINTR: - continue; - case EDQUOT: - case EFBIG: - case ENOSPC: - return AFPERR_DFULL; - case EROFS: - return AFPERR_VLOCK; - default: - return AFPERR_PARAM; - } - } - buflen -= cc; - } + while (buflen > 0) { + if ((cc = write(dfd, buf, buflen)) < 0) { + switch (errno) { + case EINTR: + continue; + case EDQUOT: + case EFBIG: + case ENOSPC: + return AFPERR_DFULL; + case EROFS: + return AFPERR_VLOCK; + default: + return AFPERR_PARAM; + } + } + buflen -= cc; + } #ifdef DEBUG - syslog(LOG_INFO, "end copy_all:"); + LOG(log_info, logtype_afpd, "end copy_all:"); #endif /* DEBUG */ - return AFP_OK; + return AFP_OK; } /* XXX: this needs to use ad_open and ad_lock. so, we need to * pass in vol and path */ int copyfile(src, dst, newname, noadouble ) - char *src, *dst, *newname; - const int noadouble; +char *src, *dst, *newname; +const int noadouble; { struct adouble ad; struct stat st; @@ -975,176 +1048,183 @@ int copyfile(src, dst, newname, noadouble ) ssize_t cc; #ifdef DEBUG - syslog(LOG_INFO, "begin copyfile:"); + LOG(log_info, logtype_afpd, "begin copyfile:"); #endif /* DEBUG */ - if (newname) { - if ((sfd = open( ad_path( src, ADFLAGS_HF ), O_RDONLY, 0 )) < 0 ) { - switch ( errno ) { - case ENOENT : - break; /* just copy the data fork */ - case EACCES : - return( AFPERR_ACCESS ); - default : - return( AFPERR_PARAM ); - } - } else { - if (( dfd = open( ad_path( dst, ADFLAGS_HF ), O_WRONLY|O_CREAT, - ad_mode( ad_path( dst, ADFLAGS_HF ), 0666 ))) < 0 ) { - close( sfd ); - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } - } - - /* copy the file */ + if (newname) { + if ((sfd = open( ad_path( src, ADFLAGS_HF ), O_RDONLY, 0 )) < 0 ) { + switch ( errno ) { + case ENOENT : + break; /* just copy the data fork */ + case EACCES : + return( AFPERR_ACCESS ); + default : + return( AFPERR_PARAM ); + } + } else { + if (( dfd = open( ad_path( dst, ADFLAGS_HF ), O_WRONLY|O_CREAT, + ad_mode( ad_path( dst, ADFLAGS_HF ), 0666 ))) < 0 ) { + close( sfd ); + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + default : + return( AFPERR_PARAM ); + } + } + + /* copy the file */ #ifdef SENDFILE_FLAVOR_LINUX - if (fstat(sfd, &st) == 0) { - if ((cc = sendfile(dfd, sfd, NULL, st.st_size)) < 0) { - switch (errno) { - case EDQUOT: - case EFBIG: - case ENOSPC: - err = AFPERR_DFULL; - break; - case EROFS: - err = AFPERR_VLOCK; - break; - default: - err = AFPERR_PARAM; - } - } - goto copyheader_done; - } + if (fstat(sfd, &st) == 0) { + if ((cc = sendfile(dfd, sfd, NULL, st.st_size)) < 0) { + switch (errno) { + case EDQUOT: + case EFBIG: + case ENOSPC: + err = AFPERR_DFULL; + break; + case EROFS: + err = AFPERR_VLOCK; + break; + default: + err = AFPERR_PARAM; + } + } + goto copyheader_done; + } #endif /* SENDFILE_FLAVOR_LINUX */ - while (1) { - if ((cc = read(sfd, filebuf, sizeof(filebuf))) < 0) { - if (errno == EINTR) - continue; - err = AFPERR_PARAM; - break; - } - - if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) - break; - } + while (1) { + if ((cc = read(sfd, filebuf, sizeof(filebuf))) < 0) { + if (errno == EINTR) + continue; + err = AFPERR_PARAM; + break; + } + + if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) + break; + } copyheader_done: - close(sfd); - close(dfd); - if (err < 0) { - unlink(ad_path(dst, ADFLAGS_HF)); - return err; - } - } + close(sfd); + close(dfd); + if (err < 0) { + unlink(ad_path(dst, ADFLAGS_HF)); + return err; + } + } } /* data fork copying */ if (( sfd = open( src, O_RDONLY, 0 )) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - default : - return( AFPERR_PARAM ); - } + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EACCES : + return( AFPERR_ACCESS ); + default : + return( AFPERR_PARAM ); + } } if (( dfd = open( dst, O_WRONLY|O_CREAT, ad_mode( dst, 0666 ))) < 0 ) { - close( sfd ); - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } + close( sfd ); + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + default : + return( AFPERR_PARAM ); + } } #ifdef SENDFILE_FLAVOR_LINUX if (fstat(sfd, &st) == 0) { - if ((cc = sendfile(dfd, sfd, NULL, st.st_size)) < 0) { - switch (errno) { - case EDQUOT: - case EFBIG: - case ENOSPC: - err = AFPERR_DFULL; - break; - default: - err = AFPERR_PARAM; - } - } - goto copydata_done; + if ((cc = sendfile(dfd, sfd, NULL, st.st_size)) < 0) { + switch (errno) { + case EDQUOT: + case EFBIG: + case ENOSPC: + err = AFPERR_DFULL; + break; + default: + err = AFPERR_PARAM; + } + } + goto copydata_done; } #endif /* SENDFILE_FLAVOR_LINUX */ while (1) { - if ((cc = read( sfd, filebuf, sizeof( filebuf ))) < 0) { - if (errno == EINTR) - continue; - - err = AFPERR_PARAM; - break; - } - - if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) { - break; - } + if ((cc = read( sfd, filebuf, sizeof( filebuf ))) < 0) { + if (errno == EINTR) + continue; + + err = AFPERR_PARAM; + break; + } + + if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) { + break; + } } - + copydata_done: close(sfd); close(dfd); if (err < 0) { - unlink(ad_path(dst, ADFLAGS_HF)); - unlink(dst); - return err; + unlink(ad_path(dst, ADFLAGS_HF)); + unlink(dst); + return err; } if (newname) { - memset(&ad, 0, sizeof(ad)); - if ( ad_open( dst, noadouble | ADFLAGS_HF, O_RDWR|O_CREAT, - 0666, &ad) < 0 ) { - switch ( errno ) { - case ENOENT : - return noadouble ? AFP_OK : AFPERR_NOOBJ; - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } - } - - len = strlen( newname ); - ad_setentrylen( &ad, ADEID_NAME, len ); - memcpy(ad_entry( &ad, ADEID_NAME ), newname, len ); - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); + memset(&ad, 0, sizeof(ad)); + if ( ad_open( dst, noadouble | ADFLAGS_HF, O_RDWR|O_CREAT, + 0666, &ad) < 0 ) { + switch ( errno ) { + case ENOENT : + return noadouble ? AFP_OK : AFPERR_NOOBJ; + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + default : + return( AFPERR_PARAM ); + } + } + + len = strlen( newname ); + ad_setentrylen( &ad, ADEID_NAME, len ); + memcpy(ad_entry( &ad, ADEID_NAME ), newname, len ); + ad_flush( &ad, ADFLAGS_HF ); + ad_close( &ad, ADFLAGS_HF ); } - + #ifdef DEBUG - syslog(LOG_INFO, "end copyfile:"); + LOG(log_info, logtype_afpd, "end copyfile:"); #endif /* DEBUG */ return( AFP_OK ); } -int deletefile( file ) - char *file; +/* ----------------------------------- + checkAttrib: 1 check kFPDeleteInhibitBit + ie deletfile called by afp_delete + + when deletefile is called we don't have lock on it, file is closed (for us) +*/ +int deletefile( file, checkAttrib ) +char *file; +int checkAttrib; { struct adouble ad; int adflags, err = AFP_OK; @@ -1152,113 +1232,135 @@ int deletefile( file ) int openmode = O_RDWR; #ifdef DEBUG - syslog(LOG_INFO, "begin deletefile:"); + LOG(log_info, logtype_afpd, "begin deletefile:"); #endif /* DEBUG */ while(1) { - /* - * If can't open read/write then try again read-only. If it's open - * read-only, we must do a read lock instead of a write lock. - */ - /* try to open both at once */ - adflags = ADFLAGS_DF|ADFLAGS_HF; - memset(&ad, 0, sizeof(ad)); - if ( ad_open( file, adflags, openmode, 0, &ad ) < 0 ) { - switch (errno) { - case ENOENT: - adflags = ADFLAGS_DF; - /* that failed. now try to open just the data fork */ - memset(&ad, 0, sizeof(ad)); - if ( ad_open( file, adflags, openmode, 0, &ad ) < 0 ) { - switch (errno) { - case ENOENT: - return AFPERR_NOOBJ; - case EACCES: - if(openmode == O_RDWR) { - openmode = O_RDONLY; - locktype = ADLOCK_RD; - continue; - } else { - return AFPERR_ACCESS; - } - case EROFS: - return AFPERR_VLOCK; - default: - return AFPERR_PARAM; - } - } - break; - - case EACCES: - if(openmode == O_RDWR) { - openmode = O_RDONLY; - locktype = ADLOCK_RD; - continue; - } else { - return AFPERR_ACCESS; - } - case EROFS: - return AFPERR_VLOCK; - default: - return( AFPERR_PARAM ); - } - } - break; /* from the while */ - } - - if ((adflags & ADFLAGS_HF) && - (ad_tmplock(&ad, ADEID_RFORK, locktype, 0, 0) < 0 )) { - ad_close( &ad, adflags ); - return( AFPERR_BUSY ); + /* + * If can't open read/write then try again read-only. If it's open + * read-only, we must do a read lock instead of a write lock. + */ + /* try to open both at once */ + adflags = ADFLAGS_DF|ADFLAGS_HF; + memset(&ad, 0, sizeof(ad)); + if ( ad_open( file, adflags, openmode, 0, &ad ) < 0 ) { + switch (errno) { + case ENOENT: + adflags = ADFLAGS_DF; + /* that failed. now try to open just the data fork */ + memset(&ad, 0, sizeof(ad)); + if ( ad_open( file, adflags, openmode, 0, &ad ) < 0 ) { + switch (errno) { + case ENOENT: + return AFPERR_NOOBJ; + case EACCES: + if(openmode == O_RDWR) { + openmode = O_RDONLY; + locktype = ADLOCK_RD; + continue; + } else { + return AFPERR_ACCESS; + } + case EROFS: + return AFPERR_VLOCK; + default: + return AFPERR_PARAM; + } + } + break; + + case EACCES: + if(openmode == O_RDWR) { + openmode = O_RDONLY; + locktype = ADLOCK_RD; + continue; + } else { + return AFPERR_ACCESS; + } + case EROFS: + return AFPERR_VLOCK; + default: + return( AFPERR_PARAM ); + } + } + break; /* from the while */ + } + /* + * Does kFPDeleteInhibitBit (bit 8) set? + */ + if (checkAttrib && (adflags & ADFLAGS_HF)) { + u_int16_t bshort; + + ad_getattr(&ad, &bshort); + if ((bshort & htons(ATTRBIT_NODELETE))) { + ad_close( &ad, adflags ); + return(AFPERR_OLOCK); + } + } + + if ((adflags & ADFLAGS_HF) ) { + /* FIXME we have a pb here because we want to know if a file is open + * there's a 'priority inversion' if you can't open the ressource fork RW + * you can delete it if it's open because you can't get a write lock. + * + * ADLOCK_FILELOCK means the whole ressource fork, not only after the + * metadatas + * + * FIXME it doesn't for RFORK open read only and fork open without deny mode + */ + if (ad_tmplock(&ad, ADEID_RFORK, locktype |ADLOCK_FILELOCK, 0, 0) < 0 ) { + ad_close( &ad, adflags ); + return( AFPERR_BUSY ); + } } if (ad_tmplock( &ad, ADEID_DFORK, locktype, 0, 0 ) < 0) { - err = AFPERR_BUSY; - goto delete_unlock; + err = AFPERR_BUSY; + goto delete_unlock; } if ( unlink( ad_path( file, ADFLAGS_HF )) < 0 ) { - switch ( errno ) { - case EPERM: - case EACCES : - err = AFPERR_ACCESS; - goto delete_unlock; - case EROFS: - err = AFPERR_VLOCK; - goto delete_unlock; - case ENOENT : - break; - default : - err = AFPERR_PARAM; + switch ( errno ) { + case EPERM: + case EACCES : + err = AFPERR_ACCESS; goto delete_unlock; - } + case EROFS: + err = AFPERR_VLOCK; + goto delete_unlock; + case ENOENT : + break; + default : + err = AFPERR_PARAM; + goto delete_unlock; + } } if ( unlink( file ) < 0 ) { - switch ( errno ) { - case EPERM: - case EACCES : - err = AFPERR_ACCESS; - break; - case EROFS: - err = AFPERR_VLOCK; - break; - case ENOENT : - break; - default : - err = AFPERR_PARAM; - break; - } + switch ( errno ) { + case EPERM: + case EACCES : + err = AFPERR_ACCESS; + break; + case EROFS: + err = AFPERR_VLOCK; + break; + case ENOENT : + break; + default : + err = AFPERR_PARAM; + break; + } } delete_unlock: if (adflags & ADFLAGS_HF) - ad_tmplock(&ad, ADEID_RFORK, ADLOCK_CLR, 0, 0); + ad_tmplock(&ad, ADEID_RFORK, ADLOCK_CLR |ADLOCK_FILELOCK, 0, 0); ad_tmplock(&ad, ADEID_DFORK, ADLOCK_CLR, 0, 0); ad_close( &ad, adflags ); #ifdef DEBUG - syslog(LOG_INFO, "end deletefile:"); + LOG(log_info, logtype_afpd, "end deletefile:"); #endif /* DEBUG */ return err; @@ -1268,9 +1370,9 @@ delete_unlock: #ifdef CNID_DB /* return a file id */ int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct stat st; struct adouble ad; @@ -1282,7 +1384,7 @@ int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen ) u_short vid; #ifdef DEBUG - syslog(LOG_INFO, "begin afp_createid:"); + LOG(log_info, logtype_afpd, "begin afp_createid:"); #endif /* DEBUG */ *rbuflen = 0; @@ -1292,7 +1394,7 @@ int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof(vid); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM); + return( AFPERR_PARAM); } if (vol->v_flags & AFPVOL_RO) @@ -1302,73 +1404,73 @@ int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof(did); if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if ( *path == '\0' ) { - return( AFPERR_BADTYPE ); + return( AFPERR_BADTYPE ); } upath = mtoupath(vol, path); if (stat(upath, &st) < 0) { - switch (errno) { - case EPERM: - case EACCES: - return AFPERR_ACCESS; - case ENOENT: - return AFPERR_NOOBJ; - default: - return AFPERR_PARAM; - } + switch (errno) { + case EPERM: + case EACCES: + return AFPERR_ACCESS; + case ENOENT: + return AFPERR_NOOBJ; + default: + return AFPERR_PARAM; + } } if (id = cnid_lookup(vol->v_db, &st, did, upath, len = strlen(upath))) { - memcpy(rbuf, &id, sizeof(id)); - *rbuflen = sizeof(id); - return AFPERR_EXISTID; + memcpy(rbuf, &id, sizeof(id)); + *rbuflen = sizeof(id); + return AFPERR_EXISTID; } #if AD_VERSION > AD_VERSION1 memset(&ad, 0, sizeof(ad)); if (ad_open( upath, ADFLAGS_HF, O_RDONLY, 0, &ad ) >= 0) { - memcpy(&id, ad_entry(&ad, ADEID_DID), sizeof(id)); - ad_close(&ad, ADFLAGS_HF); + memcpy(&id, ad_entry(&ad, ADEID_DID), sizeof(id)); + ad_close(&ad, ADFLAGS_HF); } #endif /* AD_VERSION > AD_VERSION1 */ - if (id = cnid_add(vol->v_db, &st, did, upath, len, id)) { - memcpy(rbuf, &id, sizeof(id)); - *rbuflen = sizeof(id); - return AFP_OK; + if (id = cnid_add(vol->v_db, &st, did, upath, len, id) != CNID_INVALID) { + memcpy(rbuf, &id, sizeof(id)); + *rbuflen = sizeof(id); + return AFP_OK; } #ifdef DEBUG - syslog(LOG_INFO, "ending afp_createid...:"); + LOG(log_info, logtype_afpd, "ending afp_createid...:"); #endif /* DEBUG */ switch (errno) { case EROFS: - return AFPERR_VLOCK; - break; + return AFPERR_VLOCK; + break; case EPERM: case EACCES: - return AFPERR_ACCESS; - break; + return AFPERR_ACCESS; + break; default: - syslog(LOG_ERR, "afp_createid: cnid_add: %m"); - return AFPERR_PARAM; + LOG(log_error, logtype_afpd, "afp_createid: cnid_add: %s", strerror(errno)); + return AFPERR_PARAM; } } /* resolve a file id */ int afp_resolveid(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct stat st; struct vol *vol; @@ -1378,8 +1480,11 @@ int afp_resolveid(obj, ibuf, ibuflen, rbuf, rbuflen ) cnid_t id; u_int16_t vid, bitmap; + static char buffer[12 + MAXPATHLEN + 1]; + int len = 12 + MAXPATHLEN + 1; + #ifdef DEBUG - syslog(LOG_INFO, "begin afp_resolveid:"); + LOG(log_info, logtype_afpd, "begin afp_resolveid:"); #endif /* DEBUG */ *rbuflen = 0; @@ -1389,57 +1494,57 @@ int afp_resolveid(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof(vid); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM); + return( AFPERR_PARAM); } memcpy(&id, ibuf, sizeof( id )); ibuf += sizeof(id); - if ((upath = cnid_resolve(vol->v_db, &id)) == NULL) { - return AFPERR_BADID; + if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) { + return AFPERR_BADID; } - if (( dir = dirsearch( vol, id )) == NULL ) { - return( AFPERR_PARAM ); + if (( dir = dirlookup( vol, id )) == NULL ) { + return( AFPERR_PARAM ); } if ((movecwd(vol, dir) < 0) || (stat(upath, &st) < 0)) { - switch (errno) { - case EACCES: - case EPERM: - return AFPERR_ACCESS; - case ENOENT: - return AFPERR_NOID; - default: - return AFPERR_PARAM; - } + switch (errno) { + case EACCES: + case EPERM: + return AFPERR_ACCESS; + case ENOENT: + return AFPERR_NOID; + default: + return AFPERR_PARAM; + } } /* directories are bad */ if (S_ISDIR(st.st_mode)) - return AFPERR_BADTYPE; + return AFPERR_BADTYPE; memcpy(&bitmap, ibuf, sizeof(bitmap)); bitmap = ntohs( bitmap ); if ((err = getfilparams(vol, bitmap, utompath(vol, upath), curdir, &st, - rbuf + sizeof(bitmap), &buflen)) != AFP_OK) - return err; + rbuf + sizeof(bitmap), &buflen)) != AFP_OK) + return err; *rbuflen = buflen + sizeof(bitmap); memcpy(rbuf, ibuf, sizeof(bitmap)); #ifdef DEBUG - syslog(LOG_INFO, "end afp_resolveid:"); + LOG(log_info, logtype_afpd, "end afp_resolveid:"); #endif /* DEBUG */ return AFP_OK; } int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct stat st; struct vol *vol; @@ -1447,10 +1552,13 @@ int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen ) char *upath; int err; cnid_t id; + cnid_t fileid; u_short vid; + static char buffer[12 + MAXPATHLEN + 1]; + int len = 12 + MAXPATHLEN + 1; #ifdef DEBUG - syslog(LOG_INFO, "begin afp_deleteid:"); + LOG(log_info, logtype_afpd, "begin afp_deleteid:"); #endif /* DEBUG */ *rbuflen = 0; @@ -1460,7 +1568,7 @@ int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof(vid); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM); + return( AFPERR_PARAM); } if (vol->v_flags & AFPVOL_RO) @@ -1468,48 +1576,49 @@ int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&id, ibuf, sizeof( id )); ibuf += sizeof(id); + fileid = id; - if ((upath = cnid_resolve(vol->v_db, &id)) == NULL) { - return AFPERR_NOID; + if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) { + return AFPERR_NOID; } - if (( dir = dirsearch( vol, id )) == NULL ) { - return( AFPERR_PARAM ); + if (( dir = dirlookup( vol, id )) == NULL ) { + return( AFPERR_PARAM ); } err = AFP_OK; if ((movecwd(vol, dir) < 0) || (stat(upath, &st) < 0)) { - switch (errno) { - case EACCES: - case EPERM: - return AFPERR_ACCESS; - case ENOENT: - /* still try to delete the id */ - err = AFPERR_NOOBJ; - break; - default: - return AFPERR_PARAM; - } + switch (errno) { + case EACCES: + case EPERM: + return AFPERR_ACCESS; + case ENOENT: + /* still try to delete the id */ + err = AFPERR_NOOBJ; + break; + default: + return AFPERR_PARAM; + } } /* directories are bad */ if (S_ISDIR(st.st_mode)) - return AFPERR_BADTYPE; + return AFPERR_BADTYPE; - if (cnid_delete(vol->v_db, id)) { - switch (errno) { - case EROFS: - return AFPERR_VLOCK; - case EPERM: - case EACCES: - return AFPERR_ACCESS; - default: - return AFPERR_PARAM; - } + if (cnid_delete(vol->v_db, fileid)) { + switch (errno) { + case EROFS: + return AFPERR_VLOCK; + case EPERM: + case EACCES: + return AFPERR_ACCESS; + default: + return AFPERR_PARAM; + } } #ifdef DEBUG - syslog(LOG_INFO, "end afp_deleteid:"); + LOG(log_info, logtype_afpd, "end afp_deleteid:"); #endif /* DEBUG */ return err; @@ -1519,9 +1628,9 @@ int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen ) #define APPLETEMP ".AppleTempXXXXXX" int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen, *rbuflen; { struct stat srcst, destst; struct vol *vol; @@ -1529,6 +1638,12 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) char *spath, temp[17], *path, *p; char *supath, *upath; int err; + struct adouble ads; + struct adouble add; + struct adouble *adsp; + struct adouble *addp; + struct ofork *opened; + #ifdef CNID_DB int slen, dlen; #endif /* CNID_DB */ @@ -1536,7 +1651,7 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) u_int16_t vid; #ifdef DEBUG - syslog(LOG_INFO, "begin afp_exchangefiles:"); + LOG(log_info, logtype_afpd, "begin afp_exchangefiles:"); #endif /* DEBUG */ *rbuflen = 0; @@ -1546,7 +1661,7 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) ibuf += sizeof(vid); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM); + return( AFPERR_PARAM); } if (vol->v_flags & AFPVOL_RO) @@ -1560,30 +1675,35 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) /* source file */ if ((dir = dirsearch( vol, sid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if ( *path == '\0' ) { - return( AFPERR_BADTYPE ); + return( AFPERR_BADTYPE ); /* it's a dir */ } upath = mtoupath(vol, path); if (stat(upath, &srcst) < 0) { - switch (errno) { - case ENOENT: - return AFPERR_NOID; - case EPERM: - case EACCES: - return AFPERR_ACCESS; - default: - return AFPERR_PARAM; - } + switch (errno) { + case ENOENT: + return AFPERR_NOID; + case EPERM: + case EACCES: + return AFPERR_ACCESS; + default: + return AFPERR_PARAM; + } + } + memset(&ads, 0, sizeof(ads)); + adsp = &ads; + if ((opened = of_findname(vol, curdir, path))) { + /* reuse struct adouble so it won't break locks */ + adsp = opened->of_ad; } - /* save some stuff */ sdir = curdir; spath = obj->oldtmp; @@ -1596,43 +1716,48 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) * it. */ #ifdef CNID_DB sid = cnid_lookup(vol->v_db, &srcst, sdir->d_did, supath, - slen = strlen(supath)); + slen = strlen(supath)); #endif /* CNID_DB */ if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } if ( *path == '\0' ) { - return( AFPERR_BADTYPE ); + return( AFPERR_BADTYPE ); } /* FPExchangeFiles is the only call that can return the SameObj * error */ if ((curdir == sdir) && strcmp(spath, path) == 0) - return AFPERR_SAMEOBJ; + return AFPERR_SAMEOBJ; upath = mtoupath(vol, path); if (stat(upath, &destst) < 0) { - switch (errno) { - case ENOENT: - return AFPERR_NOID; - case EPERM: - case EACCES: - return AFPERR_ACCESS; - default: - return AFPERR_PARAM; - } + switch (errno) { + case ENOENT: + return AFPERR_NOID; + case EPERM: + case EACCES: + return AFPERR_ACCESS; + default: + return AFPERR_PARAM; + } + } + memset(&add, 0, sizeof(add)); + addp = &add; + if ((opened = of_findname(vol, curdir, path))) { + /* reuse struct adouble so it won't break locks */ + addp = opened->of_ad; } - #ifdef CNID_DB /* look for destination id. */ did = cnid_lookup(vol->v_db, &destst, curdir->d_did, upath, - dlen = strlen(upath)); + dlen = strlen(upath)); #endif /* CNID_DB */ /* construct a temp name. @@ -1640,55 +1765,57 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) * will also be inaccessible from AFP. */ memcpy(temp, APPLETEMP, sizeof(APPLETEMP)); if (!mktemp(temp)) - return AFPERR_MISC; + return AFPERR_MISC; /* now, quickly rename the file. we error if we can't. */ - if ((err = renamefile(p, temp, temp, vol_noadouble(vol))) < 0) - goto err_exchangefile; + if ((err = renamefile(p, temp, temp, vol_noadouble(vol), adsp)) < 0) + goto err_exchangefile; of_rename(vol, sdir, spath, curdir, temp); /* rename destination to source */ - if ((err = renamefile(path, p, spath, vol_noadouble(vol))) < 0) - goto err_src_to_tmp; + if ((err = renamefile(path, p, spath, vol_noadouble(vol), addp)) < 0) + goto err_src_to_tmp; of_rename(vol, curdir, path, sdir, spath); /* rename temp to destination */ - if ((err = renamefile(temp, upath, path, vol_noadouble(vol))) < 0) - goto err_dest_to_src; + if ((err = renamefile(temp, upath, path, vol_noadouble(vol), adsp)) < 0) + goto err_dest_to_src; of_rename(vol, curdir, temp, curdir, path); - + #ifdef CNID_DB /* id's need switching. src -> dest and dest -> src. */ if (sid && (cnid_update(vol->v_db, sid, &destst, curdir->d_did, - upath, dlen) < 0)) { - switch (errno) { - case EPERM: - case EACCES: - err = AFPERR_ACCESS; - default: - err = AFPERR_PARAM; - } - goto err_temp_to_dest; + upath, dlen) < 0)) { + switch (errno) { + case EPERM: + case EACCES: + err = AFPERR_ACCESS; + break; + default: + err = AFPERR_PARAM; + } + goto err_temp_to_dest; } if (did && (cnid_update(vol->v_db, did, &srcst, sdir->d_did, - supath, slen) < 0)) { - switch (errno) { - case EPERM: - case EACCES: - err = AFPERR_ACCESS; - default: - err = AFPERR_PARAM; - } - - if (sid) - cnid_update(vol->v_db, sid, &srcst, sdir->d_did, supath, slen); - goto err_temp_to_dest; + supath, slen) < 0)) { + switch (errno) { + case EPERM: + case EACCES: + err = AFPERR_ACCESS; + break; + default: + err = AFPERR_PARAM; + } + + if (sid) + cnid_update(vol->v_db, sid, &srcst, sdir->d_did, supath, slen); + goto err_temp_to_dest; } #endif /* CNID_DB */ #ifdef DEBUG - syslog(LOG_INFO, "ending afp_exchangefiles:"); + LOG(log_info, logtype_afpd, "ending afp_exchangefiles:"); #endif /* DEBUG */ return AFP_OK; @@ -1698,17 +1825,17 @@ int afp_exchangefiles(obj, ibuf, ibuflen, rbuf, rbuflen ) * properly. */ err_temp_to_dest: /* rename dest to temp */ - renamefile(upath, temp, temp, vol_noadouble(vol)); + renamefile(upath, temp, temp, vol_noadouble(vol), adsp); of_rename(vol, curdir, upath, curdir, temp); err_dest_to_src: /* rename source back to dest */ - renamefile(p, upath, path, vol_noadouble(vol)); + renamefile(p, upath, path, vol_noadouble(vol), addp); of_rename(vol, sdir, spath, curdir, path); err_src_to_tmp: /* rename temp back to source */ - renamefile(temp, p, spath, vol_noadouble(vol)); + renamefile(temp, p, spath, vol_noadouble(vol), adsp); of_rename(vol, curdir, temp, sdir, spath); err_exchangefile: