/*
- * $Id: enumerate.c,v 1.49 2010/02/10 14:05:37 franklahm Exp $
- *
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#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 "desktop.h"
#include "directory.h"
#include "dircache.h"
#include "volume.h"
-#include "globals.h"
#include "file.h"
#include "fork.h"
#include "filedir.h"
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_,
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 */
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)
+ (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:
*/
*sd.sd_last = 0;
sd.sd_last += len + 1;
- curdir->offcnt--; /* a little lie */
+ curdir->d_offcnt--; /* a little lie */
continue;
}
if ( fbitmap == 0 ) {
continue;
}
+ /* files are added to the dircache in getfilparams() -> getmetadata() */
if (AFP_OK != ( ret = getfilparams(vol, fbitmap, &s_path, curdir,
data + header , &esz )) ) {
return( ret );