/*
- * $Id: file.c,v 1.49 2002-08-21 07:52:04 didg Exp $
+ * $Id: file.c,v 1.62 2002-10-05 14:04:47 didg 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
*
u_int32_t aint;
u_int16_t ashort;
u_char achar, fdType[4];
+ struct maccess ma;
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin getmetadata:");
ashort = htons(ATTRBIT_INVISIBLE);
} else
ashort = 0;
+#if 0
+ /* FIXME do we want a visual clue if the file is read only
+ */
+ 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 ));
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);
+ aint = AD_DATE_FROM_UNIX(st->st_mtime);
}
} else {
aint = AD_DATE_FROM_UNIX(st->st_mtime);
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 */
}
u_int16_t attrbits = 0;
int rc;
#ifdef DEBUG
- LOG(log_info, logtype_default, "begin getfilparams:");
+ LOG(log_info, logtype_afpd, "begin getfilparams:");
#endif /* DEBUG */
upath = mtoupath(vol, path);
- if ((of = of_findname(vol, dir, path))) {
+ if ((of = of_findname(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);
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;
#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 ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
}
upath = mtoupath(vol, path);
- {
- int ret;
- if (0 != (ret = check_name(vol, upath)))
- return ret;
- }
+ if (0 != (ret = check_name(vol, upath)))
+ return ret;
- if ((of = of_findname(vol, curdir, path))) {
+ ret = stat(upath, &st);
+ /* if upath is deleted we already in trouble anyway */
+ if (!ret && (of = of_findname(upath, &st))) {
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 (!ret && 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 failed
+ /* on a soft create, if the file is open then ad_open won't fail
because open syscall is not called
*/
if (of) {
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 */
goto createfile_done;
/* fallthrough */
default :
-#ifdef FORCE_UIDGID
- /* bring everything back to old euid, egid */
- restore_uidgid ( uidgid );
-#endif /* FORCE_UIDGID */
return( AFPERR_PARAM );
}
}
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);
}
memcpy(&did, ibuf, sizeof( did ));
ibuf += sizeof( did );
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
return( rc );
}
+/*
+ * cf AFP3.0.pdf page 252 for change_mdate and change_parent_mdate logic
+ *
+*/
int setfilparams(struct vol *vol,
char *path, u_int16_t bitmap, char *buf )
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_afpd, "begin setfilparams:");
#endif /* DEBUG */
upath = mtoupath(vol, path);
- if ((of = of_findname(vol, curdir, path))) {
+ if ((of = of_findname(upath, NULL))) {
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;
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 :
+ change_mdate = 1;
+
if (!memcmp( ad_entry( adp, ADEID_FINDERI ), ufinderi, 8 )
&& (
((em = getextmap( path )) &&
}
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, "", bitmap, (char *)&newdate);
}
#ifdef DEBUG
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.
- * FIXME: locks on ressource fork will always break thanks to ad_close, done ?
+ * will break. Anyway it's an error because then we have 2 files.
*
- * src the full source absolute path
+ * 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
{
struct vol *vol;
struct dir *dir;
- char *newname, *path, *p;
+ char *newname, *path, *p, *upath;
u_int32_t sdid, ddid;
int plen, err, retvalue = AFP_OK;
u_int16_t svid, dvid;
memcpy(&sdid, ibuf, sizeof( sdid ));
ibuf += sizeof( sdid );
- if (( dir = dirsearch( vol, sdid )) == NULL ) {
+ if (( dir = dirlookup( vol, sdid )) == NULL ) {
return( AFPERR_PARAM );
}
* 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 );
- p = ctoupath( vol, curdir, newname );
+ upath = mtoupath(vol, newname );
+ if (of_findname(upath, NULL))
+ 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 ) {
+ if (( dir = dirlookup( vol, ddid )) == NULL ) {
return( AFPERR_PARAM );
}
return( AFPERR_NOOBJ );
}
if ( *path != '\0' ) {
- return( AFPERR_BADTYPE );
+ return( AFPERR_BADTYPE ); /* not a directory. AFPERR_PARAM? */
}
/* one of the handful of places that knows about the path type */
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, 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 );
-
#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 */
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_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;
}
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;
memcpy(&did, ibuf, sizeof( did ));
ibuf += sizeof(did);
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
ibuf += sizeof(id);
if ((upath = cnid_resolve(vol->v_db, &id, buffer, len)) == NULL) {
- return AFPERR_BADID;
+ return AFPERR_NOID; /* was AFPERR_BADID, but help older Macs */
}
if (( dir = dirlookup( vol, id )) == NULL ) {
- return( AFPERR_PARAM );
+ return AFPERR_NOID; /* idem AFPERR_PARAM */
}
if ((movecwd(vol, dir) < 0) || (stat(upath, &st) < 0)) {
struct adouble add;
struct adouble *adsp;
struct adouble *addp;
- struct ofork *opened;
+ struct ofork *s_of;
+ struct ofork *d_of;
#ifdef CNID_DB
int slen, dlen;
ibuf += sizeof(did);
/* source file */
- if ((dir = dirsearch( vol, sid )) == NULL ) {
+ if ((dir = dirlookup( vol, sid )) == NULL ) {
return( AFPERR_PARAM );
}
}
memset(&ads, 0, sizeof(ads));
adsp = &ads;
- if ((opened = of_findname(vol, curdir, path))) {
+ if ((s_of = of_findname(upath, &srcst))) {
/* reuse struct adouble so it won't break locks */
- adsp = opened->of_ad;
+ adsp = s_of->of_ad;
}
/* save some stuff */
sdir = curdir;
slen = strlen(supath));
#endif /* CNID_DB */
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
}
memset(&add, 0, sizeof(add));
addp = &add;
- if ((opened = of_findname(vol, curdir, path))) {
+ if ((d_of = of_findname( upath, &destst))) {
/* reuse struct adouble so it won't break locks */
- addp = opened->of_ad;
+ addp = d_of->of_ad;
}
+
+ /* 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;
+
#ifdef CNID_DB
/* look for destination id. */
did = cnid_lookup(vol->v_db, &destst, curdir->d_did, upath,
/* now, quickly rename the file. we error if we can't. */
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), addp)) < 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, sdir, spath);
/* rename temp to destination */
if ((err = renamefile(temp, upath, path, 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);
#ifdef CNID_DB
/* id's need switching. src -> dest and dest -> src. */
#endif
/* rename dest to temp */
renamefile(upath, temp, temp, vol_noadouble(vol), adsp);
- of_rename(vol, curdir, upath, curdir, temp);
+ 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), addp);
- of_rename(vol, sdir, spath, curdir, path);
+ of_rename(vol, d_of, sdir, spath, curdir, path);
err_src_to_tmp:
/* rename temp back to source */
renamefile(temp, p, spath, vol_noadouble(vol), adsp);
- of_rename(vol, curdir, temp, sdir, spath);
+ of_rename(vol, s_of, curdir, temp, sdir, spath);
err_exchangefile:
return err;
projects / netatalk.git / blobdiff