/*
- * $Id: file.c,v 1.38 2002-01-29 21:12:14 jmarcus Exp $
+ * $Id: file.c,v 1.71 2003-01-11 17:26:06 jmarcus Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "filedir.h"
#include "globals.h"
-/* check for mtab DID code */
-#ifdef DID_MTAB
-#include "parse_mtab.h"
-#endif /* DID_MTAB */
-
-#ifdef FORCE_UIDGID
-#warning UIDGID
-#include "uid.h"
-#endif /* FORCE_UIDGID */
-
/* the format for the finderinfo fields (from IM: Toolbox Essentials):
* field bytes subfield bytes
*
0, 0, 0, 0, 0, 0, 0, 0
};
-int getfilparams(struct vol *vol,
+/* FIXME mpath : unix or mac name ? (for now it's mac name ) */
+void *get_finderinfo(const char *mpath, struct adouble *adp, void *data)
+{
+ struct extmap *em;
+
+ if (adp) {
+ memcpy(data, ad_entry(adp, ADEID_FINDERI), 32);
+ }
+ else {
+ memcpy(data, ufinderi, 32);
+ }
+
+ if ((!adp || !memcmp(ad_entry(adp, ADEID_FINDERI),ufinderi , 8 ))
+ && (em = getextmap( mpath ))
+ ) {
+ memcpy(data, em->em_type, sizeof( em->em_type ));
+ memcpy(data + 4, em->em_creator, sizeof(em->em_creator));
+ }
+ return data;
+}
+
+/* ---------------------
+*/
+char *set_name(char *data, const char *name, u_int32_t utf8)
+{
+ u_int32_t aint;
+
+ aint = strlen( name );
+
+ if (!utf8) {
+ if (afp_version >= 30) {
+ /* the name is in utf8 */
+ }
+ if (aint > MACFILELEN)
+ aint = MACFILELEN;
+ *data++ = aint;
+ }
+ else {
+ u_int16_t temp;
+
+ if (aint > 255) /* FIXME safeguard, anyway if no ascii char it's game over*/
+ aint = 255;
+
+ utf8 = htonl(utf8);
+ memcpy(data, &utf8, sizeof(utf8));
+ data += sizeof(utf8);
+
+ temp = htons(aint);
+ memcpy(data, &temp, sizeof(temp));
+ data += sizeof(temp);
+ }
+
+ memcpy( data, name, aint );
+ data += aint;
+
+ return data;
+}
+
+/*
+ * FIXME: PDINFO is UTF8 and doesn't need adp
+*/
+#define PARAM_NEED_ADP(b) ((b) & ((1 << FILPBIT_ATTR) |\
+ (1 << FILPBIT_CDATE) |\
+ (1 << FILPBIT_MDATE) |\
+ (1 << FILPBIT_BDATE) |\
+ (1 << FILPBIT_FINFO) |\
+ (1 << FILPBIT_RFLEN) |\
+ (1 << FILPBIT_EXTRFLEN) |\
+ (1 << FILPBIT_PDINFO)))
+
+
+/* -------------------------- */
+int getmetadata(struct vol *vol,
u_int16_t bitmap,
char *path, struct dir *dir, struct stat *st,
- char *buf, int *buflen )
+ 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 extmap *em;
- char *data, *nameoff = NULL, *upath;
- int bit = 0, isad = 1;
+ char *data, *l_nameoff = NULL, *upath;
+ char *utf_nameoff = NULL;
+ int bit = 0;
u_int32_t aint;
u_int16_t ashort;
u_char achar, fdType[4];
+ u_int32_t utf8 = 0;
#ifdef DEBUG
- LOG(log_info, logtype_default, "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 ) {
- LOG(log_error, logtype_default, "getfilparams fstat: %s", strerror(errno) );
- }
data = buf;
while ( bitmap != 0 ) {
switch ( bit ) {
case FILPBIT_ATTR :
- if ( isad ) {
+ if ( adp ) {
ad_getattr(adp, &ashort);
} else if (*upath == '.') {
ashort = htons(ATTRBIT_INVISIBLE);
} else
ashort = 0;
+#if 0
+ /* FIXME do we want a visual clue if the file is read only
+ */
+ struct maccess ma;
+ accessmode( ".", &ma, dir , NULL);
+ if ((ma.ma_user & AR_UWRITE)) {
+ accessmode( upath, &ma, dir , st);
+ if (!(ma.ma_user & AR_UWRITE)) {
+ attrbits |= ATTRBIT_NOWRITE;
+ }
+ }
+#endif
+ if (attrbits)
+ ashort = htons(ntohs(ashort) | attrbits);
memcpy(data, &ashort, sizeof( ashort ));
- data += sizeof( u_short );
+ data += sizeof( ashort );
break;
case FILPBIT_PDID :
break;
case FILPBIT_CDATE :
- if (!isad || (ad_getdate(adp, AD_DATE_CREATE, &aint) < 0))
+ 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 ( 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);
+ if ( adp && (ad_getdate(adp, AD_DATE_MODIFY, &aint) == 0)) {
+ if ((st->st_mtime > AD_DATE_TO_UNIX(aint))) {
+ aint = AD_DATE_FROM_UNIX(st->st_mtime);
}
} else {
aint = AD_DATE_FROM_UNIX(st->st_mtime);
break;
case FILPBIT_BDATE :
- if (!isad || (ad_getdate(adp, AD_DATE_BACKUP, &aint) < 0))
+ 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 (isad)
- memcpy(data, ad_entry(adp, ADEID_FINDERI), 32);
- else {
- memcpy(data, ufinderi, 32);
+ get_finderinfo(path, adp, (char *)data);
+ if (!adp) {
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;
+ l_nameoff = data;
data += sizeof( u_int16_t );
break;
aint = 0;
#if AD_VERSION > AD_VERSION1
/* look in AD v2 header */
- if (isad)
+ if (adp)
memcpy(&aint, ad_entry(adp, ADEID_DID), sizeof(aint));
#endif /* AD_VERSION > AD_VERSION1 */
aint = cnid_add(vol->v_db, st, dir->d_did, upath,
strlen(upath), aint);
/* Throw errors if cnid_add fails. */
- if (aint < 0) {
+ if (aint == CNID_INVALID) {
switch (errno) {
case CNID_ERR_PARAM:
- LOG(log_error, logtype_default, "getfilparams: Incorrect parameters passed to cnid_add");
+ LOG(log_error, logtype_afpd, "getfilparams: Incorrect parameters passed to cnid_add");
return(AFPERR_PARAM);
case CNID_ERR_PATH:
return(AFPERR_PARAM);
aint = htonl(( st->st_dev << 16 ) | (st->st_ino & 0x0000ffff));
#else /* USE_LASTDID */
lstp = lstat(upath, &lst) < 0 ? st : &lst;
-#ifdef DID_MTAB
- aint = htonl( afpd_st_cnid ( lstp ) );
-#else /* DID_MTAB */
aint = htonl(CNID(lstp, 1));
-#endif /* DID_MTAB */
#endif /* USE_LASTDID */
}
break;
case FILPBIT_DFLEN :
- aint = htonl( st->st_size );
+ if (st->st_size > 0xffffffff)
+ aint = 0xffffffff;
+ else
+ 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 ));
+ if ( adp ) {
+ if (adp->ad_rlen > 0xffffffff)
+ aint = 0xffffffff;
+ else
+ aint = htonl( adp->ad_rlen);
} else {
aint = 0;
}
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.
- <shirsch@ibm.net> */
+ <shirsch@adelphia.net> */
case FILPBIT_PDINFO :
- if ( isad ) {
- memcpy(fdType, ad_entry( adp, ADEID_FINDERI ), 4 );
+ if (afp_version >= 30) { /* UTF8 name */
+ utf8 = kTextEncodingUTF8;
+ utf_nameoff = data;
+ data += sizeof( u_int16_t );
+ aint = 0;
+ memcpy(data, &aint, sizeof( aint ));
+ data += sizeof( aint );
+ }
+ else {
+ 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];
+ 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;
}
- }
- 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 );
+ *data++ = achar;
+ *data++ = 0;
+ memcpy(data, &ashort, sizeof( ashort ));
+ data += sizeof( ashort );
+ memset(data, 0, sizeof( ashort ));
+ data += sizeof( ashort );
+ }
+ break;
+ case FILPBIT_EXTDFLEN:
+ aint = htonl(st->st_size >> 32);
+ memcpy(data, &aint, sizeof( aint ));
+ data += sizeof( aint );
+ aint = htonl(st->st_size);
+ memcpy(data, &aint, sizeof( aint ));
+ data += sizeof( aint );
+ break;
+ case FILPBIT_EXTRFLEN:
+ aint = 0;
+ if (adp)
+ aint = htonl(adp->ad_rlen >> 32);
+ memcpy(data, &aint, sizeof( aint ));
+ data += sizeof( aint );
+ if (adp)
+ aint = htonl(adp->ad_rlen);
+ memcpy(data, &aint, sizeof( aint ));
+ data += sizeof( aint );
break;
-
default :
- if ( isad ) {
- ad_close( adp, ADFLAGS_HF );
- }
return( AFPERR_BITMAP );
}
bitmap = bitmap>>1;
bit++;
}
- if ( nameoff ) {
+ if ( l_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;
+ memcpy(l_nameoff, &ashort, sizeof( ashort ));
+ data = set_name(data, path, 0);
}
- if ( isad ) {
- ad_close( adp, ADFLAGS_HF );
+ if ( utf_nameoff ) {
+ ashort = htons( data - buf );
+ memcpy(utf_nameoff, &ashort, sizeof( ashort ));
+ data = set_name(data, path, utf8);
}
*buflen = data - buf;
+ return (AFP_OK);
+}
+
+/* ----------------------- */
+int getfilparams(struct vol *vol,
+ u_int16_t bitmap,
+ struct path *path, struct dir *dir,
+ char *buf, int *buflen )
+{
+ struct adouble ad, *adp;
+ struct ofork *of;
+ char *upath;
+ u_int16_t attrbits = 0;
+ int opened = 0;
+ int rc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "end getfilparams:");
+ LOG(log_info, logtype_default, "begin getfilparams:");
#endif /* DEBUG */
- return( AFP_OK );
+ opened = PARAM_NEED_ADP(bitmap);
+ adp = NULL;
+ if (opened) {
+ upath = path->u_name;
+ if ((of = of_findname(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 {
+ /* 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)) {
+ }
+ }
+ }
+ }
+ rc = getmetadata(vol, bitmap, path->m_name, dir, &path->st, buf, buflen, adp, attrbits);
+ if ( adp ) {
+ ad_close( adp, ADFLAGS_HF );
+ }
+#ifdef DEBUG
+ LOG(log_info, logtype_afpd, "end getfilparams:");
+#endif /* DEBUG */
+
+ return( rc );
}
+/* ----------------------------- */
int afp_createfile(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- struct stat st;
+ struct stat *st;
struct adouble ad, *adp;
struct vol *vol;
struct dir *dir;
- struct ofork *of;
+ struct ofork *of = NULL;
char *path, *upath;
int creatf, did, openf, retvalue = AFP_OK;
u_int16_t vid;
-#ifdef FORCE_UIDGID
- uidgidset *uidgid;
-#endif /* FORCE_UIDGID */
-
+ int ret;
+ struct path *s_path;
+
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_createfile:");
+ LOG(log_info, logtype_afpd, "begin afp_createfile:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(&did, ibuf, sizeof( did));
ibuf += sizeof( did );
- if (( dir = dirsearch( vol, did )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (( dir = dirlookup( vol, did )) == NULL ) {
+ return afp_errno;
}
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+ return afp_errno;
}
- if (!wincheck(vol, path))
- 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;
+ if ( *s_path->m_name == '\0' ) {
+ return( AFPERR_BADTYPE );
+ }
- if ((of = of_findname(vol, curdir, path))) {
+ upath = s_path->u_name;
+ if (0 != (ret = check_name(vol, upath)))
+ return ret;
+
+ /* if upath is deleted we already in trouble anyway */
+ if ((of = of_findname(s_path))) {
adp = of->of_ad;
} else {
memset(&ad, 0, sizeof(ad));
}
if ( creatf) {
/* on a hard create, fail if file exists and is open */
- if ((stat(upath, &st) == 0) && of)
+ if (of)
return AFPERR_BUSY;
openf = O_RDWR|O_CREAT|O_TRUNC;
} else {
+ /* on a soft create, if the file is open then ad_open won't fail
+ 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 );
-
- /* 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 :
-#ifdef FORCE_UIDGID
- /* bring everything back to old euid, egid */
- restore_uidgid ( uidgid );
-#endif /* FORCE_UIDGID */
return( AFPERR_EXIST );
case EACCES :
-#ifdef FORCE_UIDGID
- /* bring everything back to old euid, egid */
- restore_uidgid ( uidgid );
-#endif /* FORCE_UIDGID */
return( AFPERR_ACCESS );
case ENOENT:
/* on noadouble volumes, just creating the data fork is ok */
- if (vol_noadouble(vol) && (stat(upath, &st) == 0))
+ st = &s_path->st;
+ 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 );
-#endif /* FORCE_UIDGID */
return( AFPERR_PARAM );
}
}
-
+ path = s_path->m_name;
ad_setentrylen( adp, ADEID_NAME, strlen( path ));
memcpy(ad_entry( adp, ADEID_NAME ), path,
ad_getentrylen( adp, ADEID_NAME ));
ad_close( adp, ADFLAGS_DF|ADFLAGS_HF );
createfile_done:
+ curdir->offcnt++;
#ifdef DROPKLUDGE
if (vol->v_flags & AFPVOL_DROPBOX) {
setvoltime(obj, vol );
#ifdef DEBUG
- LOG(log_info, logtype_default, "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 );
-#endif /* FORCE_UIDGID */
-
return (retvalue);
}
{
struct vol *vol;
struct dir *dir;
- char *path;
+ struct path *s_path;
int did, rc;
u_int16_t vid, bitmap;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_setfilparams:");
+ LOG(log_info, logtype_afpd, "begin afp_setfilparams:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(&did, ibuf, sizeof( did ));
ibuf += sizeof( did );
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
bitmap = ntohs( bitmap );
ibuf += sizeof( bitmap );
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+ return afp_errno;
+ }
+
+ if ( *s_path->m_name == '\0' ) {
+ return( AFPERR_BADTYPE ); /* it's a directory */
}
if ((u_long)ibuf & 1 ) {
ibuf++;
}
- if (( rc = setfilparams(vol, path, bitmap, ibuf )) == AFP_OK ) {
+ if (( rc = setfilparams(vol, s_path, bitmap, ibuf )) == AFP_OK ) {
setvoltime(obj, vol );
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_setfilparams:");
+ LOG(log_info, logtype_afpd, "end afp_setfilparams:");
#endif /* DEBUG */
return( rc );
}
+/*
+ * cf AFP3.0.pdf page 252 for change_mdate and change_parent_mdate logic
+ *
+*/
+extern struct path Cur_Path;
int setfilparams(struct vol *vol,
- char *path, u_int16_t bitmap, char *buf )
+ struct path *path, u_int16_t bitmap, char *buf )
{
struct adouble ad, *adp;
struct ofork *of;
u_int32_t aint;
struct utimbuf ut;
-#ifdef FORCE_UIDGID
- uidgidset *uidgid;
+ int change_mdate = 0;
+ int change_parent_mdate = 0;
+ int newdate = 0;
+ struct timeval tv;
- uidgid = malloc(sizeof(uidgidset));
-#endif /* FORCE_UIDGID */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin setfilparams:");
+ LOG(log_info, logtype_afpd, "begin setfilparams:");
#endif /* DEBUG */
- upath = mtoupath(vol, path);
- if ((of = of_findname(vol, curdir, path))) {
+ upath = path->u_name;
+ if ((of = of_findname(path))) {
adp = of->of_ad;
} else {
memset(&ad, 0, sizeof(ad));
adp = &ad;
}
-#ifdef FORCE_UIDGID
- save_uidgid ( uidgid );
- set_uidgid ( vol );
-#endif /* FORCE_UIDGID */
+ if (check_access(upath, OPENACC_WR ) < 0) {
+ return AFPERR_ACCESS;
+ }
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<<FILPBIT_MDATE)) {
-#ifdef FORCE_UIDGID
- restore_uidgid ( uidgid );
-#endif /* FORCE_UIDGID */
return vol_noadouble(vol) ? AFP_OK : AFPERR_ACCESS;
}
isad = 0;
} else if ((ad_getoflags( adp, ADFLAGS_HF ) & O_CREAT) ) {
- ad_setentrylen( adp, ADEID_NAME, strlen( path ));
- memcpy(ad_entry( adp, ADEID_NAME ), path,
+ ad_setentrylen( adp, ADEID_NAME, strlen( path->m_name ));
+ memcpy(ad_entry( adp, ADEID_NAME ), path->m_name,
ad_getentrylen( adp, ADEID_NAME ));
}
switch( bit ) {
case FILPBIT_ATTR :
+ change_mdate = 1;
memcpy(&ashort, buf, sizeof( ashort ));
ad_getattr(adp, &bshort);
if ( ntohs( ashort ) & ATTRBIT_SETCLR ) {
} else {
bshort &= ~ashort;
}
+ if ((ashort & htons(ATTRBIT_INVISIBLE)))
+ change_parent_mdate = 1;
ad_setattr(adp, bshort);
buf += sizeof( ashort );
break;
case FILPBIT_CDATE :
+ change_mdate = 1;
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 );
+ memcpy(&newdate, buf, sizeof( newdate ));
+ buf += sizeof( newdate );
break;
case FILPBIT_BDATE :
+ change_mdate = 1;
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)) {
+ change_mdate = 1;
+
+ if (!memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 )
+ && (
+ ((em = getextmap( path->m_name )) &&
+ !memcmp(buf, em->em_type, sizeof( em->em_type )) &&
+ !memcmp(buf + 4, em->em_creator,sizeof( em->em_creator)))
+ || ((em = getdefextmap()) &&
+ !memcmp(buf, em->em_type, sizeof( em->em_type )) &&
+ !memcmp(buf + 4, em->em_creator,sizeof( em->em_creator)))
+ )) {
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". <shirsch@ibm.net> */
+ Use a defined string for TEXT to support crlf
+ translations and convert all else into pXYY per Inside
+ Appletalk. Always set the creator as "pdos". Changes
+ from original by Marsha Jackson. */
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;
- }
-
+ /* Keep special case to support crlf translations */
+ if ((unsigned int) achar == 0x04) {
+ fdType = (u_char *)"TEXT";
+ buf += 2;
+ } else {
+ xyy[0] = ( u_char ) 'p';
+ xyy[1] = achar;
+ xyy[3] = *buf++;
+ xyy[2] = *buf++;
+ fdType = xyy;
+ }
memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 );
memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 );
break;
}
setfilparam_done:
+ if (change_mdate && newdate == 0 && gettimeofday(&tv, NULL) == 0) {
+ newdate = AD_DATE_FROM_UNIX(tv.tv_sec);
+ }
+ if (newdate) {
+ if (isad)
+ ad_setdate(adp, AD_DATE_MODIFY, newdate);
+ ut.actime = ut.modtime = AD_DATE_TO_UNIX(newdate);
+ utime(upath, &ut);
+ }
+
if (isad) {
ad_flush( adp, ADFLAGS_HF );
ad_close( adp, ADFLAGS_HF );
-#ifdef FORCE_UIDGID
- restore_uidgid ( uidgid );
-#endif /* FORCE_UIDGID */
+ }
+ if (change_parent_mdate && gettimeofday(&tv, NULL) == 0) {
+ newdate = AD_DATE_FROM_UNIX(tv.tv_sec);
+ bitmap = 1<<FILPBIT_MDATE;
+ setdirparams(vol, &Cur_Path, bitmap, (char *)&newdate);
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end setfilparams:");
+ LOG(log_info, logtype_afpd, "end setfilparams:");
#endif /* DEBUG */
-
return err;
}
* renamefile and copyfile take the old and new unix pathnames
* and the new mac name.
* NOTE: if we have to copy a file instead of renaming it, locks
- * will break.
+ * will break. Anyway it's an error because then we have 2 files.
+ *
+ * src the source 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 )
+int renamefile(src, dst, newname, noadouble, adp )
char *src, *dst, *newname;
const int noadouble;
+struct adouble *adp;
{
- struct adouble ad;
char adsrc[ MAXPATHLEN + 1];
int len, rc;
/* existence check moved to afp_moveandrename */
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin renamefile:");
+ LOG(log_info, logtype_afpd, "begin renamefile:");
#endif /* DEBUG */
- if ( rename( src, dst ) < 0 ) {
+ if ( unix_rename( src, dst ) < 0 ) {
switch ( errno ) {
case ENOENT :
return( AFPERR_NOOBJ );
return AFPERR_VLOCK;
case EXDEV : /* Cross device move -- try copy */
if (( rc = copyfile(src, dst, newname, noadouble )) != AFP_OK ) {
- deletefile( dst );
+ deletefile( dst, 0 );
return( rc );
}
- return deletefile( src );
+ return deletefile( src, 0);
default :
return( AFPERR_PARAM );
}
strcpy( adsrc, ad_path( src, 0 ));
rc = 0;
rename_retry:
- if (rename( adsrc, ad_path( dst, 0 )) < 0 ) {
+ if (unix_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))
+ (ad_open(dst, ADFLAGS_HF, O_RDWR | O_CREAT, 0666, adp) < 0))
return AFP_OK;
rc++;
- ad_close(&ad, ADFLAGS_HF);
+ ad_close(adp, ADFLAGS_HF);
goto rename_retry;
case EPERM:
case EACCES :
}
}
- memset(&ad, 0, sizeof(ad));
- if ( ad_open( dst, ADFLAGS_HF, O_RDWR, 0666, &ad) < 0 ) {
+ if ( ad_open( dst, ADFLAGS_HF, O_RDWR, 0666, adp) < 0 ) {
switch ( errno ) {
case ENOENT :
return( AFPERR_NOOBJ );
}
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
- LOG(log_info, logtype_default, "end renamefile:");
+ LOG(log_info, logtype_afpd, "end renamefile:");
#endif /* DEBUG */
return( AFP_OK );
}
+int copy_path_name(char *newname, char *ibuf)
+{
+char type = *ibuf;
+size_t plen = 0;
+u_int16_t len16;
+u_int32_t hint;
+
+ if ( type != 2 && !(afp_version >= 30 && type == 3) ) {
+ return -1;
+ }
+ ibuf++;
+ switch (type) {
+ case 2:
+ if (( plen = (unsigned char)*ibuf++ ) != 0 ) {
+ strncpy( newname, ibuf, plen );
+ newname[ plen ] = '\0';
+ if (strlen(newname) != plen) {
+ /* there's \0 in newname, e.g. it's a pathname not
+ * only a filename.
+ */
+ return -1;
+ }
+ }
+ break;
+ case 3:
+ memcpy(&hint, ibuf, sizeof(hint));
+ ibuf += sizeof(hint);
+
+ memcpy(&len16, ibuf, sizeof(len16));
+ ibuf += sizeof(len16);
+ plen = ntohs(len16);
+ if (plen) {
+ strncpy( newname, ibuf, plen );
+ newname[ plen ] = '\0';
+ if (strchr(newname,'/')) {
+ return -1;
+ }
+ }
+ break;
+ }
+ return plen;
+}
+
+/* -----------------------------------
+*/
int afp_copyfile(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
char *ibuf, *rbuf;
{
struct vol *vol;
struct dir *dir;
- char *newname, *path, *p;
+ char *newname, *p, *upath;
+ struct path *s_path;
u_int32_t sdid, ddid;
- int plen, err, retvalue = AFP_OK;
+ int err, retvalue = AFP_OK;
u_int16_t svid, dvid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_copyfile:");
+ LOG(log_info, logtype_afpd, "begin afp_copyfile:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(&sdid, ibuf, sizeof( sdid ));
ibuf += sizeof( sdid );
- if (( dir = dirsearch( vol, sdid )) == NULL ) {
- return( AFPERR_PARAM );
+ if (( dir = dirlookup( vol, sdid )) == NULL ) {
+ return afp_errno;
}
memcpy(&dvid, ibuf, sizeof( dvid ));
memcpy(&ddid, ibuf, sizeof( ddid ));
ibuf += sizeof( ddid );
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+ return afp_errno;
}
- if ( *path == '\0' ) {
+ if ( *s_path->m_name == '\0' ) {
return( AFPERR_BADTYPE );
}
* however, copyfile doesn't have any of that info,
* 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;
newname = obj->newtmp;
- strcpy( newname, path );
+ strcpy( newname, s_path->m_name );
- p = ctoupath( vol, curdir, newname );
+ if (of_findname(s_path))
+ return AFPERR_DENYCONF;
+ p = ctoupath( vol, curdir, newname );
+#ifdef FORCE_UIDGID
+ /* FIXME svid != dvid && dvid's user can't read svid */
+#endif
if (( vol = getvolbyvid( dvid )) == NULL ) {
return( AFPERR_PARAM );
}
if (vol->v_flags & AFPVOL_RO)
return AFPERR_VLOCK;
- if (( dir = dirsearch( vol, ddid )) == NULL ) {
- return( AFPERR_PARAM );
+ if (( dir = dirlookup( vol, ddid )) == NULL ) {
+ return afp_errno;
}
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
+ return afp_errno;
}
- if ( *path != '\0' ) {
- return( AFPERR_BADTYPE );
+ if ( *s_path->m_name != '\0' ) {
+ return( AFPERR_BADTYPE ); /* not a directory. AFPERR_PARAM? */
}
/* one of the handful of places that knows about the path type */
- if ( *ibuf++ != 2 ) {
+ if (copy_path_name(newname, ibuf) < 0) {
return( AFPERR_PARAM );
}
- if (( plen = (unsigned char)*ibuf++ ) != 0 ) {
- strncpy( newname, ibuf, plen );
- newname[ plen ] = '\0';
- }
- if ( (err = copyfile(p, mtoupath(vol, newname ), newname,
- vol_noadouble(vol))) < 0 ) {
+ upath = mtoupath(vol, newname);
+ if ( (err = copyfile(p, upath , newname, vol_noadouble(vol))) < 0 ) {
return err;
}
-
- setvoltime(obj, vol );
+ curdir->offcnt++;
#ifdef DROPKLUDGE
if (vol->v_flags & AFPVOL_DROPBOX) {
- retvalue=matchfile2dirperms(newname, vol, sdid);
+ retvalue=matchfile2dirperms(upath, vol, ddid); /* FIXME sdir or ddid */
}
#endif /* DROPKLUDGE */
+ setvoltime(obj, vol );
+
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_copyfile:");
+ LOG(log_info, logtype_afpd, "end afp_copyfile:");
#endif /* DEBUG */
return( retvalue );
ssize_t cc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin copy_all:");
+ LOG(log_info, logtype_afpd, "begin copy_all:");
#endif /* DEBUG */
while (buflen > 0) {
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end copy_all:");
+ LOG(log_info, logtype_afpd, "end copy_all:");
#endif /* DEBUG */
return AFP_OK;
const int noadouble;
{
struct adouble ad;
+#ifdef SENDFILE_FLAVOR_LINUX
struct stat st;
+#endif
char filebuf[8192];
int sfd, dfd, len, err = AFP_OK;
ssize_t cc;
-
+ char dpath[ MAXPATHLEN + 1];
+ int admode;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin copyfile:");
+ LOG(log_info, logtype_afpd, "begin copyfile:");
#endif /* DEBUG */
+ strcpy(dpath, ad_path( dst, ADFLAGS_HF ));
+ admode = ad_mode( dst, 0666 );
if (newname) {
if ((sfd = open( ad_path( src, ADFLAGS_HF ), O_RDONLY, 0 )) < 0 ) {
switch ( errno ) {
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 ) {
+ if (( dfd = open( dpath, O_WRONLY|O_CREAT,ad_hf_mode(admode))) < 0 ) {
close( sfd );
switch ( errno ) {
case ENOENT :
close(sfd);
close(dfd);
if (err < 0) {
- unlink(ad_path(dst, ADFLAGS_HF));
+ unlink(dpath);
return err;
}
}
}
}
- if (( dfd = open( dst, O_WRONLY|O_CREAT, ad_mode( dst, 0666 ))) < 0 ) {
+ if (( dfd = open( dst, O_WRONLY|O_CREAT, admode)) < 0 ) {
close( sfd );
switch ( errno ) {
case ENOENT :
close(sfd);
close(dfd);
if (err < 0) {
- unlink(ad_path(dst, ADFLAGS_HF));
+ unlink(dpath);
unlink(dst);
return err;
}
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end copyfile:");
+ LOG(log_info, logtype_afpd, "end copyfile:");
#endif /* DEBUG */
return( AFP_OK );
}
-int deletefile( 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)
+ untrue if called by renamefile
+*/
+int deletefile( file, checkAttrib )
char *file;
+int checkAttrib;
{
struct adouble ad;
int adflags, err = AFP_OK;
int openmode = O_RDWR;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin deletefile:");
+ LOG(log_info, logtype_afpd, "begin deletefile:");
#endif /* DEBUG */
while(1) {
}
break; /* from the while */
}
+ /*
+ * Does kFPDeleteInhibitBit (bit 8) set?
+ */
+ if (checkAttrib && (adflags & ADFLAGS_HF)) {
+ u_int16_t bshort;
- if ((adflags & ADFLAGS_HF) &&
- (ad_tmplock(&ad, ADEID_RFORK, locktype, 0, 0) < 0 )) {
- ad_close( &ad, adflags );
- return( AFPERR_BUSY );
+ 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) {
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
- LOG(log_info, logtype_default, "end deletefile:");
+ LOG(log_info, logtype_afpd, "end deletefile:");
#endif /* DEBUG */
return err;
}
-
+/* ------------------------------------ */
#ifdef CNID_DB
/* return a file id */
int afp_createid(obj, ibuf, ibuflen, rbuf, rbuflen )
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- struct stat st;
+ struct stat *st;
+#if AD_VERSION > AD_VERSION1
struct adouble ad;
+#endif
struct vol *vol;
struct dir *dir;
- char *path, *upath;
+ char *upath;
int len;
cnid_t did, id;
u_short vid;
+ struct path *s_path;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_createid:");
+ LOG(log_info, logtype_afpd, "begin afp_createid:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(&did, ibuf, sizeof( did ));
ibuf += sizeof(did);
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
return( AFPERR_PARAM );
}
- if ( *path == '\0' ) {
+ if ( *s_path->m_name == '\0' ) {
return( AFPERR_BADTYPE );
}
- upath = mtoupath(vol, path);
- if (stat(upath, &st) < 0) {
- switch (errno) {
+ upath = s_path->u_name;
+ switch (s_path->st_errno) {
+ case 0:
+ break; /* success */
case EPERM:
case EACCES:
return AFPERR_ACCESS;
return AFPERR_NOOBJ;
default:
return AFPERR_PARAM;
- }
}
-
- if (id = cnid_lookup(vol->v_db, &st, did, upath, len = strlen(upath))) {
+ st = &s_path->st;
+ if ((id = cnid_lookup(vol->v_db, st, did, upath, len = strlen(upath)))) {
memcpy(rbuf, &id, sizeof(id));
*rbuflen = sizeof(id);
return AFPERR_EXISTID;
}
#endif /* AD_VERSION > AD_VERSION1 */
- if (id = cnid_add(vol->v_db, &st, did, upath, len, id)) {
+ 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
- LOG(log_info, logtype_default, "ending afp_createid...:");
+ LOG(log_info, logtype_afpd, "ending afp_createid...:");
#endif /* DEBUG */
switch (errno) {
return AFPERR_ACCESS;
break;
default:
- LOG(log_error, logtype_default, "afp_createid: cnid_add: %s", strerror(errno));
+ LOG(log_error, logtype_afpd, "afp_createid: cnid_add: %s", strerror(errno));
return AFPERR_PARAM;
}
}
-/* resolve a file id */
+/* ------------------------------
+ resolve a file id */
int afp_resolveid(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- struct stat st;
struct vol *vol;
struct dir *dir;
char *upath;
+ struct path path;
int err, buflen;
cnid_t id;
u_int16_t vid, bitmap;
+ static char buffer[12 + MAXPATHLEN + 1];
+ int len = 12 + MAXPATHLEN + 1;
+
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_resolveid:");
+ LOG(log_info, logtype_afpd, "begin afp_resolveid:");
#endif /* DEBUG */
*rbuflen = 0;
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_NOID; /* was AFPERR_BADID, but help older Macs */
}
- if (( dir = dirsearch( vol, id )) == NULL ) {
- return( AFPERR_PARAM );
+ if (( dir = dirlookup( vol, id )) == NULL ) {
+ return AFPERR_NOID; /* idem AFPERR_PARAM */
}
-
- if ((movecwd(vol, dir) < 0) || (stat(upath, &st) < 0)) {
+ path.u_name = upath;
+ if (movecwd(vol, dir) < 0 || of_stat(&path) < 0) {
switch (errno) {
case EACCES:
case EPERM:
return AFPERR_PARAM;
}
}
-
/* directories are bad */
- if (S_ISDIR(st.st_mode))
+ if (S_ISDIR(path.st.st_mode))
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)
+ path.m_name = utompath(vol, upath);
+ if ((err = getfilparams(vol, bitmap, &path , curdir,
+ rbuf + sizeof(bitmap), &buflen)) != AFP_OK) {
return err;
-
+ }
*rbuflen = buflen + sizeof(bitmap);
memcpy(rbuf, ibuf, sizeof(bitmap));
#ifdef DEBUG
- LOG(log_info, logtype_default, "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;
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
- LOG(log_info, logtype_default, "begin afp_deleteid:");
+ LOG(log_info, logtype_afpd, "begin afp_deleteid:");
#endif /* DEBUG */
*rbuflen = 0;
memcpy(&id, ibuf, sizeof( id ));
ibuf += sizeof(id);
+ fileid = id;
- if ((upath = cnid_resolve(vol->v_db, &id)) == NULL) {
+ if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) {
return AFPERR_NOID;
}
- if (( dir = dirsearch( vol, id )) == NULL ) {
+ if (( dir = dirlookup( vol, id )) == NULL ) {
return( AFPERR_PARAM );
}
if (S_ISDIR(st.st_mode))
return AFPERR_BADTYPE;
- if (cnid_delete(vol->v_db, id)) {
+ if (cnid_delete(vol->v_db, fileid)) {
switch (errno) {
case EROFS:
return AFPERR_VLOCK;
}
#ifdef DEBUG
- LOG(log_info, logtype_default, "end afp_deleteid:");
+ LOG(log_info, logtype_afpd, "end afp_deleteid:");
#endif /* DEBUG */
return err;
struct stat srcst, destst;
struct vol *vol;
struct dir *dir, *sdir;
- char *spath, temp[17], *path, *p;
+ char *spath, temp[17], *p;
char *supath, *upath;
+ struct path *path;
int err;
+ struct adouble ads;
+ struct adouble add;
+ struct adouble *adsp;
+ struct adouble *addp;
+ struct ofork *s_of;
+ struct ofork *d_of;
+
#ifdef CNID_DB
int slen, dlen;
#endif /* CNID_DB */
u_int16_t vid;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin afp_exchangefiles:");
+ LOG(log_info, logtype_afpd, "begin afp_exchangefiles:");
#endif /* DEBUG */
*rbuflen = 0;
ibuf += sizeof(did);
/* source file */
- if ((dir = dirsearch( vol, sid )) == NULL ) {
+ if ((dir = dirlookup( vol, sid )) == NULL ) {
return( AFPERR_PARAM );
}
return( AFPERR_PARAM );
}
- if ( *path == '\0' ) {
- return( AFPERR_BADTYPE );
+ if ( *path->m_name == '\0' ) {
+ return( AFPERR_BADTYPE ); /* it's a dir */
}
- upath = mtoupath(vol, path);
- if (stat(upath, &srcst) < 0) {
- switch (errno) {
+ upath = path->u_name;
+ switch (path->st_errno) {
+ case 0:
+ break;
case ENOENT:
return AFPERR_NOID;
case EPERM:
return AFPERR_ACCESS;
default:
return AFPERR_PARAM;
- }
}
-
+ memset(&ads, 0, sizeof(ads));
+ adsp = &ads;
+ if ((s_of = of_findname(path))) {
+ /* reuse struct adouble so it won't break locks */
+ adsp = s_of->of_ad;
+ }
+ memcpy(&srcst, &path->st, sizeof(struct stat));
/* save some stuff */
sdir = curdir;
spath = obj->oldtmp;
supath = obj->newtmp;
- strcpy(spath, path);
+ strcpy(spath, path->m_name);
strcpy(supath, upath); /* this is for the cnid changing */
- p = ctoupath( vol, sdir, spath);
+ p = absupath( vol, sdir, upath);
/* look for the source cnid. if it doesn't exist, don't worry about
* it. */
slen = strlen(supath));
#endif /* CNID_DB */
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
return( AFPERR_PARAM );
}
- if ( *path == '\0' ) {
+ if ( *path->m_name == '\0' ) {
return( AFPERR_BADTYPE );
}
/* FPExchangeFiles is the only call that can return the SameObj
* error */
- if ((curdir == sdir) && strcmp(spath, path) == 0)
+ if ((curdir == sdir) && strcmp(spath, path->m_name) == 0)
return AFPERR_SAMEOBJ;
+ memcpy(&srcst, &path->st, sizeof(struct stat));
- upath = mtoupath(vol, path);
- if (stat(upath, &destst) < 0) {
- switch (errno) {
+ switch (errno) {
+ case 0:
+ break;
case ENOENT:
return AFPERR_NOID;
case EPERM:
return AFPERR_ACCESS;
default:
return AFPERR_PARAM;
- }
}
+ memset(&add, 0, sizeof(add));
+ addp = &add;
+ if ((d_of = of_findname( path))) {
+ /* reuse struct adouble so it won't break locks */
+ addp = d_of->of_ad;
+ }
+ memcpy(&destst, &path->st, sizeof(struct stat));
+ /* they are not on the same device and at least one is open
+ */
+ if ((d_of || s_of) && srcst.st_dev != destst.st_dev)
+ return AFPERR_MISC;
+
+ upath = path->u_name;
#ifdef CNID_DB
/* look for destination id. */
did = cnid_lookup(vol->v_db, &destst, curdir->d_did, upath,
return AFPERR_MISC;
/* now, quickly rename the file. we error if we can't. */
- if ((err = renamefile(p, temp, temp, vol_noadouble(vol))) < 0)
+ if ((err = renamefile(p, temp, temp, vol_noadouble(vol), adsp)) < 0)
goto err_exchangefile;
- of_rename(vol, sdir, spath, curdir, temp);
+ of_rename(vol, s_of, sdir, spath, curdir, temp);
/* rename destination to source */
- if ((err = renamefile(path, p, spath, vol_noadouble(vol))) < 0)
+ if ((err = renamefile(upath, p, spath, vol_noadouble(vol), addp)) < 0)
goto err_src_to_tmp;
- of_rename(vol, curdir, path, sdir, spath);
+ of_rename(vol, d_of, curdir, path->m_name, sdir, spath);
/* rename temp to destination */
- if ((err = renamefile(temp, upath, path, vol_noadouble(vol))) < 0)
+ if ((err = renamefile(temp, upath, path->m_name, vol_noadouble(vol), adsp)) < 0)
goto err_dest_to_src;
- of_rename(vol, curdir, temp, curdir, path);
+ of_rename(vol, s_of, curdir, temp, curdir, path->m_name);
#ifdef CNID_DB
/* id's need switching. src -> dest and dest -> src. */
#endif /* CNID_DB */
#ifdef DEBUG
- LOG(log_info, logtype_default, "ending afp_exchangefiles:");
+ LOG(log_info, logtype_afpd, "ending afp_exchangefiles:");
#endif /* DEBUG */
return AFP_OK;
/* all this stuff is so that we can unwind a failed operation
* properly. */
+#ifdef CNID_DB
err_temp_to_dest:
+#endif
/* rename dest to temp */
- renamefile(upath, temp, temp, vol_noadouble(vol));
- of_rename(vol, curdir, upath, curdir, temp);
+ renamefile(upath, temp, temp, vol_noadouble(vol), adsp);
+ of_rename(vol, s_of, curdir, upath, curdir, temp);
err_dest_to_src:
/* rename source back to dest */
- renamefile(p, upath, path, vol_noadouble(vol));
- of_rename(vol, sdir, spath, curdir, path);
+ renamefile(p, upath, path->m_name, vol_noadouble(vol), addp);
+ of_rename(vol, d_of, sdir, spath, curdir, path->m_name);
err_src_to_tmp:
/* rename temp back to source */
- renamefile(temp, p, spath, vol_noadouble(vol));
- of_rename(vol, curdir, temp, sdir, spath);
+ renamefile(temp, p, spath, vol_noadouble(vol), adsp);
+ of_rename(vol, s_of, curdir, temp, sdir, spath);
err_exchangefile:
return err;
projects / netatalk.git / blobdiff