/*
- * $Id: filedir.c,v 1.27 2002-05-13 04:59:36 jmarcus Exp $
+ * $Id: filedir.c,v 1.35 2002-10-25 11:10:48 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "file.h"
#include "globals.h"
#include "filedir.h"
+#include "unix.h"
int matchfile2dirperms(upath, vol, did)
/* Since it's kinda' big; I decided against an
{
struct stat st, sb;
struct dir *dir;
- char adpath[50];
- int uid;
-
+ char *adpath;
+ uid_t uid;
+ int ret = AFP_OK;
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin matchfile2dirperms:");
#endif /* DEBUG */
- if (stat(upath, &st ) < 0)
+ if (stat(upath, &st ) < 0) {
LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno));
- strcpy (adpath, "./.AppleDouble/");
- strcat (adpath, upath);
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ return AFPERR_NOOBJ ;
+ }
+
+ adpath = ad_path( upath, ADFLAGS_HF );
+ /* FIXME dirsearch doesn't move cwd to did ! */
+ if (( dir = dirlookup( vol, did )) == NULL ) {
LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info.");
- return( AFPERR_NOOBJ );
+ ret = AFPERR_NOOBJ;
}
else if (stat(".", &sb) < 0) {
LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error checking directory \"%s\": %s",
- dir->d_name, strerror(errno));
- return(AFPERR_NOOBJ );
+ dir->d_m_name, strerror(errno));
+ ret = AFPERR_NOOBJ;
}
else {
uid=geteuid();
LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error changing owner/gid of %s: %s",
upath, strerror(errno));
- return (AFPERR_ACCESS);
+ ret = AFPERR_ACCESS;
}
- if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+ else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
{
LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error adding file read permissions: %s",
strerror(errno));
- return (AFPERR_ACCESS);
+ ret = AFPERR_ACCESS;
}
-#ifdef DEBUG
- else
- LOG(log_info, logtype_afpd,
- "matchfile2dirperms: Added S_IRGRP and S_IROTH: %s",
- strerror(errno));
-#endif /* DEBUG */
- if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
+ else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0)
{
LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s",
adpath, strerror(errno));
- return (AFPERR_ACCESS);
+ ret = AFPERR_ACCESS;
}
- if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+ else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
{
LOG(log_error, logtype_afpd,
"matchfile2dirperms: Error adding AD file read permissions: %s",
strerror(errno));
- return (AFPERR_ACCESS);
+ ret = AFPERR_ACCESS;
}
-#ifdef DEBUG
- else
- LOG(log_info, logtype_afpd,
- "matchfile2dirperms: Added S_IRGRP and S_IROTH to AD: %s",
- strerror(errno));
-#endif /* DEBUG */
+ seteuid(uid);
}
-#ifdef DEBUG
- else
- LOG(log_info, logtype_afpd,
- "matchfile2dirperms: No ownership change necessary.");
-#endif /* DEBUG */
} /* end else if stat success */
- seteuid(uid); /* Restore process ownership to normal */
+
#ifdef DEBUG
LOG(log_info, logtype_afpd, "end matchfile2dirperms:");
#endif /* DEBUG */
-
- return (AFP_OK);
-
+ return ret;
}
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- struct stat st;
+ struct stat *st;
struct vol *vol;
struct dir *dir;
u_int32_t did;
int buflen, ret;
- char *path;
u_int16_t fbitmap, dbitmap, vid;
+ struct path *s_path;
#ifdef DEBUG
LOG(log_info, logtype_afpd, "begin afp_getfildirparams:");
dbitmap = ntohs( dbitmap );
ibuf += sizeof( dbitmap );
- if (( path = cname( vol, dir, &ibuf )) == NULL) {
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL) {
return( AFPERR_NOOBJ );
}
- if ( stat( mtoupath(vol, path ), &st ) < 0 ) {
+ st = &s_path->st;
+ if (!s_path->st_valid) {
+ /* it's a dir and it should be there
+ * because we chdir in it in cname
+ */
+ of_stat(s_path);
+ }
+ if ( s_path->st_errno != 0 ) {
return( AFPERR_NOOBJ );
}
buflen = 0;
- if (S_ISDIR(st.st_mode)) {
+ if (S_ISDIR(st->st_mode)) {
if (dbitmap) {
- ret = getdirparams(vol, dbitmap, ".", curdir,
- &st, rbuf + 3 * sizeof( u_int16_t ), &buflen );
+ ret = getdirparams(vol, dbitmap, s_path, curdir,
+ rbuf + 3 * sizeof( u_int16_t ), &buflen );
if (ret != AFP_OK )
return( ret );
}
/* this is a directory */
*(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR;
} else {
- if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st,
+ if (fbitmap && ( ret = getfilparams(vol, fbitmap, s_path, curdir,
rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) {
return( ret );
}
char *ibuf, *rbuf;
int ibuflen, *rbuflen;
{
- struct stat st;
+ struct stat *st;
struct vol *vol;
struct dir *dir;
- char *path;
+ struct path *path;
u_int16_t vid, bitmap;
int did, rc;
memcpy( &did, ibuf, sizeof( did));
ibuf += sizeof( did);
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
return( AFPERR_NOOBJ );
}
- if ( stat( mtoupath(vol, path ), &st ) < 0 ) {
- return( AFPERR_NOOBJ );
+ st = &path->st;
+ if (!path->st_valid) {
+ /* it's a dir and it should be there
+ * because we chdir in it in cname
+ */
+ of_stat(path);
}
+ if ( path->st_errno != 0 ) {
+ return( AFPERR_NOOBJ );
+ }
/*
* If ibuf is odd, make it even.
*/
ibuf++;
}
- if (S_ISDIR(st.st_mode)) {
+ if (S_ISDIR(st->st_mode)) {
rc = setdirparams(vol, path, bitmap, ibuf );
} else {
rc = setfilparams(vol, path, bitmap, ibuf );
char *p;
char *upath;
int rc;
- struct stat st;
+ struct stat *st;
int adflags;
struct adouble ad;
struct adouble *adp;
- struct ofork *opened;
-
+ struct ofork *opened = NULL;
+ struct path path;
#ifdef CNID_DB
cnid_t id;
#endif /* CNID_DB */
id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p));
#endif /* CNID_DB */
p = ctoupath( vol, sdir, oldname );
- if ((opened = of_findname(vol, sdir, oldname))) {
+ path.st_valid = 0;
+ path.u_name = p;
+ if ((opened = of_findname(&path))) {
/* reuse struct adouble so it won't break locks */
adp = opened->of_ad;
}
}
upath = mtoupath(vol, newname);
+ path.u_name = upath;
+ st = &path.st;
if (0 != (rc = check_name(vol, upath))) {
return rc;
}
return AFP_OK;
/* deal with case insensitive, case-preserving filesystems. */
- if ((stat(upath, &st) == 0) && strdiacasecmp(oldname, newname))
+ if ((stat(upath, st) == 0) && strdiacasecmp(oldname, newname))
return AFPERR_EXIST;
- } else if (stat(upath, &st ) == 0)
+ } else if (stat(upath, st ) == 0)
return AFPERR_EXIST;
if ( !isdir ) {
- if (of_findname(vol, curdir, newname)) {
+ path.st_valid = 1;
+ path.st_errno = errno;
+ if (of_findname(&path)) {
rc = AFPERR_EXIST; /* was AFPERR_BUSY; */
- } else if ((rc = renamefile( p, upath, newname,
- vol_noadouble(vol), adp )) == AFP_OK) {
- /* if it's still open, rename the ofork as well. */
- rc = of_rename(vol, sdir, oldname, curdir, newname);
+ } else {
+ rc = renamefile( p, upath, newname,vol_noadouble(vol), adp );
+ if (rc == AFP_OK)
+ of_rename(vol, opened, sdir, oldname, curdir, newname);
}
} else {
rc = renamedir(p, upath, sdir, curdir, newname, vol_noadouble(vol));
if ( rc == AFP_OK ) {
#ifdef CNID_DB
/* renaming may have moved the file/dir across a filesystem */
- if (stat(upath, &st) < 0)
+ if (stat(upath, st) < 0)
return AFPERR_MISC;
/* fix up the catalog entry */
- cnid_update(vol->v_db, id, &st, curdir->d_did, upath, strlen(upath));
+ cnid_update(vol->v_db, id, st, curdir->d_did, upath, strlen(upath));
#endif /* CNID_DB */
}
{
struct vol *vol;
struct dir *sdir;
- char *path, *oldname, *newname;
+ char *oldname, *newname;
+ struct path *path;
u_int32_t did;
- int plen;
+ int plen;
u_int16_t vid;
int isdir = 0;
int rc;
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( did );
- if (( sdir = dirsearch( vol, did )) == NULL ) {
+ if (( sdir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
sdir = curdir;
newname = obj->newtmp;
oldname = obj->oldtmp;
- if ( *path != '\0' ) {
- strcpy(oldname, path); /* an extra copy for of_rename */
+ if ( *path->m_name != '\0' ) {
+ strcpy(oldname, path->m_name); /* an extra copy for of_rename */
}
else {
if ( sdir->d_parent == NULL ) { /* root directory */
return( AFPERR_NOOBJ );
}
isdir = 1;
- strcpy(oldname, sdir->d_name);
+ strcpy(oldname, sdir->d_m_name);
}
/* another place where we know about the path type */
- if ( *ibuf++ != 2 ) {
+ if ((plen = copy_path_name(newname, ibuf)) < 0) {
return( AFPERR_PARAM );
}
- if (( plen = (unsigned char)*ibuf++ ) != 0 ) {
- strncpy( newname, ibuf, plen );
- newname[ plen ] = '\0';
- }
- else {
+ if (!plen) {
return AFP_OK; /* newname == oldname same dir */
}
{
struct vol *vol;
struct dir *dir;
- char *path, *upath;
+ struct path *s_path;
+ char *upath;
int did, rc;
u_int16_t vid;
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( int );
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_NOOBJ );
}
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
+ if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
return( AFPERR_NOOBJ );
}
- if ( *path == '\0' ) {
+ upath = s_path->u_name;
+ if ( *s_path->m_name == '\0' ) {
rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ);
- } else if (of_findname(vol, curdir, path)) {
+ } else if (of_findname(s_path)) {
rc = AFPERR_BUSY;
- } else if ((rc = deletefile( upath = mtoupath(vol, path ), 1)) == AFP_OK) {
+ } else if ((rc = deletefile( upath, 1)) == AFP_OK) {
#ifdef CNID_DB /* get rid of entry */
cnid_t id = cnid_get(vol->v_db, curdir->d_did, upath, strlen(upath));
cnid_delete(vol->v_db, id);
#endif /* CNID_DB */
}
if ( rc == AFP_OK ) {
+ curdir->offcnt--;
setvoltime(obj, vol );
}
return( rc );
}
-
-char *ctoupath( vol, dir, name )
+char *absupath( vol, dir, u )
const struct vol *vol;
struct dir *dir;
-char *name;
+char *u;
{
struct dir *d;
static char path[ MAXPATHLEN + 1];
- char *p, *u;
+ char *p;
int len;
p = path + sizeof( path ) - 1;
*p = '\0';
- u = mtoupath(vol, name );
len = strlen( u );
p -= len;
strncpy( p, u, len );
for ( d = dir; d->d_parent; d = d->d_parent ) {
*--p = '/';
- u = mtoupath(vol, d->d_name );
+ u = d->d_u_name;
len = strlen( u );
p -= len;
strncpy( p, u, len );
return( p );
}
+char *ctoupath( vol, dir, name )
+const struct vol *vol;
+struct dir *dir;
+char *name;
+{
+ return absupath(vol, dir, mtoupath(vol, name));
+}
+
/* ------------------------- */
int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
struct vol *vol;
struct dir *sdir, *ddir;
int isdir = 0;
- char *oldname, *newname;
- char *path;
+ char *oldname, *newname;
+ struct path *path;
int did;
- int plen;
+ int plen;
u_int16_t vid;
int rc;
#ifdef DROPKLUDGE
/* source did followed by dest did */
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( int );
- if (( sdir = dirsearch( vol, did )) == NULL ) {
+ if (( sdir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
sdir = curdir;
newname = obj->newtmp;
oldname = obj->oldtmp;
- if ( *path != '\0' ) {
+ if ( *path->m_name != '\0' ) {
/* not a directory */
- strcpy(oldname, path); /* an extra copy for of_rename */
+ strcpy(oldname, path->m_name); /* an extra copy for of_rename */
} else {
isdir = 1;
- strcpy(oldname, sdir->d_name);
+ strcpy(oldname, sdir->d_m_name);
}
/* get the destination directory */
- if (( ddir = dirsearch( vol, did )) == NULL ) {
+ if (( ddir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
if (( path = cname( vol, ddir, &ibuf )) == NULL ) {
return( AFPERR_NOOBJ );
}
- if ( *path != '\0' ) {
+ if ( *path->m_name != '\0' ) {
return( AFPERR_BADTYPE );
}
/* one more place where we know about path type */
- if ( *ibuf++ != 2 ) {
+ if ((plen = copy_path_name(newname, ibuf)) < 0) {
return( AFPERR_PARAM );
}
- if (( plen = (unsigned char)*ibuf++ ) != 0 ) {
- strncpy( newname, ibuf, plen );
- newname[ plen ] = '\0';
- }
- else {
+ if (!plen) {
strcpy(newname, oldname);
}
-
+
rc = moveandrename(vol, sdir, oldname, newname, isdir);
if ( rc == AFP_OK ) {
+ curdir->offcnt++;
+ sdir->offcnt--;
+
+ char *upath = mtoupath(vol, newname);
#ifdef DROPKLUDGE
if (vol->v_flags & AFPVOL_DROPBOX) {
- if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK) {
+ if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) {
return retvalue;
}
}
+ else
#endif /* DROPKLUDGE */
+ if (!isdir) {
+ int admode = ad_mode("", 0777);
+
+ setfilmode(upath, admode, NULL);
+ setfilmode(ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL);
+ }
setvoltime(obj, vol );
}
projects / netatalk.git / blobdiff