/*
- * $Id: file.c,v 1.54 2002-09-04 17:28:08 didg 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 */
-
/* the format for the finderinfo fields (from IM: Toolbox Essentials):
* field bytes subfield bytes
*
0, 0, 0, 0, 0, 0, 0, 0
};
+/* 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,
#ifndef USE_LASTDID
struct stat lst, *lstp;
#endif /* USE_LASTDID */
- struct stat hst;
- struct extmap *em;
- char *data, *nameoff = NULL, *upath;
+ 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];
- struct maccess ma;
+ u_int32_t utf8 = 0;
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin getmetadata:");
#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);
break;
case FILPBIT_FINFO :
- if (adp)
- 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 ((!adp || !memcmp(ad_entry(adp, ADEID_FINDERI),ufinderi , 8 ))
- && (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 = 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 ( adp ) {
- aint = htonl( ad_getentrylen( adp, ADEID_RFORK ));
+ 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 ( adp ) {
- 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 :
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 ( 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,
- char *path, struct dir *dir, struct stat *st,
+ 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, "begin getfilparams:");
#endif /* DEBUG */
- upath = mtoupath(vol, path);
- if ((of = of_findname(vol, dir, upath, st))) {
- 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;
- }
+ 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 {
-#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)) {
- }
+ 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)) {
+ }
+ }
}
-#endif
}
- rc = getmetadata(vol, bitmap, path, dir, st, buf, buflen, adp, attrbits);
+ rc = getmetadata(vol, bitmap, path->m_name, dir, &path->st, buf, buflen, adp, attrbits);
if ( adp ) {
ad_close( adp, ADFLAGS_HF );
}
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;
int ret;
+ struct path *s_path;
+
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin afp_createfile:");
#endif /* DEBUG */
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;
}
- upath = mtoupath(vol, path);
+ if ( *s_path->m_name == '\0' ) {
+ return( AFPERR_BADTYPE );
+ }
+
+ upath = s_path->u_name;
if (0 != (ret = check_name(vol, upath)))
return ret;
-
- ret = stat(upath, &st);
+
/* if upath is deleted we already in trouble anyway */
- if (!ret && (of = of_findname(vol, curdir, upath, &st))) {
+ 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 (!ret && of)
+ if (of)
return AFPERR_BUSY;
openf = O_RDWR|O_CREAT|O_TRUNC;
} else {
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 :
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) {
{
struct vol *vol;
struct dir *dir;
- char *path;
+ struct path *s_path;
int did, rc;
u_int16_t vid, bitmap;
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 ( *path == '\0' ) {
+ if ( *s_path->m_name == '\0' ) {
return( AFPERR_BADTYPE ); /* it's a directory */
}
ibuf++;
}
- if (( rc = setfilparams(vol, path, bitmap, ibuf )) == AFP_OK ) {
+ if (( rc = setfilparams(vol, s_path, bitmap, ibuf )) == AFP_OK ) {
setvoltime(obj, vol );
}
* 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;
LOG(log_info, logtype_afpd, "begin setfilparams:");
#endif /* DEBUG */
- upath = mtoupath(vol, path);
- if ((of = of_findname(vol, curdir, upath, NULL))) {
+ upath = path->u_name;
+ if ((of = of_findname(path))) {
adp = of->of_ad;
} else {
memset(&ad, 0, sizeof(ad));
}
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 ));
}
if (!memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 )
&& (
- ((em = getextmap( path )) &&
+ ((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()) &&
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;
if (change_parent_mdate && gettimeofday(&tv, NULL) == 0) {
newdate = AD_DATE_FROM_UNIX(tv.tv_sec);
bitmap = 1<<FILPBIT_MDATE;
- setdirparams(vol, "", bitmap, (char *)&newdate);
+ setdirparams(vol, &Cur_Path, bitmap, (char *)&newdate);
}
#ifdef DEBUG
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 );
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 ) {
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, *upath;
+ 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
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 );
}
* and locks need to stay coherent. as a result,
* we just balk if the file is opened already. */
- upath = mtoupath(vol, newname );
- if (of_findname(vol, curdir, upath, NULL))
- return AFPERR_DENYCONF;
-
newname = obj->newtmp;
- strcpy( newname, path );
+ strcpy( newname, s_path->m_name );
+
+ if (of_findname(s_path))
+ return AFPERR_DENYCONF;
p = ctoupath( vol, curdir, newname );
#ifdef FORCE_UIDGID
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' ) {
+ 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 (strlen(newname) != plen) {
- /* there's \0 in newname, e.g. it's a pathname not
- * only a filename.
- */
- return( AFPERR_PARAM );
- }
- }
- if ( (err = copyfile(p, upath, 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_afpd, "end afp_copyfile:");
#endif /* DEBUG */
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;
+ char dpath[ MAXPATHLEN + 1];
int admode;
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin copyfile:");
#endif /* DEBUG */
- dpath = ad_path( dst, ADFLAGS_HF );
+ 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 ) {
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_afpd, "begin afp_createid:");
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) != CNID_INVALID) {
+ 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;
}
}
-/* 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;
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));
return AFP_OK;
}
+/* ------------------------------ */
int afp_deleteid(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
char *ibuf, *rbuf;
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;
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' ) {
+ 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(vol, curdir, upath, &srcst))) {
+ 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(vol, curdir, upath, &destst))) {
+ 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,
/* rename destination to source */
if ((err = renamefile(upath, p, spath, vol_noadouble(vol), addp)) < 0)
goto err_src_to_tmp;
- of_rename(vol, d_of, 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), adsp)) < 0)
+ if ((err = renamefile(temp, upath, path->m_name, vol_noadouble(vol), adsp)) < 0)
goto err_dest_to_src;
- of_rename(vol, s_of, 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. */
err_dest_to_src:
/* rename source back to dest */
- renamefile(p, upath, path, vol_noadouble(vol), addp);
- of_rename(vol, d_of, 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 */
projects / netatalk.git / blobdiff