/*
- * $Id: enumerate.c,v 1.43 2005-04-30 21:33:41 didg Exp $
+ * $Id: enumerate.c,v 1.47 2009-10-15 10:43:13 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-
-#include <atalk/logger.h>
#include <sys/file.h>
#include <sys/param.h>
+#include <atalk/logger.h>
#include <atalk/afp.h>
#include <atalk/adouble.h>
+#include <atalk/vfs.h>
#include <atalk/cnid.h>
#include "desktop.h"
#include "directory.h"
*/
char *check_dirent(const struct vol *vol, char *name)
{
-
if (!strcmp(name, "..") || !strcmp(name, "."))
return NULL;
- if (!vol->vfs->validupath(vol, name))
+ if (!vol->vfs->vfs_validupath(vol, name))
return NULL;
/* check for vetoed filenames */
if (veto_file(vol->v_veto, name))
return NULL;
+
#if 0
char *m_name = NULL;
#define REPLY_PARAM_MAXLEN (4 + 104 + 1 + MACFILELEN + 4 + 2 + 255 + 1)
/* ----------------------------- */
-static int enumerate(obj, ibuf, ibuflen, rbuf, rbuflen, ext )
-AFPObj *obj _U_;
-char *ibuf, *rbuf;
-unsigned int ibuflen _U_, *rbuflen;
-int ext;
+static int enumerate(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_,
+ char *rbuf,
+ size_t *rbuflen,
+ int ext)
{
static struct savedir sd = { 0, 0, 0, NULL, NULL, 0 };
struct vol *vol;
struct dir *dir;
- int did, ret, esz, len, first = 1;
+ 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;
}
/* ----------------------------- */
-int afp_enumerate(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-unsigned int ibuflen, *rbuflen;
+int afp_enumerate(AFPObj *obj, char *ibuf, size_t ibuflen,
+ char *rbuf,
+ size_t *rbuflen)
{
return enumerate(obj, ibuf,ibuflen ,rbuf,rbuflen , 0);
}
/* ----------------------------- */
-int afp_enumerate_ext(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-unsigned int ibuflen, *rbuflen;
+int afp_enumerate_ext(AFPObj *obj, char *ibuf, size_t ibuflen,
+ char *rbuf,
+ size_t *rbuflen)
{
return enumerate(obj, ibuf,ibuflen ,rbuf,rbuflen , 1);
}
/* ----------------------------- */
-int afp_enumerate_ext2(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
-char *ibuf, *rbuf;
-unsigned int ibuflen, *rbuflen;
+int afp_enumerate_ext2(AFPObj *obj, char *ibuf, size_t ibuflen,
+ char *rbuf,
+ size_t *rbuflen)
{
return enumerate(obj, ibuf,ibuflen ,rbuf,rbuflen , 2);
}