X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fcatsearch.c;h=81a4855d507ebb2e131fbab6edec76052348d97f;hb=edf01c724768d494e522ec84380e8e49b37a2bd6;hp=0faeef9494b92619dd6cbcf2f905d6ce88a12dd8;hpb=55c0d6d753dc022689616dedf38523e8388d4fd2;p=netatalk.git diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c index 0faeef94..81a4855d 100644 --- a/etc/afpd/catsearch.c +++ b/etc/afpd/catsearch.c @@ -47,22 +47,23 @@ #include #include #include +#include +#include #include "desktop.h" #include "directory.h" #include "dircache.h" #include "file.h" #include "volume.h" -#include "globals.h" #include "filedir.h" #include "fork.h" struct finderinfo { - u_int32_t f_type; - u_int32_t creator; - u_int16_t attrs; /* File attributes (high 8 bits)*/ - u_int16_t label; /* Label (low 8 bits )*/ + uint32_t f_type; + uint32_t creator; + uint16_t attrs; /* File attributes (high 8 bits)*/ + uint16_t label; /* Label (low 8 bits )*/ char reserved[22]; /* Unknown (at least for now...) */ }; @@ -86,14 +87,14 @@ typedef char packed_finder[ADEDLEN_FINDERI]; /* This is our search-criteria structure. */ struct scrit { - u_int32_t rbitmap; /* Request bitmap - which values should we check ? */ - u_int16_t fbitmap, dbitmap; /* file & directory bitmap - which values should we return ? */ - u_int16_t attr; /* File attributes */ + uint32_t rbitmap; /* Request bitmap - which values should we check ? */ + uint16_t fbitmap, dbitmap; /* file & directory bitmap - which values should we return ? */ + uint16_t attr; /* File attributes */ time_t cdate; /* Creation date */ time_t mdate; /* Last modification date */ time_t bdate; /* Last backup date */ - u_int32_t pdid; /* Parent DID */ - u_int16_t offcnt; /* Offspring count */ + uint32_t pdid; /* Parent DID */ + uint16_t offcnt; /* Offspring count */ struct finderinfo finfo; /* Finder info */ char lname[64]; /* Long name */ char utf8name[514]; /* UTF8 or UCS2 name */ /* for convert_charset dest_len parameter +2 */ @@ -108,7 +109,8 @@ struct scrit { * */ struct dsitem { - struct dir *dir; /* Structure describing this directory */ +// struct dir *dir; /* Structure describing this directory */ +// cnid_t did; /* CNID of this directory */ int pidx; /* Parent's dsitem structure index. */ int checked; /* Have we checked this directory ? */ int path_len; @@ -118,31 +120,43 @@ 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. */ ds = dstack + dsidx++; - ds->dir = dir; - dir->d_flags |= DIRF_CACHELOCK; +// ds->did = dir->d_did; ds->pidx = pidx; ds->checked = 0; if (pidx >= 0) { @@ -175,7 +189,6 @@ static int reducestack(void) while (dsidx > 0) { if (dstack[dsidx-1].checked) { dsidx--; - dstack[dsidx].dir->d_flags &= ~DIRF_CACHELOCK; free(dstack[dsidx].path); } else return dsidx - 1; @@ -183,17 +196,6 @@ static int reducestack(void) return -1; } -/* Clears directory stack. */ -static void clearstack(void) -{ - save_cidx = -1; - while (dsidx > 0) { - dsidx--; - dstack[dsidx].dir->d_flags &= ~DIRF_CACHELOCK; - free(dstack[dsidx].path); - } -} - /* Looks up for an opened adouble structure, opens resource fork of selected file. * FIXME What about noadouble? */ @@ -212,7 +214,7 @@ static struct adouble *adl_lkup(struct vol *vol, struct path *path, struct adoub if (!isdir && (of = of_findname(path))) { adp = of->of_ad; } else { - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); adp = &ad; } @@ -259,11 +261,11 @@ unpack_finderinfo(struct vol *vol, struct path *path, struct adouble **adp, stru */ static int crit_check(struct vol *vol, struct path *path) { int result = 0; - u_int16_t attr, flags = CONV_PRECOMPOSE; + uint16_t attr, flags = CONV_PRECOMPOSE; struct finderinfo *finfo = NULL, finderinfo; struct adouble *adp = NULL; time_t c_date, b_date; - u_int32_t ac_date, ab_date; + uint32_t ac_date, ab_date; static char convbuf[514]; /* for convert_charset dest_len parameter +2 */ size_t len; int islnk; @@ -282,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; @@ -295,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; } } @@ -420,18 +422,18 @@ static int crit_check(struct vol *vol, struct path *path) { result |= 1; crit_check_ret: if (adp != NULL) - ad_close_metadata(adp); + ad_close(adp, ADFLAGS_HF); return result; } /* ------------------------------ */ -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; int ret; size_t tbuf =0; - u_int16_t resultsize; + uint16_t resultsize; int isdir = S_ISDIR(path->st.st_mode); /* Skip resultsize */ @@ -448,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 ) @@ -495,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, @@ -504,8 +507,9 @@ static int catsearch(struct vol *vol, int *rsize, int ext) { - static u_int32_t cur_pos; /* Saved position index (ID) - used to remember "position" across FPCatSearch calls */ + static uint32_t cur_pos; /* Saved position index (ID) - used to remember "position" across FPCatSearch calls */ static DIR *dirpos; /* UNIX structure describing currently opened directory. */ + struct dir *currentdir; /* struct dir of current directory */ int cidx, r; struct dirent *entry; int result = AFP_OK; @@ -551,6 +555,8 @@ static int catsearch(struct vol *vol, start_time = time(NULL); while ((cidx = reducestack()) != -1) { + LOG(log_debug, logtype_afpd, "catsearch: dir: \"%s\"", dstack[cidx].path); + error = lchdir(dstack[cidx].path); if (!error && dirpos == NULL) @@ -576,13 +582,22 @@ static int catsearch(struct vol *vol, } /* switch (errno) */ goto catsearch_end; } + + if ((currentdir = dirlookup_bypath(vol, dstack[cidx].path)) == NULL) { + result = AFPERR_MISC; + goto catsearch_end; + } + LOG(log_debug, logtype_afpd, "catsearch: current struct dir: \"%s\"", cfrombstr(currentdir->d_fullpath)); - while ((entry=readdir(dirpos)) != NULL) { + while ((entry = readdir(dirpos)) != NULL) { (*pos)++; if (!check_dirent(vol, entry->d_name)) continue; + LOG(log_debug, logtype_afpd, "catsearch(\"%s\"): dirent: \"%s\"", + cfrombstr(currentdir->d_fullpath), entry->d_name); + memset(&path, 0, sizeof(path)); path.u_name = entry->d_name; if (of_stat(&path) != 0) { @@ -606,10 +621,16 @@ static int catsearch(struct vol *vol, ALL dirsearch_byname will fail. */ int unlen = strlen(path.u_name); - path.d_dir = dircache_search_by_name(vol, dstack[cidx].dir, path.u_name, unlen, path.st.st_ctime); + path.d_dir = dircache_search_by_name(vol, + currentdir, + path.u_name, + unlen); if (path.d_dir == NULL) { /* path.m_name is set by adddir */ - if (NULL == (path.d_dir = dir_add( vol, dstack[cidx].dir, &path, unlen) ) ) { + if ((path.d_dir = dir_add(vol, + currentdir, + &path, + unlen)) == NULL) { result = AFPERR_MISC; goto catsearch_end; } @@ -620,16 +641,15 @@ static int catsearch(struct vol *vol, result = AFPERR_MISC; goto catsearch_end; } + } else { + path.d_dir = currentdir; } - else { - /* yes it sucks for directory d_dir is the directory, for file it's the parent directory*/ - path.d_dir = dstack[cidx].dir; - } + ccr = crit_check(vol, &path); /* 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; @@ -691,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, @@ -728,7 +749,7 @@ static int catsearch_db(struct vol *vol, buffer, MAXPATHLEN, &flags) == (size_t)-1) { - LOG(log_error, logtype_cnid, "catsearch_db: conversion error"); + LOG(log_error, logtype_afpd, "catsearch_db: conversion error"); result = AFPERR_MISC; goto catsearch_end; } @@ -766,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) { @@ -795,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; @@ -831,17 +852,17 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen, int ext) { struct vol *vol; - u_int16_t vid; - u_int16_t spec_len; - u_int32_t rmatches, reserved; - u_int32_t catpos[4]; - u_int32_t pdid = 0; + uint16_t vid; + uint16_t spec_len; + uint32_t rmatches, reserved; + uint32_t catpos[4]; + uint32_t pdid = 0; int ret, rsize; - u_int32_t nrecs = 0; + uint32_t nrecs = 0; unsigned char *spec1, *spec2, *bspec1, *bspec2; size_t len; - u_int16_t namelen; - u_int16_t flags; + uint16_t namelen; + uint16_t flags; char tmppath[256]; char *uname; @@ -1014,12 +1035,12 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, /* length */ memcpy(&namelen, spec1, sizeof(namelen)); namelen = ntohs (namelen); - if (namelen > 255) /* Safeguard */ - namelen = 255; + if (namelen > UTF8FILELEN_EARLY) /* Safeguard */ + namelen = UTF8FILELEN_EARLY; 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 */ @@ -1032,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);