/*
- * $Id: enumerate.c,v 1.4 2001-06-06 13:36:36 rufustfirefly Exp $
+ * $Id: enumerate.c,v 1.12 2002-01-03 17:49:38 sibaz Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
#include <stdio.h>
#include <stdlib.h>
#include <dirent.h>
#include <errno.h>
-#include <sys/syslog.h>
+#include <syslog.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <netatalk/endian.h>
#include <atalk/afp.h>
#include <atalk/adouble.h>
+#ifdef CNID_DB
#include <atalk/cnid.h>
-
+#endif /* CNID_DB */
#include "desktop.h"
#include "directory.h"
#include "volume.h"
#include "globals.h"
#include "file.h"
+#include "filedir.h"
/* check for mtab DID code */
#ifdef DID_MTAB
#endif /* DID_MTAB */
struct dir *
-adddir( vol, dir, name, namlen, upath, upathlen, st )
- struct vol *vol;
- struct dir *dir;
- char *name, *upath;
- int namlen, upathlen;
- struct stat *st;
+ adddir( vol, dir, name, namlen, upath, upathlen, st )
+ struct vol *vol;
+struct dir *dir;
+char *name, *upath;
+int namlen, upathlen;
+struct stat *st;
{
struct dir *cdir, *edir;
#if AD_VERSION > AD_VERSION1
struct adouble ad;
-#endif
+#endif /* AD_VERSION > AD_VERSION1 */
#ifndef USE_LASTDID
struct stat lst, *lstp;
#endif /* USE_LASTDID */
if ((cdir = dirnew(namlen + 1)) == NULL) {
- syslog( LOG_ERR, "adddir: malloc: %m" );
- return NULL;
+ syslog( LOG_ERR, "adddir: malloc: %s", strerror(errno) );
+ return NULL;
}
strcpy( cdir->d_name, name );
cdir->d_name[namlen] = '\0';
+ cdir->d_did = 0;
+
#if AD_VERSION > AD_VERSION1
- /* find out if we have a fixed did already */
- if (!(cdir->d_did = cnid_lookup(vol->v_db, st, dir->d_did, upath,
- upathlen))) {
- memset(&ad, 0, sizeof(ad));
- if (ad_open(upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, 0, &ad) < 0) {
- /* if we can't parse the AppleDouble header, return 0 for the DID */
- cdir->d_did = 0;
- } else {
- /* ... else retrieve the DID entry into cdir->d_did */
- memcpy(&cdir->d_did, ad_entry(&ad, ADEID_DID), sizeof(cdir->d_did));
- ad_close(&ad, ADFLAGS_HF);
- }
-
- if (!(cdir->d_did = cnid_add(vol->v_db, st, dir->d_did, upath,
- upathlen, cdir->d_did))) {
-#ifdef USE_LASTDID
+ /* look in AD v2 header */
+ memset(&ad, 0, sizeof(ad));
+ if (ad_open(upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, 0, &ad) >= 0) {
+ /* if we can parse the AppleDouble header, retrieve the DID entry into cdir->d_did */
+ memcpy(&cdir->d_did, ad_entry(&ad, ADEID_DID), sizeof(cdir->d_did));
+ ad_close(&ad, ADFLAGS_HF);
+ }
+#endif /* AD_VERSION */
+
+#ifdef CNID_DB
+ /* add to cnid db */
+ cdir->d_did = cnid_add(vol->v_db, st, dir->d_did, upath,
+ upathlen, cdir->d_did);
+#endif /* CNID_DB */
+
+ if (cdir->d_did == 0) {
+#ifdef USE_LASTDID
/* last way of doing DIDs */
- cdir->d_did = htonl( vol->v_lastdid++ );
+ cdir->d_did = htonl( vol->v_lastdid++ );
#else /* USE_LASTDID */
- lstp = lstat(upath, &lst) < 0 ? st : &lst;
+ lstp = lstat(upath, &lst) < 0 ? st : &lst;
#ifdef DID_MTAB
/* mtab way of doing DIDs */
cdir->d_did = htonl( afpd_st_cnid ( lstp ) );
cdir->d_did = htonl( CNID(lstp, 0) );
#endif /* DID_MTAB */
#endif /* USE_LASTDID */
- }
}
-#else /* AD_VERSION */
-
-#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;
-#ifdef DID_MTAB
- /* mtab way of doing DIDs */
- cdir->d_did = htonl( afpd_st_cnid ( lstp ) );
-#else /* DID_MTAB */
- /* the old way of doing DIDs (default) */
- cdir->d_did = htonl( CNID(lstp, 0) );
-#endif /* DID_MTAB */
-#endif /* USE_LASTDID */
-#endif /* AD_VERSION */
if ((edir = dirinsert( vol, cdir ))) {
- if (edir->d_name) {
- if (strcmp(edir->d_name, cdir->d_name)) {
- syslog(LOG_INFO, "WARNING: DID conflict for '%s' and '%s'. Are these the same file?", edir->d_name, cdir->d_name);
- }
- free(cdir->d_name);
- free(cdir);
- return edir;
- }
- edir->d_name = cdir->d_name;
- free(cdir);
- cdir = edir;
+#ifndef CNID_DB
+ if (edir->d_name) {
+ if (strcmp(edir->d_name, cdir->d_name)) {
+ syslog(LOG_INFO, "WARNING: DID conflict for '%s' and '%s'. Are these the same file?", edir->d_name, cdir->d_name);
+ }
+ free(cdir->d_name);
+ free(cdir);
+ return edir;
+ }
+#endif /* CNID_DB */
+ edir->d_name = cdir->d_name;
+ free(cdir);
+ cdir = edir;
}
/* parent/child directories */
#define SDBUFBRK 1024
int afp_enumerate(obj, ibuf, ibuflen, rbuf, rbuflen )
- AFPObj *obj;
- char *ibuf, *rbuf;
- int ibuflen, *rbuflen;
+AFPObj *obj;
+char *ibuf, *rbuf;
+int ibuflen, *rbuflen;
{
struct stat st;
static struct savedir sd = { 0, 0, 0, NULL, NULL, 0 };
u_int16_t sindex, maxsz, sz = 0;
if ( sd.sd_buflen == 0 ) {
- if (( sd.sd_buf = (char *)malloc( SDBUFBRK )) == NULL ) {
- syslog( LOG_ERR, "afp_enumerate: malloc: %m" );
- *rbuflen = 0;
- return AFPERR_MISC;
- }
- sd.sd_buflen = SDBUFBRK;
+ if (( sd.sd_buf = (char *)malloc( SDBUFBRK )) == NULL ) {
+ syslog( LOG_ERR, "afp_enumerate: malloc: %s", strerror(errno) );
+ *rbuflen = 0;
+ return AFPERR_MISC;
+ }
+ sd.sd_buflen = SDBUFBRK;
}
ibuf += 2;
ibuf += sizeof( vid );
if (( vol = getvolbyvid( vid )) == NULL ) {
- *rbuflen = 0;
- return( AFPERR_PARAM );
+ *rbuflen = 0;
+ return( AFPERR_PARAM );
}
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( did );
if (( dir = dirsearch( vol, did )) == NULL ) {
- *rbuflen = 0;
- return( AFPERR_NODIR );
+ *rbuflen = 0;
+ return( AFPERR_NODIR );
}
memcpy( &fbitmap, ibuf, sizeof( fbitmap ));
/* check for proper bitmaps -- the stuff in comments is for
* variable directory ids. */
- if (!(fbitmap || dbitmap)
- /*|| (fbitmap & (1 << FILPBIT_PDID)) ||
- (dbitmap & (1 << DIRPBIT_PDID))*/) {
- *rbuflen = 0;
- return AFPERR_BITMAP;
+ if (!(fbitmap || dbitmap)
+ /*|| (fbitmap & (1 << FILPBIT_PDID)) ||
+ (dbitmap & (1 << DIRPBIT_PDID))*/) {
+ *rbuflen = 0;
+ return AFPERR_BITMAP;
}
memcpy( &reqcnt, ibuf, sizeof( reqcnt ));
ibuf += sizeof( maxsz );
if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- *rbuflen = 0;
- return( AFPERR_NODIR );
+ *rbuflen = 0;
+ return( AFPERR_NODIR );
}
data = rbuf + 3 * sizeof( u_int16_t );
sz = 3 * sizeof( u_int16_t );
* The end is indicated by a len of 0.
*/
if ( sindex == 1 || curdir->d_did != sd.sd_did || vid != sd.sd_vid ) {
- sd.sd_last = sd.sd_buf;
-
- if (( dp = opendir( mtoupath(vol, path ))) == NULL ) {
- *rbuflen = 0;
- return (errno == ENOTDIR) ? AFPERR_BADTYPE : AFPERR_NODIR;
- }
-
- end = sd.sd_buf + sd.sd_buflen;
- for ( de = readdir( dp ); de != NULL; de = readdir( dp )) {
- if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, "."))
- continue;
-
- if (!(validupath(vol, de->d_name)))
- continue;
-
- /* now check against too big a file */
- if (strlen(utompath(vol, de->d_name)) > MACFILELEN)
- continue;
-
- len = strlen(de->d_name);
- *(sd.sd_last)++ = len;
-
- if ( sd.sd_last + len + 2 > end ) {
- char *buf;
-
- start = sd.sd_buf;
- if ((buf = (char *) realloc( sd.sd_buf, sd.sd_buflen +
- SDBUFBRK )) == NULL ) {
- syslog( LOG_ERR, "afp_enumerate: realloc: %m" );
- closedir(dp);
- *rbuflen = 0;
- return AFPERR_MISC;
- }
- sd.sd_buf = buf;
- sd.sd_buflen += SDBUFBRK;
- sd.sd_last = ( sd.sd_last - start ) + sd.sd_buf;
- end = sd.sd_buf + sd.sd_buflen;
- }
-
- memcpy( sd.sd_last, de->d_name, len + 1 );
- sd.sd_last += len + 1;
- }
- *sd.sd_last = 0;
-
- sd.sd_last = sd.sd_buf;
- sd.sd_sindex = 1;
-
- closedir( dp );
- sd.sd_vid = vid;
- sd.sd_did = did;
+ sd.sd_last = sd.sd_buf;
+
+ if (( dp = opendir( mtoupath(vol, path ))) == NULL ) {
+ *rbuflen = 0;
+ return (errno == ENOTDIR) ? AFPERR_BADTYPE : AFPERR_NODIR;
+ }
+
+ end = sd.sd_buf + sd.sd_buflen;
+ for ( de = readdir( dp ); de != NULL; de = readdir( dp )) {
+ if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, "."))
+ continue;
+
+ if (!(validupath(vol, de->d_name)))
+ continue;
+
+ /* check for vetoed filenames */
+ if (veto_file(vol->v_veto, de->d_name))
+ continue;
+
+ /* now check against too big a file */
+ if (strlen(utompath(vol, de->d_name)) > MACFILELEN)
+ continue;
+
+ len = strlen(de->d_name);
+ *(sd.sd_last)++ = len;
+
+ if ( sd.sd_last + len + 2 > end ) {
+ char *buf;
+
+ start = sd.sd_buf;
+ if ((buf = (char *) realloc( sd.sd_buf, sd.sd_buflen +
+ SDBUFBRK )) == NULL ) {
+ syslog( LOG_ERR, "afp_enumerate: realloc: %s",
+ strerror(errno) );
+ closedir(dp);
+ *rbuflen = 0;
+ return AFPERR_MISC;
+ }
+ sd.sd_buf = buf;
+ sd.sd_buflen += SDBUFBRK;
+ sd.sd_last = ( sd.sd_last - start ) + sd.sd_buf;
+ end = sd.sd_buf + sd.sd_buflen;
+ }
+
+ memcpy( sd.sd_last, de->d_name, len + 1 );
+ sd.sd_last += len + 1;
+ }
+ *sd.sd_last = 0;
+
+ sd.sd_last = sd.sd_buf;
+ sd.sd_sindex = 1;
+
+ closedir( dp );
+ sd.sd_vid = vid;
+ sd.sd_did = did;
}
/*
* Position sd_last as dictated by sindex.
*/
if ( sindex < sd.sd_sindex ) {
- sd.sd_sindex = 1;
- sd.sd_last = sd.sd_buf;
+ sd.sd_sindex = 1;
+ sd.sd_last = sd.sd_buf;
}
while ( sd.sd_sindex < sindex ) {
- len = *(sd.sd_last)++;
- if ( len == 0 ) {
- sd.sd_did = -1; /* invalidate sd struct to force re-read */
- *rbuflen = 0;
- return( AFPERR_NOOBJ );
- }
- sd.sd_last += len + 1;
- sd.sd_sindex++;
+ len = *(sd.sd_last)++;
+ if ( len == 0 ) {
+ sd.sd_did = -1; /* invalidate sd struct to force re-read */
+ *rbuflen = 0;
+ return( AFPERR_NOOBJ );
+ }
+ sd.sd_last += len + 1;
+ sd.sd_sindex++;
}
while (( len = *(sd.sd_last)) != 0 ) {
- /*
- * If we've got all we need, send it.
- */
- if ( actcnt == reqcnt ) {
- break;
- }
-
- /*
- * Save the start position, in case we exceed the buffer
- * limitation, and have to back up one.
- */
- start = sd.sd_last;
- sd.sd_last++;
-
- if ( stat( sd.sd_last, &st ) < 0 ) {
- syslog( LOG_DEBUG, "afp_enumerate: stat %s: %m", sd.sd_last );
- sd.sd_last += len + 1;
- continue;
- }
-
- /*
- * 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
- * is a file, etc.
- */
- if ( S_ISDIR(st.st_mode)) {
- if ( dbitmap == 0 ) {
- sd.sd_last += len + 1;
- continue;
- }
- path = utompath(vol, sd.sd_last);
- dir = curdir->d_child;
- while (dir) {
- if ( strcmp( dir->d_name, path ) == 0 ) {
- break;
- }
- dir = (dir == curdir->d_child->d_prev) ? NULL : dir->d_next;
- }
- if (!dir && ((dir = adddir( vol, curdir, path, strlen( path ),
- sd.sd_last, len, &st)) == NULL)) {
- *rbuflen = 0;
- return AFPERR_MISC;
- }
-
-
- if (( ret = getdirparams(vol, dbitmap, sd.sd_last, dir,
- &st, data + 2 * sizeof( u_char ), &esz )) != AFP_OK ) {
- *rbuflen = 0;
- return( ret );
- }
-
- } else {
- if ( fbitmap == 0 ) {
- sd.sd_last += len + 1;
- continue;
- }
-
- if (( ret = getfilparams(vol, fbitmap, utompath(vol, sd.sd_last),
- curdir, &st, data + 2 * sizeof( u_char ), &esz )) !=
- AFP_OK ) {
- *rbuflen = 0;
- return( ret );
- }
- }
-
- /*
- * Make sure entry is an even length, possibly with a null
- * byte on the end.
- */
- if ( esz & 1 ) {
- *(data + 2 * sizeof( u_char ) + esz ) = '\0';
- esz++;
- }
-
- /*
- * Check if we've exceeded the size limit.
- */
- if ( maxsz < sz + esz + 2 * sizeof( u_char )) {
- if (first) { /* maxsz can't hold a single reply */
- *rbuflen = 0;
- return AFPERR_PARAM;
- }
- sd.sd_last = start;
- break;
- }
-
- if (first)
- first = 0;
-
- sz += esz + 2 * sizeof( u_char );
- *data++ = esz + 2 * sizeof( u_char );
- *data++ = S_ISDIR(st.st_mode) ? FILDIRBIT_ISDIR : FILDIRBIT_ISFILE;
- data += esz;
- actcnt++;
- sd.sd_last += len + 1;
+ /*
+ * If we've got all we need, send it.
+ */
+ if ( actcnt == reqcnt ) {
+ break;
+ }
+
+ /*
+ * Save the start position, in case we exceed the buffer
+ * limitation, and have to back up one.
+ */
+ start = sd.sd_last;
+ sd.sd_last++;
+
+ if ( stat( sd.sd_last, &st ) < 0 ) {
+ syslog( LOG_DEBUG, "afp_enumerate: stat %s: %s",
+ sd.sd_last, strerror(errno) );
+ sd.sd_last += len + 1;
+ continue;
+ }
+
+ /*
+ * 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
+ * is a file, etc.
+ */
+ if ( S_ISDIR(st.st_mode)) {
+ if ( dbitmap == 0 ) {
+ sd.sd_last += len + 1;
+ continue;
+ }
+ path = utompath(vol, sd.sd_last);
+ dir = curdir->d_child;
+ while (dir) {
+ if ( strcmp( dir->d_name, path ) == 0 ) {
+ break;
+ }
+ dir = (dir == curdir->d_child->d_prev) ? NULL : dir->d_next;
+ }
+ if (!dir && ((dir = adddir( vol, curdir, path, strlen( path ),
+ sd.sd_last, len, &st)) == NULL)) {
+ *rbuflen = 0;
+ return AFPERR_MISC;
+ }
+
+
+ if (( ret = getdirparams(vol, dbitmap, sd.sd_last, dir,
+ &st, data + 2 * sizeof( u_char ), &esz )) != AFP_OK ) {
+ *rbuflen = 0;
+ return( ret );
+ }
+
+ } else {
+ if ( fbitmap == 0 ) {
+ sd.sd_last += len + 1;
+ continue;
+ }
+
+ if (( ret = getfilparams(vol, fbitmap, utompath(vol, sd.sd_last),
+ curdir, &st, data + 2 * sizeof( u_char ), &esz )) !=
+ AFP_OK ) {
+ *rbuflen = 0;
+ return( ret );
+ }
+ }
+
+ /*
+ * Make sure entry is an even length, possibly with a null
+ * byte on the end.
+ */
+ if ( esz & 1 ) {
+ *(data + 2 * sizeof( u_char ) + esz ) = '\0';
+ esz++;
+ }
+
+ /*
+ * Check if we've exceeded the size limit.
+ */
+ if ( maxsz < sz + esz + 2 * sizeof( u_char )) {
+ if (first) { /* maxsz can't hold a single reply */
+ *rbuflen = 0;
+ return AFPERR_PARAM;
+ }
+ sd.sd_last = start;
+ break;
+ }
+
+ if (first)
+ first = 0;
+
+ sz += esz + 2 * sizeof( u_char );
+ *data++ = esz + 2 * sizeof( u_char );
+ *data++ = S_ISDIR(st.st_mode) ? FILDIRBIT_ISDIR : FILDIRBIT_ISFILE;
+ data += esz;
+ actcnt++;
+ sd.sd_last += len + 1;
}
if ( actcnt == 0 ) {
- *rbuflen = 0;
- sd.sd_did = -1; /* invalidate sd struct to force re-read */
- return( AFPERR_NOOBJ );
+ *rbuflen = 0;
+ sd.sd_did = -1; /* invalidate sd struct to force re-read */
+ return( AFPERR_NOOBJ );
}
sd.sd_sindex = sindex + actcnt;
/* why is this here? well, FPCatSearch is essentially an FPEnumerate
* with filters. */
-int afp_catsearch(AFPObj *obj, char *ibuf, int ibuflen,
- char *rbuf, int *rbuflen)
+int afp_catsearch(AFPObj *obj, char *ibuf, int ibuflen,
+ char *rbuf, int *rbuflen)
{
struct vol *vol;
u_int16_t vid;
*rbuflen = 0;
if ((vol = getvolbyvid(vid)) == NULL)
- return AFPERR_PARAM;
+ return AFPERR_PARAM;
/* the ritual:
* do a breadth-first search of directories:
/* eof when done */
return AFPERR_EOF;
-}
+}
projects / netatalk.git / blobdiff