#include <atalk/adouble.h>
#include <atalk/vfs.h>
#include <atalk/cnid.h>
+#include <atalk/util.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
+#include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
#include "desktop.h"
#include "directory.h"
#include "dircache.h"
#include "volume.h"
-#include "globals.h"
#include "file.h"
#include "fork.h"
#include "filedir.h"
*/
struct savedir {
u_short sd_vid;
- u_int32_t sd_did;
+ uint32_t sd_did;
int sd_buflen;
char *sd_buf;
char *sd_last;
macnamelength(1) + macname(31) + utf8(4) + utf8namelen(2) + utf8name(255) +
oddpadding(1) */
-#define REPLY_PARAM_MAXLEN (4 + 104 + 1 + MACFILELEN + 4 + 2 + 255 + 1)
+#define REPLY_PARAM_MAXLEN (4 + 104 + 1 + MACFILELEN + 4 + 2 + UTF8FILELEN_EARLY + 1)
/* ----------------------------- */
static int enumerate(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_,
int did, ret, len, first = 1;
size_t esz;
char *data, *start;
- u_int16_t vid, fbitmap, dbitmap, reqcnt, actcnt = 0;
- u_int16_t temp16;
- u_int32_t sindex, maxsz, sz = 0;
+ uint16_t vid, fbitmap, dbitmap, reqcnt, actcnt = 0;
+ uint16_t temp16;
+ uint32_t sindex, maxsz, sz = 0;
struct path *o_path;
struct path s_path;
int header;
return path_error(o_path, AFPERR_NODIR );
}
- LOG(log_debug, logtype_afpd, "enumerate(vid:%u, did:%u, cwddid:%u, cwd:'%s', name:'%s', f/d:%04x/%04x, rc:%u, i:%u, max:%u)",
- ntohs(vid), ntohl(did), ntohl(curdir->d_did),
- cfrombstring(curdir->d_fullpath), o_path->u_name,
- fbitmap, dbitmap, reqcnt, sindex, maxsz);
+ LOG(log_debug, logtype_afpd, "enumerate(\"%s/%s\", f/d:%04x/%04x, rc:%u, i:%u, max:%u)",
+ getcwdpath(), o_path->u_name, fbitmap, dbitmap, reqcnt, sindex, maxsz);
- data = rbuf + 3 * sizeof( u_int16_t );
- sz = 3 * sizeof( u_int16_t ); /* fbitmap, dbitmap, reqcount */
+ data = rbuf + 3 * sizeof( uint16_t );
+ sz = 3 * sizeof( uint16_t ); /* fbitmap, dbitmap, reqcount */
/*
* Read the directory into a pre-malloced buffer, stored
if ( sindex == 1 || curdir->d_did != sd.sd_did || vid != sd.sd_vid ) {
sd.sd_last = sd.sd_buf;
/* if dir was in the cache we don't have the inode */
- if (( !o_path->st_valid && lstat( ".", &o_path->st ) < 0 ) ||
- (ret = for_each_dirent(vol, ".", enumerate_loop, (void *)&sd)) < 0)
+ if (( !o_path->st_valid && ostat(".", &o_path->st, vol_syml_opt(vol)) < 0 ) ||
+ (ret = for_each_dirent(vol, ".", enumerate_loop, (void *)&sd)) < 0)
{
+ LOG(log_error, logtype_afpd, "enumerate: loop error: %s (%d)", strerror(errno), errno);
switch (errno) {
case EACCES:
- return AFPERR_ACCESS;
+ return AFPERR_ACCESS;
case ENOTDIR:
return AFPERR_BADTYPE;
case ENOMEM:
continue;
}
memset(&s_path, 0, sizeof(s_path));
+
+ /* conversions on the fly */
+ const char *convname;
s_path.u_name = sd.sd_last;
- if (of_stat( &s_path) < 0 ) {
- /*
- * Somebody else plays with the dir, well it can be us with
- * "Empty Trash..."
- */
+ if (ad_convert(sd.sd_last, &s_path.st, vol, &convname) == 0 && convname) {
+ s_path.u_name = (char *)convname;
+ }
+ if (of_stat(vol, &s_path) < 0 ) {
/* so the next time it won't try to stat it again
* another solution would be to invalidate the cache with
* sd.sd_did = 0 but if it's not ENOENT error it will start again
*/
*sd.sd_last = 0;
sd.sd_last += len + 1;
- curdir->offcnt--; /* a little lie */
+ curdir->d_offcnt--; /* a little lie */
continue;
}
+ /* Fixup CNID db if ad_convert resulted in a rename (then convname != NULL) */
+ if (convname) {
+ s_path.id = cnid_lookup(vol->v_cdb, &s_path.st, curdir->d_did, sd.sd_last, strlen(sd.sd_last));
+ if (s_path.id != CNID_INVALID) {
+ if (cnid_update(vol->v_cdb, s_path.id, &s_path.st, curdir->d_did, (char *)convname, strlen(convname)) != 0)
+ LOG(log_error, logtype_afpd, "enumerate: error updating CNID of \"%s\"", fullpathname(convname));
+ }
+ }
+
sd.sd_last += len + 1;
s_path.m_name = NULL;
+
/*
* If a fil/dir is not a dir, it's a file. This is slightly
* inaccurate, since that means /dev/null is a file, /dev/printer
return AFPERR_MISC;
}
}
- if ((ret = getdirparams(vol, dbitmap, &s_path, dir, data + header , &esz)) != AFP_OK)
+ if ((ret = getdirparams(obj, vol, dbitmap, &s_path, dir, data + header , &esz)) != AFP_OK)
return( ret );
} else {
if ( fbitmap == 0 ) {
continue;
}
- if (AFP_OK != ( ret = getfilparams(vol, fbitmap, &s_path, curdir,
- data + header , &esz )) ) {
+ /* files are added to the dircache in getfilparams() -> getmetadata() */
+ if (AFP_OK != ( ret = getfilparams(obj, vol, fbitmap, &s_path, curdir,
+ data + header, &esz, 1)) ) {
return( ret );
}
}
if ( actcnt == 0 ) {
sd.sd_did = 0; /* invalidate sd struct to force re-read */
+ /*
+ * in case were converting adouble stuff:
+ * after enumerating the whole dir we should have converted everything
+ * thus the .AppleDouble dir shouls be empty thus we can no try to
+ * delete it
+ */
+ if (vol->v_adouble == AD_VERSION_EA && ! (vol->v_flags & AFPVOL_NOV2TOEACONV))
+ (void)rmdir(".AppleDouble");
+
return( AFPERR_NOOBJ );
}
sd.sd_sindex = sindex + actcnt;
projects / netatalk.git / blobdiff