X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fcatsearch.c;h=81a4855d507ebb2e131fbab6edec76052348d97f;hb=edf01c724768d494e522ec84380e8e49b37a2bd6;hp=ad28c6f668d4f36f539d1884c2bd61d3f83f2351;hpb=5737d08e3c85485df6ad56d7be7423d6309e9b94;p=netatalk.git diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c index ad28c6f6..81a4855d 100644 --- a/etc/afpd/catsearch.c +++ b/etc/afpd/catsearch.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "desktop.h" #include "directory.h" @@ -119,25 +120,38 @@ struct dsitem { #define DS_BSIZE 128 static int save_cidx = -1; /* Saved index of currently scanned directory. */ - static struct dsitem *dstack = NULL; /* Directory stack data... */ static int dssize = 0; /* Directory stack (allocated) size... */ static int dsidx = 0; /* First free item index... */ - static struct scrit c1, c2; /* search criteria */ +/* Clears directory stack. */ +static void clearstack(void) +{ + save_cidx = -1; + while (dsidx > 0) { + dsidx--; + free(dstack[dsidx].path); + } +} + /* Puts new item onto directory stack. */ static int addstack(char *uname, struct dir *dir, int pidx) { struct dsitem *ds; size_t l, u; + struct dsitem *tmpds = NULL; /* check if we have some space on stack... */ if (dsidx >= dssize) { dssize += DS_BSIZE; - dstack = realloc(dstack, dssize * sizeof(struct dsitem)); - if (dstack == NULL) + tmpds = realloc(dstack, dssize * sizeof(struct dsitem)); + if (tmpds == NULL) { + clearstack(); + free(dstack); return -1; + } + dstack = tmpds; } /* Put new element. Allocate and copy lname and path. */ @@ -182,16 +196,6 @@ static int reducestack(void) return -1; } -/* Clears directory stack. */ -static void clearstack(void) -{ - save_cidx = -1; - while (dsidx > 0) { - dsidx--; - free(dstack[dsidx].path); - } -} - /* Looks up for an opened adouble structure, opens resource fork of selected file. * FIXME What about noadouble? */ @@ -280,7 +284,7 @@ static int crit_check(struct vol *vol, struct path *path) { * An other option would be to call get_id in utompath but * we need to pass parent dir */ - if (!(path->m_name = utompath(vol, path->u_name, 0 , utf8_encoding()) )) { + if (!(path->m_name = utompath(vol, path->u_name, 0 , utf8_encoding(vol->v_obj)) )) { /*retry with the right id */ cnid_t id; @@ -293,7 +297,7 @@ static int crit_check(struct vol *vol, struct path *path) { } /* save the id for getfilparm */ path->id = id; - if (!(path->m_name = utompath(vol, path->u_name, id , utf8_encoding()))) { + if (!(path->m_name = utompath(vol, path->u_name, id , utf8_encoding(vol->v_obj)))) { return 0; } } @@ -423,7 +427,7 @@ crit_check_ret: } /* ------------------------------ */ -static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) +static int rslt_add (const AFPObj *obj, struct vol *vol, struct path *path, char **buf, int ext) { char *p = *buf; @@ -446,11 +450,11 @@ static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) } if ( isdir ) { - ret = getdirparams(vol, c1.dbitmap, path, path->d_dir, p , &tbuf ); + ret = getdirparams(obj, vol, c1.dbitmap, path, path->d_dir, p , &tbuf ); } else { /* FIXME slow if we need the file ID, we already know it, done ? */ - ret = getfilparams ( vol, c1.fbitmap, path, path->d_dir, p, &tbuf); + ret = getfilparams (obj, vol, c1.fbitmap, path, path->d_dir, p, &tbuf); } if ( ret != AFP_OK ) @@ -493,7 +497,8 @@ static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) * @param ext (r) extended search flag */ #define NUM_ROUNDS 200 -static int catsearch(struct vol *vol, +static int catsearch(const AFPObj *obj, + struct vol *vol, struct dir *dir, int rmatches, uint32_t *pos, @@ -644,7 +649,7 @@ static int catsearch(struct vol *vol, /* bit 0 means that criteria has been met */ if ((ccr & 1)) { - r = rslt_add ( vol, &path, &rrbuf, ext); + r = rslt_add (obj, vol, &path, &rrbuf, ext); if (r == 0) { result = AFPERR_MISC; @@ -706,7 +711,8 @@ catsearch_end: /* Exiting catsearch: error condition */ * @param rsize (w) length of data written to output buffer * @param ext (r) extended search flag */ -static int catsearch_db(struct vol *vol, +static int catsearch_db(const AFPObj *obj, + struct vol *vol, struct dir *dir, const char *uname, int rmatches, @@ -781,7 +787,7 @@ static int catsearch_db(struct vol *vol, memset(&path, 0, sizeof(path)); path.u_name = name; - path.m_name = utompath(vol, name, cnid, utf8_encoding()); + path.m_name = utompath(vol, name, cnid, utf8_encoding(vol->v_obj)); if (of_stat(&path) != 0) { switch (errno) { @@ -810,7 +816,7 @@ static int catsearch_db(struct vol *vol, LOG(log_debug, logtype_afpd,"catsearch_db: match: %s/%s", getcwdpath(), path.u_name); /* bit 1 means that criteria has been met */ - r = rslt_add(vol, &path, &rrbuf, ext); + r = rslt_add(obj, vol, &path, &rrbuf, ext); if (r == 0) { result = AFPERR_MISC; goto catsearch_end; @@ -1034,7 +1040,7 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, memcpy (c1.utf8name, spec1+2, namelen); c1.utf8name[namelen] = 0; - if ((uname = mtoupath(vol, c1.utf8name, 0, utf8_encoding())) == NULL) + if ((uname = mtoupath(vol, c1.utf8name, 0, utf8_encoding(obj))) == NULL) return AFPERR_PARAM; /* convert charset */ @@ -1047,13 +1053,14 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, /* Call search */ *rbuflen = 24; if ((c1.rbitmap & (1 << FILPBIT_PDINFO)) + && !(c1.rbitmap & (1<v_cnidscheme, "dbd") == 0) && (vol->v_flags & AFPVOL_SEARCHDB)) /* we've got a name and it's a dbd volume, so search CNID database */ - ret = catsearch_db(vol, vol->v_root, uname, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); + ret = catsearch_db(obj, vol, vol->v_root, uname, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); else /* perform a slow filesystem tree search */ - ret = catsearch(vol, vol->v_root, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); + ret = catsearch(obj, vol, vol->v_root, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); memcpy(rbuf, catpos, sizeof(catpos)); rbuf += sizeof(catpos);