X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fenumerate.c;h=c06ef20300f3f296e4e2b0d41b2b40404a4538b0;hp=1a7c437cd867f4336b2032f0e1b2c134f2011a59;hb=2bf71d3ccf20c072bc67a9d075b6ac8b0798021e;hpb=dae33a574ac2963d8bd279eaf96e08b5b48afc03 diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c index 1a7c437c..c06ef203 100644 --- a/etc/afpd/enumerate.c +++ b/etc/afpd/enumerate.c @@ -1,5 +1,5 @@ /* - * $Id: enumerate.c,v 1.33 2003-01-24 07:08:42 didg Exp $ + * $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. @@ -13,19 +13,14 @@ #include #include #include - -#include -#include -#include #include #include -#include +#include #include #include -#ifdef CNID_DB +#include #include -#endif /* CNID_DB */ #include "desktop.h" #include "directory.h" #include "volume.h" @@ -36,90 +31,6 @@ #define min(a,b) ((a)<(b)?(a):(b)) -/* ---------------------------- */ -struct dir * - adddir( vol, dir, path) -struct vol *vol; -struct dir *dir; -struct path *path; -{ - struct dir *cdir, *edir; - int upathlen; - char *name; - char *upath; -#ifndef USE_LASTDID - struct stat lst, *lstp; -#endif /* USE_LASTDID */ - struct stat *st; - - upath = path->u_name; - name = path->m_name; - st = &path->st; - upathlen = strlen(upath); - if ((cdir = dirnew(name, upath)) == NULL) { - LOG(log_error, logtype_afpd, "adddir: malloc: %s", strerror(errno) ); - return NULL; - } - - cdir->d_did = 0; - -#ifdef CNID_DB - /* add to cnid db */ - cdir->d_did = cnid_add(vol->v_db, st, dir->d_did, upath, - upathlen, cdir->d_did); - /* Fail out if things go bad with CNID. */ - if (cdir->d_did == CNID_INVALID) { - switch (errno) { - case CNID_ERR_PARAM: - LOG(log_error, logtype_afpd, "adddir: Incorrect parameters passed to cnid_add"); - return NULL; - case CNID_ERR_PATH: - case CNID_ERR_DB: - case CNID_ERR_MAX: - return NULL; - } - } -#endif /* CNID_DB */ - - if (cdir->d_did == 0) { -#ifdef USE_LASTDID - /* last way of doing DIDs */ - cdir->d_did = htonl( vol->v_lastdid++ ); -#else /* USE_LASTDID */ - lstp = lstat(upath, &lst) < 0 ? st : &lst; - /* the old way of doing DIDs (default) */ - cdir->d_did = htonl( CNID(lstp, 0) ); -#endif /* USE_LASTDID */ - } - - if ((edir = dirinsert( vol, cdir ))) { - /* it's not possible with LASTDID - for CNID: - - someone else have moved the directory. - - it's a symlink inside the share. - - it's an ID reused, the old directory was deleted but not - the cnid record and the server've reused the inode for - the new dir. - for HASH (we should get ride of HASH) - - someone else have moved the directory. - - it's an ID reused as above - - it's a hash duplicate and we are in big trouble - */ - edir->d_m_name = cdir->d_m_name; - edir->d_u_name = cdir->d_u_name; - free(cdir); - cdir = edir; - if (!cdir->d_parent || cdir->d_parent == dir) - return cdir; - /* the old was not in the same folder */ - dirchildremove(cdir->d_parent, cdir); - } - - /* parent/child directories */ - cdir->d_parent = dir; - dirchildadd(dir, cdir); - return( cdir ); -} /* * Struct to save directory reading context in. Used to prevent * O(n^2) searches on a directory. @@ -132,19 +43,19 @@ struct savedir { char *sd_last; unsigned int sd_sindex; }; -#define SDBUFBRK 1024 +#define SDBUFBRK 2048 -static int enumerate_loop(struct dirent *de, char *mname, void *data) +static int enumerate_loop(struct dirent *de, char *mname _U_, void *data) { struct savedir *sd = data; char *start, *end; - int len; + int len,lenm; end = sd->sd_buf + sd->sd_buflen; len = strlen(de->d_name); *(sd->sd_last)++ = len; - - if ( sd->sd_last + len + 2 > end ) { + lenm = 0; /* strlen(mname);*/ + if ( sd->sd_last + len +lenm + 4 > end ) { char *buf; start = sd->sd_buf; @@ -162,6 +73,11 @@ static int enumerate_loop(struct dirent *de, char *mname, void *data) memcpy( sd->sd_last, de->d_name, len + 1 ); sd->sd_last += len + 1; +#if 0 + *(sd->sd_last)++ = lenm; + memcpy( sd->sd_last, mname, lenm + 1 ); + sd->sd_last += lenm + 1; +#endif return 0; } @@ -181,23 +97,27 @@ static int enumerate_loop(struct dirent *de, char *mname, void *data) */ char *check_dirent(const struct vol *vol, char *name) { - char *m_name = NULL; - if (!strcmp(name, "..") || !strcmp(name, ".")) return NULL; - if (!(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; + + if (NULL == (m_name = utompath(vol, name, 0, utf8_encoding()))) + return NULL; + /* now check against too big a file */ - if (strlen(m_name = utompath(vol, name)) > vol->max_filename) + if (strlen(m_name) > vol->max_filename) return NULL; - - return m_name; +#endif + return name; } /* ----------------------------- */ @@ -227,17 +147,24 @@ for_each_dirent(const struct vol *vol, char *name, dir_loop fn, void *data) return ret; } +/* This is the maximal length of a single entry for a file/dir in the reply + block if all bits in the file/dir bitmap are set: header(4) + params(104) + + macnamelength(1) + macname(31) + utf8(4) + utf8namelen(2) + utf8name(255) + + oddpadding(1) */ + +#define REPLY_PARAM_MAXLEN (4 + 104 + 1 + MACFILELEN + 4 + 2 + 255 + 1) + /* ----------------------------- */ -static int enumerate(obj, ibuf, ibuflen, rbuf, rbuflen, ext ) -AFPObj *obj; -char *ibuf, *rbuf; -unsigned int ibuflen, *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; @@ -324,7 +251,7 @@ int ext; header = (ext)?4:2; header *=sizeof( u_char ); - maxsz = min(maxsz, *rbuflen); + maxsz = min(maxsz, *rbuflen - REPLY_PARAM_MAXLEN); o_path = cname( vol, dir, &ibuf ); if (afp_errno == AFPERR_NOOBJ) @@ -332,13 +259,16 @@ int ext; *rbuflen = 0; if (NULL == o_path ) { - return afp_errno; + return get_afp_errno(AFPERR_NOOBJ); } if ( *o_path->m_name != '\0') { /* it's a file or it's a dir and extendir() was unable to chdir in it */ - return (path_isadir(o_path))? afp_errno:AFPERR_BADTYPE ; + return path_error(o_path, AFPERR_NODIR ); } + LOG(log_debug, logtype_afpd, "enumerate(vid:%u, did:%u, name:'%s', f/d:%04x/%04x, rc:%u, i:%u, max:%u)", + ntohs(vid), ntohl(did), 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 */ @@ -350,7 +280,7 @@ int ext; 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 && stat( ".", &o_path->st ) < 0 ) || + if (( !o_path->st_valid && lstat( ".", &o_path->st ) < 0 ) || (ret = for_each_dirent(vol, ".", enumerate_loop, (void *)&sd)) < 0) { switch (errno) { @@ -364,15 +294,14 @@ int ext; return AFPERR_NODIR; } } - curdir->ctime = o_path->st.st_ctime; /* play safe */ - curdir->offcnt = ret; + setdiroffcnt(curdir, &o_path->st, ret); *sd.sd_last = 0; sd.sd_last = sd.sd_buf; sd.sd_sindex = 1; sd.sd_vid = vid; - sd.sd_did = did; + sd.sd_did = curdir->d_did; } /* @@ -383,7 +312,7 @@ int ext; sd.sd_last = sd.sd_buf; } while ( sd.sd_sindex < sindex ) { - len = *(sd.sd_last)++; + len = (unsigned char)*(sd.sd_last)++; if ( len == 0 ) { sd.sd_did = 0; /* invalidate sd struct to force re-read */ return( AFPERR_NOOBJ ); @@ -392,7 +321,7 @@ int ext; sd.sd_sindex++; } - while (( len = *(sd.sd_last)) != 0 ) { + while (( len = (unsigned char)*(sd.sd_last)) != 0 ) { /* * If we've got all we need, send it. */ @@ -412,6 +341,7 @@ int ext; sd.sd_last += len + 1; continue; } + memset(&s_path, 0, sizeof(s_path)); s_path.u_name = sd.sd_last; if (of_stat( &s_path) < 0 ) { /* @@ -429,6 +359,8 @@ int ext; continue; } + 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 @@ -436,32 +368,23 @@ int ext; */ if ( S_ISDIR(s_path.st.st_mode)) { if ( dbitmap == 0 ) { - sd.sd_last += len + 1; continue; } - dir = dirsearch_byname(curdir, s_path.u_name); - if (!dir) { - s_path.m_name = utompath(vol, s_path.u_name); - if ((dir = adddir( vol, curdir, &s_path)) == NULL) { + dir = dirsearch_byname(vol, curdir, s_path.u_name); + if (!dir && NULL == (dir = adddir( vol, curdir, &s_path) ) ) { return AFPERR_MISC; } - } - else { - s_path.m_name = NULL; - } - if (( ret = getdirparams(vol, dbitmap, &s_path, dir, - data + header , &esz )) != AFP_OK ) { + if (AFP_OK != ( ret = getdirparams(vol, dbitmap, &s_path, dir, + data + header , &esz ))) { return( ret ); } } else { if ( fbitmap == 0 ) { - sd.sd_last += len + 1; continue; } - s_path.m_name = utompath(vol, s_path.u_name); - if (( ret = getfilparams(vol, fbitmap, &s_path, curdir, - data + header , &esz )) != AFP_OK ) { + if (AFP_OK != ( ret = getfilparams(vol, fbitmap, &s_path, curdir, + data + header , &esz )) ) { return( ret ); } } @@ -505,7 +428,7 @@ int ext; } data += esz; actcnt++; - sd.sd_last += len + 1; + /* FIXME if we rollover 16 bits and it's not FPEnumerateExt2 */ } if ( actcnt == 0 ) { @@ -531,28 +454,25 @@ int ext; } /* ----------------------------- */ -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); }