X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=f5ce7fbca6dc341ec637786624336ca7a1ab3e19;hb=06beeeeef1a9a833a03a0aa01848a78a35c90330;hp=ddc2fad64712a327a94ba7c77dc04a6162787d53;hpb=815d557e167e76015934397dffbfa869180dcdbc;p=netatalk.git diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index ddc2fad6..f5ce7fbc 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.56 2009-10-13 22:55:37 didg Exp $ + * $Id: filedir.c,v 1.62 2009-10-29 12:58:11 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -29,7 +29,6 @@ char *strchr (), *strrchr (); #ifdef HAVE_STRINGS_H #include #endif -#include #include #include @@ -39,6 +38,7 @@ char *strchr (), *strrchr (); #include #include #include +#include #include "directory.h" #include "desktop.h" @@ -130,20 +130,17 @@ more information */ } #endif -int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen) +int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct stat *st; struct vol *vol; struct dir *dir; u_int32_t did; - int buflen, ret; + int ret; + size_t buflen; u_int16_t fbitmap, dbitmap, vid; struct path *s_path; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_getfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -218,14 +215,10 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf rbuf += sizeof( dbitmap ) + sizeof( u_char ); *rbuf = 0; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_getfildirparams:"); -#endif /* DEBUG */ - return( AFP_OK ); } -int afp_setfildirparams(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rbuflen) +int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct stat *st; struct vol *vol; @@ -234,10 +227,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_ u_int16_t vid, bitmap; int did, rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_setfildirparams:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof(vid)); @@ -292,10 +281,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_ setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_setfildirparams:"); -#endif /* DEBUG */ - return( rc ); } @@ -311,7 +296,7 @@ int check_name(const struct vol *vol, char *name) if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/')) return AFPERR_PARAM; - if (!vol->vfs->validupath(vol, name)) { + if (!vol->vfs->vfs_validupath(vol, name)) { LOG(log_info, logtype_afpd, "check_name: illegal name: '%s'", name); return AFPERR_EXIST; } @@ -434,7 +419,7 @@ static int moveandrename(const struct vol *vol, struct dir *sdir, char *oldname, } /* -------------------------------------------- */ -int afp_rename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rbuflen) +int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *sdir; @@ -445,9 +430,6 @@ int afp_rename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rb u_int16_t vid; int isdir = 0; int rc; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_rename:"); -#endif /* DEBUG */ *rbuflen = 0; ibuf += 2; @@ -509,15 +491,11 @@ int afp_rename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rb setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_rename:"); -#endif /* DEBUG */ - return( rc ); } /* ------------------------------- */ -int afp_delete(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rbuflen) +int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *dir; @@ -526,10 +504,6 @@ int afp_delete(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rb int did, rc; u_int16_t vid; -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_delete:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -563,17 +537,22 @@ int afp_delete(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rb } else if (of_findname(s_path)) { rc = AFPERR_BUSY; } else { - rc = deletefile(vol, upath, 1); + /* it's a file st_valid should always be true + * only test for ENOENT because EACCES needs + * to read meta data in deletefile + */ + if (s_path->st_valid && s_path->st_errno == ENOENT) { + rc = AFPERR_NOOBJ; + } + else { + rc = deletefile(vol, upath, 1); + } } if ( rc == AFP_OK ) { curdir->offcnt--; setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_delete:"); -#endif /* DEBUG */ - return( rc ); } /* ------------------------ */ @@ -625,7 +604,7 @@ char *ctoupath(const struct vol *vol, struct dir *dir, char *name) } /* ------------------------- */ -int afp_moveandrename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int *rbuflen) +int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { struct vol *vol; struct dir *sdir, *ddir; @@ -641,10 +620,6 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int retvalue; #endif /* DROPKLUDGE */ -#ifdef DEBUG - LOG(log_info, logtype_afpd, "begin afp_moveandrename:"); -#endif /* DEBUG */ - *rbuflen = 0; ibuf += 2; @@ -731,15 +706,11 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf _U_, int admode = ad_mode("", 0777) | vol->v_fperm; setfilmode(upath, admode, NULL, vol->v_umask); - vol->vfs->rf_setfilmode(vol, upath, admode, NULL); + vol->vfs->vfs_setfilmode(vol, upath, admode, NULL); } setvoltime(obj, vol ); } -#ifdef DEBUG - LOG(log_info, logtype_afpd, "end afp_moveandrename:"); -#endif /* DEBUG */ - return( rc ); }