X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=7166c125d36c8af3cae56270fec3924a8e31037e;hp=5f6e0f643e5987f101a2068123772eb8a50a21f8;hb=1f995330836cf20b5db3e5b6076735a2a0f4e81e;hpb=50e61079bd476cb7619ab37d8576cc1f61d4bd16 diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 5f6e0f64..7166c125 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -40,6 +40,7 @@ char *strchr (), *strrchr (); #include #include #include +#include #include #include "directory.h" @@ -48,7 +49,6 @@ char *strchr (), *strrchr (); #include "volume.h" #include "fork.h" #include "file.h" -#include "globals.h" #include "filedir.h" #include "unix.h" @@ -628,14 +628,14 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size fce_register_delete_file( s_path ); struct dir *cachedfile; - if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath), s_path->st.st_ctime))) { + if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath)))) { dircache_remove(vol, cachedfile, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX); dir_free(cachedfile); } } } if ( rc == AFP_OK ) { - curdir->offcnt--; + curdir->d_offcnt--; setvoltime(obj, vol ); } @@ -776,8 +776,8 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U rc = AFPERR_PARAM; goto exit; } - curdir->offcnt++; - sdir->offcnt--; + curdir->d_offcnt++; + sdir->d_offcnt--; #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { /* FIXME did is not always the source id */