-/*
- $Id: cmd_dbd_scanvol.c,v 1.1 2009-05-06 11:54:24 franklahm Exp $
-
- Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-*/
+/*
+ Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
-/*
- dbd specs and implementation progress
- =====================================
-
- St Type Check (Status of implementation progress, type: file/dir)
- -- ---- -----
- OK D Make sure .AppleDouble dir exist, create if missing. Error creating
- it is fatal as that shouldn't happen as root
- OK F Make sure ad file exists
- OK F/D Delete orphaned ad-files, log dirs in ad-dir
- OK F/D Check name encoding by roundtripping, log on error
- .. F/D try: read CNID from ad file (if cnid caching is on)
- try: fetch CNID from database
- on mismatch: keep CNID from file, update database
- on no CNID id ad file: write CNID from database to ad file
- on no CNID in database: add CNID from ad file to database
- on no CNID at all: create one and store in both places
-*/
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-/* FIXME: set id */
-#if 0
- ad_setid( &ad, s_path->st.st_dev, s_path->st.st_ino, dir->d_did, did, vol->v_stamp);
-#endif
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <fcntl.h>
#include <string.h>
#include <errno.h>
+#include <setjmp.h>
#include <atalk/adouble.h>
#include <atalk/unicode.h>
-#include <atalk/volinfo.h>
-#include "cmd_dbd.h"
+#include <atalk/netatalk_conf.h>
+#include <atalk/volume.h>
+#include <atalk/ea.h>
+#include <atalk/util.h>
+#include <atalk/acl.h>
+#include <atalk/compat.h>
+#include <atalk/cnid.h>
+#include <atalk/errchk.h>
+
+#include "cmd_dbd.h"
#include "dbif.h"
#include "db_param.h"
+#include "dbd.h"
+
+/* Some defines to ease code parsing */
+#define ADDIR_OK (addir_ok == 0)
+#define ADFILE_OK (adfile_ok == 0)
+
-static DBD *dbd_rebuild;
-static struct volinfo *volinfo;
-static dbd_flags_t dbd_flags;
static char cwdbuf[MAXPATHLEN+1];
+static struct vol *vol;
+static dbd_flags_t dbd_flags;
+static char stamp[CNID_DEV_LEN];
static char *netatalk_dirs[] = {
".AppleDB",
".AppleDesktop",
NULL
};
+static char *special_dirs[] = {
+ ".zfs",
+ NULL
+};
+static struct cnid_dbd_rqst rqst;
+static struct cnid_dbd_rply rply;
+static jmp_buf jmp;
+static char pname[MAXPATHLEN] = "../";
-/*
- Taken form afpd/desktop.c
+/*
+ Taken form afpd/desktop.c
*/
static char *utompath(char *upath)
{
u = upath;
outlen = strlen(upath);
- if ((volinfo->v_casefold & AFPVOL_UTOMUPPER))
+ if ((vol->v_casefold & AFPVOL_UTOMUPPER))
flags |= CONV_TOUPPER;
- else if ((volinfo->v_casefold & AFPVOL_UTOMLOWER))
+ else if ((vol->v_casefold & AFPVOL_UTOMLOWER))
flags |= CONV_TOLOWER;
- if ((volinfo->v_flags & AFPVOL_EILSEQ)) {
+ if ((vol->v_flags & AFPVOL_EILSEQ)) {
flags |= CONV__EILSEQ;
}
/* convert charsets */
- if ((size_t)-1 == ( outlen = convert_charset(volinfo->v_volcharset,
- CH_UTF8_MAC,
- volinfo->v_maccharset,
- u, outlen, mpath, MAXPATHLEN, &flags)) ) {
+ if ((size_t)-1 == ( outlen = convert_charset(vol->v_volcharset,
+ CH_UTF8_MAC,
+ vol->v_maccharset,
+ u, outlen, mpath, MAXPATHLEN, &flags)) ) {
dbd_log( LOGSTD, "Conversion from %s to %s for %s failed.",
- volinfo->v_volcodepage, volinfo->v_maccodepage, u);
+ vol->v_volcodepage, vol->v_maccodepage, u);
return NULL;
}
return(m);
}
-/*
- Taken form afpd/desktop.c
+/*
+ Check for netatalk special folders e.g. ".AppleDB" or ".AppleDesktop"
+ Returns pointer to name or NULL.
*/
-static char *mtoupath(char *mpath)
+static const char *check_netatalk_dirs(const char *name)
{
- static char upath[ MAXPATHLEN + 2]; /* for convert_charset dest_len parameter +2 */
- char *m, *u;
- size_t inplen;
- size_t outlen;
- u_int16_t flags = 0;
-
- if (!mpath)
- return NULL;
-
- if ( *mpath == '\0' ) {
- return( "." );
- }
-
- /* set conversion flags */
- if (!(volinfo->v_flags & AFPVOL_NOHEX))
- flags |= CONV_ESCAPEHEX;
- if (!(volinfo->v_flags & AFPVOL_USEDOTS))
- flags |= CONV_ESCAPEDOTS;
-
- if ((volinfo->v_casefold & AFPVOL_MTOUUPPER))
- flags |= CONV_TOUPPER;
- else if ((volinfo->v_casefold & AFPVOL_MTOULOWER))
- flags |= CONV_TOLOWER;
+ int c;
- if ((volinfo->v_flags & AFPVOL_EILSEQ)) {
- flags |= CONV__EILSEQ;
+ for (c=0; netatalk_dirs[c]; c++) {
+ if ((strcmp(name, netatalk_dirs[c])) == 0)
+ return netatalk_dirs[c];
}
+ return NULL;
+}
- m = mpath;
- u = upath;
-
- inplen = strlen(m);
- outlen = MAXPATHLEN;
+/*
+ Check for special names
+ Returns pointer to name or NULL.
+*/
+static const char *check_special_dirs(const char *name)
+{
+ int c;
- if ((size_t)-1 == (outlen = convert_charset(CH_UTF8_MAC,
- volinfo->v_volcharset,
- volinfo->v_maccharset,
- m, inplen, u, outlen, &flags)) ) {
- dbd_log( LOGSTD, "conversion from UTF8-MAC to %s for %s failed.",
- volinfo->v_volcodepage, mpath);
- return NULL;
+ for (c=0; special_dirs[c]; c++) {
+ if ((strcmp(name, special_dirs[c])) == 0)
+ return special_dirs[c];
}
-
- return( upath );
+ return NULL;
}
-/*
- Check for wrong encoding e.g. "." at the beginning is not CAP encoded (:2e) although volume is default !AFPVOL_USEDOTS.
- We do it by roundtripiping from volcharset to UTF8-MAC and back and then compare the result.
-*/
-static int check_name_encoding(char *uname)
+/*
+ * We unCAPed a name, update CNID db
+ */
+static int update_cnid(cnid_t did, const struct stat *sp, const char *oldname, const char *newname)
{
- char *roundtripped;
+ cnid_t id;
- roundtripped = mtoupath(utompath(uname));
- if (!roundtripped) {
- dbd_log( LOGSTD, "Error checking encoding for %s/%s", cwdbuf, uname);
- return -1;
- }
+ /* Query the database */
+ if ((id = cnid_lookup(vol->v_cdb, sp, did, (char *)oldname, strlen(oldname))) == CNID_INVALID)
+ /* not in db, no need to update */
+ return 0;
- if ( STRCMP(uname, !=, roundtripped)) {
- dbd_log( LOGSTD, "Bad encoding for %s/%s", cwdbuf, uname);
+ /* Update the database */
+ if (cnid_update(vol->v_cdb, id, sp, did, (char *)newname, strlen(newname)) < 0)
return -1;
- }
return 0;
}
/*
- Check for netatalk special folders e.g. ".AppleDB" or ".AppleDesktop"
- Returns pointer to name or NULL.
-*/
-static const char *check_netatalk_dirs(const char *name)
-{
- int c;
-
- for (c=0; netatalk_dirs[c]; c++) {
- if ((strcmp(name, netatalk_dirs[c])) == 0)
- return netatalk_dirs[c];
- }
- return NULL;
-}
-
-/*
- Check for .AppleDouble file, create if missing
+ Check for .AppleDouble file, create if missing
*/
-static int check_adfile(const char *fname, const struct stat *st)
+static int check_adfile(const char *fname, const struct stat *st, const char **newname)
{
int ret;
+ int adflags = ADFLAGS_HF;
struct adouble ad;
- char *adname;
+ const char *adname;
+
+ *newname = NULL;
- adname = volinfo->ad_path(fname, 0);
+ if (vol->v_adouble == AD_VERSION_EA) {
+ if (!(dbd_flags & DBD_FLAGS_V2TOEA))
+ return 0;
+ if (ad_convert(fname, st, vol, newname) != 0) {
+ switch (errno) {
+ case ENOENT:
+ break;
+ default:
+ dbd_log(LOGSTD, "Conversion error for \"%s/%s\": %s", cwdbuf, fname, strerror(errno));
+ break;
+ }
+ }
+ return 0;
+ }
+
+ if (S_ISDIR(st->st_mode))
+ adflags |= ADFLAGS_DIR;
+
+ adname = vol->ad_path(fname, adflags);
if ((ret = access( adname, F_OK)) != 0) {
if (errno != ENOENT) {
return -1;
}
/* Missing. Log and create it */
- dbd_log(LOGSTD, "Missing AppleDoube file '%s/%s'", cwdbuf, adname);
+ dbd_log(LOGSTD, "Missing AppleDouble file '%s/%s'", cwdbuf, adname);
if (dbd_flags & DBD_FLAGS_SCAN)
/* Scan only requested, dont change anything */
- return 0;
+ return -1;
/* Create ad file */
- ad_init(&ad, volinfo->v_adouble, volinfo->v_flags);
-
- if ((ret = ad_open_metadata( fname, 0, O_CREAT, &ad)) != 0) {
- dbd_log( LOGSTD, "Error creating AppleDouble file '%s/%s': %s",
+ ad_init(&ad, vol);
+
+ if ((ret = ad_open(&ad, fname, adflags | ADFLAGS_CREATE | ADFLAGS_RDWR, 0666)) != 0) {
+ dbd_log( LOGSTD, "Error creating AppleDouble file '%s/%s': %s",
cwdbuf, adname, strerror(errno));
+
return -1;
}
/* Set name in ad-file */
ad_setname(&ad, utompath((char *)fname));
ad_flush(&ad);
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
chown(adname, st->st_uid, st->st_gid);
/* FIXME: should we inherit mode too here ? */
#if 0
chmod(adname, st->st_mode);
#endif
+ } else {
+ ad_init(&ad, vol);
+ if (ad_open(&ad, fname, adflags | ADFLAGS_RDONLY) != 0) {
+ dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s'", cwdbuf, fname);
+ return -1;
+ }
+ ad_close(&ad, ADFLAGS_HF);
}
return 0;
}
/*
- Check for .AppleDouble folder, create if missing
+ Remove all files with file::EA* from adouble dir
+*/
+static void remove_eafiles(const char *name, struct ea *ea)
+{
+ DIR *dp = NULL;
+ struct dirent *ep;
+ char eaname[MAXPATHLEN];
+
+ strlcpy(eaname, name, sizeof(eaname));
+ if (strlcat(eaname, "::EA", sizeof(eaname)) >= sizeof(eaname)) {
+ dbd_log(LOGSTD, "name too long: '%s/%s/%s'", cwdbuf, ADv2_DIRNAME, name);
+ return;
+ }
+
+ if ((chdir(ADv2_DIRNAME)) != 0) {
+ dbd_log(LOGSTD, "Couldn't chdir to '%s/%s': %s",
+ cwdbuf, ADv2_DIRNAME, strerror(errno));
+ return;
+ }
+
+ if ((dp = opendir(".")) == NULL) {
+ dbd_log(LOGSTD, "Couldn't open the directory '%s/%s': %s",
+ cwdbuf, ADv2_DIRNAME, strerror(errno));
+ goto exit;
+ }
+
+ while ((ep = readdir(dp))) {
+ if (strstr(ep->d_name, eaname) != NULL) {
+ dbd_log(LOGSTD, "Removing EA file: '%s/%s/%s'",
+ cwdbuf, ADv2_DIRNAME, ep->d_name);
+ if ((unlink(ep->d_name)) != 0) {
+ dbd_log(LOGSTD, "Error unlinking EA file '%s/%s/%s': %s",
+ cwdbuf, ADv2_DIRNAME, ep->d_name, strerror(errno));
+ }
+ } /* if */
+ } /* while */
+
+exit:
+ if (dp)
+ closedir(dp);
+ if ((chdir("..")) != 0) {
+ dbd_log(LOGSTD, "Couldn't chdir to '%s': %s", cwdbuf, strerror(errno));
+ /* we can't proceed */
+ longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
+ }
+}
+
+/*
+ Check Extended Attributes files
+*/
+static int check_eafiles(const char *fname)
+{
+ unsigned int count = 0;
+ int ret = 0, remove;
+ struct ea ea;
+ struct stat st;
+ char *eaname;
+
+ if ((ret = ea_open(vol, fname, EA_RDWR, &ea)) != 0) {
+ if (errno == ENOENT)
+ return 0;
+ dbd_log(LOGSTD, "Error calling ea_open for file: %s/%s, removing EA files", cwdbuf, fname);
+ if ( ! (dbd_flags & DBD_FLAGS_SCAN))
+ remove_eafiles(fname, &ea);
+ return -1;
+ }
+
+ /* Check all EAs */
+ while (count < ea.ea_count) {
+ dbd_log(LOGDEBUG, "EA: %s", (*ea.ea_entries)[count].ea_name);
+ remove = 0;
+
+ eaname = ea_path(&ea, (*ea.ea_entries)[count].ea_name, 0);
+
+ if (lstat(eaname, &st) != 0) {
+ if (errno == ENOENT)
+ dbd_log(LOGSTD, "Missing EA: %s/%s", cwdbuf, eaname);
+ else
+ dbd_log(LOGSTD, "Bogus EA: %s/%s", cwdbuf, eaname);
+ remove = 1;
+ } else if (st.st_size != (*ea.ea_entries)[count].ea_size) {
+ dbd_log(LOGSTD, "Bogus EA: %s/%s, removing it...", cwdbuf, eaname);
+ remove = 1;
+ if ((unlink(eaname)) != 0)
+ dbd_log(LOGSTD, "Error removing EA file '%s/%s': %s",
+ cwdbuf, eaname, strerror(errno));
+ }
+
+ if (remove) {
+ /* Be CAREFUL here! This should do what ea_delentry does. ea_close relies on it !*/
+ free((*ea.ea_entries)[count].ea_name);
+ (*ea.ea_entries)[count].ea_name = NULL;
+ }
+
+ count++;
+ } /* while */
+
+ ea_close(&ea);
+ return ret;
+}
+
+/*
+ Check for .AppleDouble folder and .Parent, create if missing
*/
static int check_addir(int volroot)
{
- int ret;
+ int addir_ok, adpar_ok;
struct stat st;
struct adouble ad;
+ char *mname = NULL;
+
+ if (vol->v_adouble == AD_VERSION_EA)
+ return 0;
- if ((ret = access(ADv2_DIRNAME, F_OK)) != 0) {
+ /* Check for ad-dir */
+ if ( (addir_ok = access(ADv2_DIRNAME, F_OK)) != 0) {
if (errno != ENOENT) {
dbd_log(LOGSTD, "Access error in directory %s: %s", cwdbuf, strerror(errno));
return -1;
}
- /* Missing. Log and create it */
- dbd_log(LOGSTD, "Missing %s directory %s", ADv2_DIRNAME, cwdbuf);
+ dbd_log(LOGSTD, "Missing %s for '%s'", ADv2_DIRNAME, cwdbuf);
+ }
- if (dbd_flags & DBD_FLAGS_SCAN)
- /* Scan only requested, dont change anything */
- return 0;
+ /* Check for ".Parent" */
+ if ( (adpar_ok = access(vol->ad_path(".", ADFLAGS_DIR), F_OK)) != 0) {
+ if (errno != ENOENT) {
+ dbd_log(LOGSTD, "Access error on '%s/%s': %s",
+ cwdbuf, vol->ad_path(".", ADFLAGS_DIR), strerror(errno));
+ return -1;
+ }
+ dbd_log(LOGSTD, "Missing .AppleDouble/.Parent for '%s'", cwdbuf);
+ }
- /* Create ad dir and set name and id */
- ad_init(&ad, volinfo->v_adouble, volinfo->v_flags);
-
- if ((ret = ad_open_metadata( ".", ADFLAGS_DIR, O_CREAT, &ad)) != 0) {
+ /* Is one missing ? */
+ if ((addir_ok != 0) || (adpar_ok != 0)) {
+ /* Yes, but are we only scanning ? */
+ if (dbd_flags & DBD_FLAGS_SCAN) {
+ /* Yes: missing .Parent is not a problem, but missing ad-dir
+ causes later checking of ad-files to fail. So we have to return appropiately */
+ if (addir_ok != 0)
+ return -1;
+ else /* (adpar_ok != 0) */
+ return 0;
+ }
+
+ /* Create ad dir and set name */
+ ad_init(&ad, vol);
+
+ if (ad_open(&ad, ".", ADFLAGS_HF | ADFLAGS_DIR | ADFLAGS_CREATE | ADFLAGS_RDWR, 0777) != 0) {
dbd_log( LOGSTD, "Error creating AppleDouble dir in %s: %s", cwdbuf, strerror(errno));
return -1;
}
/* Get basename of cwd from cwdbuf */
- char *mname = utompath(strrchr(cwdbuf, '/') + 1);
+ mname = utompath(strrchr(cwdbuf, '/') + 1);
/* Update name in ad file */
ad_setname(&ad, mname);
ad_flush(&ad);
- ad_close_metadata(&ad);
-
+ ad_close(&ad, ADFLAGS_HF);
+
/* Inherit owner/group from "." to ".AppleDouble" and ".Parent" */
- if ((stat(".", &st)) != 0) {
+ if ((lstat(".", &st)) != 0) {
dbd_log( LOGSTD, "Couldnt stat %s: %s", cwdbuf, strerror(errno));
return -1;
}
chown(ADv2_DIRNAME, st.st_uid, st.st_gid);
- chown(volinfo->ad_path(".", ADFLAGS_DIR), st.st_uid, st.st_gid);
+ chown(vol->ad_path(".", ADFLAGS_DIR), st.st_uid, st.st_gid);
}
return 0;
}
+/*
+ Check if file cotains "::EA" and if it does check if its correspondig data fork exists.
+ Returns:
+ 0 = name is not an EA file
+ 1 = name is an EA file and no problem was found
+ -1 = name is an EA file and data fork is gone
+ */
+static int check_eafile_in_adouble(const char *name)
+{
+ int ret = 0;
+ char *namep, *namedup = NULL;
+
+ /* Check if this is an AFPVOL_EA_AD vol */
+ if (vol->v_vfs_ea == AFPVOL_EA_AD) {
+ /* Does the filename contain "::EA" ? */
+ namedup = strdup(name);
+ if ((namep = strstr(namedup, "::EA")) == NULL) {
+ ret = 0;
+ goto ea_check_done;
+ } else {
+ /* File contains "::EA" so it's an EA file. Check for data file */
+
+ /* Get string before "::EA" from EA filename */
+ namep[0] = 0;
+ strlcpy(pname + 3, namedup, sizeof(pname)); /* Prepends "../" */
+
+ if ((access( pname, F_OK)) == 0) {
+ ret = 1;
+ goto ea_check_done;
+ } else {
+ ret = -1;
+ if (errno != ENOENT) {
+ dbd_log(LOGSTD, "Access error for file '%s/%s': %s",
+ cwdbuf, name, strerror(errno));
+ goto ea_check_done;
+ }
+
+ /* Orphaned EA file*/
+ dbd_log(LOGSTD, "Orphaned Extended Attribute file '%s/%s/%s'",
+ cwdbuf, ADv2_DIRNAME, name);
+
+ if (dbd_flags & DBD_FLAGS_SCAN)
+ /* Scan only requested, dont change anything */
+ goto ea_check_done;
+
+ if ((unlink(name)) != 0) {
+ dbd_log(LOGSTD, "Error unlinking orphaned Extended Attribute file '%s/%s/%s'",
+ cwdbuf, ADv2_DIRNAME, name);
+ }
+ } /* if (access) */
+ } /* if strstr */
+ } /* if AFPVOL_EA_AD */
+
+ea_check_done:
+ if (namedup)
+ free(namedup);
+
+ return ret;
+}
+
+/*
+ Check files and dirs inside .AppleDouble folder:
+ - remove orphaned files
+ - bail on dirs
+*/
static int read_addir(void)
{
DIR *dp;
struct dirent *ep;
struct stat st;
- static char fname[NAME_MAX] = "../";
if ((chdir(ADv2_DIRNAME)) != 0) {
+ if (vol->v_adouble == AD_VERSION_EA) {
+ return 0;
+ }
dbd_log(LOGSTD, "Couldn't chdir to '%s/%s': %s",
cwdbuf, ADv2_DIRNAME, strerror(errno));
return -1;
if (DIR_DOT_OR_DOTDOT(ep->d_name))
continue;
- if ((stat(ep->d_name, &st)) < 0) {
- dbd_log( LOGSTD, "Lost file while reading dir '%s/%s/%s', probably removed: %s",
+ /* Skip ".Parent" */
+ if (STRCMP(ep->d_name, ==, ".Parent"))
+ continue;
+
+ if ((lstat(ep->d_name, &st)) < 0) {
+ dbd_log( LOGSTD, "Lost file or dir while enumeratin dir '%s/%s/%s', probably removed: %s",
cwdbuf, ADv2_DIRNAME, ep->d_name, strerror(errno));
continue;
}
continue;
}
- /* Skip ".Parent" */
- if (STRCMP(ep->d_name, ==, ".Parent"))
+ /* Check if for orphaned and corrupt Extended Attributes file */
+ if (check_eafile_in_adouble(ep->d_name) != 0)
continue;
/* Check for data file */
- strcpy(fname+3, ep->d_name);
- if ((access( fname, F_OK)) != 0) {
+ strcpy(pname + 3, ep->d_name);
+ if ((access( pname, F_OK)) != 0) {
if (errno != ENOENT) {
- dbd_log(LOGSTD, "Access error for file '%s/%s': %s",
- cwdbuf, ep->d_name, strerror(errno));
+ dbd_log(LOGSTD, "Access error for file '%s/%s': %s",
+ cwdbuf, pname, strerror(errno));
continue;
}
/* Orphaned ad-file*/
dbd_log(LOGSTD, "Couldn't chdir back to '%s' from AppleDouble dir: %s",
cwdbuf, strerror(errno));
/* This really is EOT! */
- exit(1);
+ longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
}
closedir(dp);
return 0;
}
+/*
+ Check CNID for a file/dir, both from db and from ad-file.
+ For detailed specs see intro.
+
+ @return Correct CNID of object or CNID_INVALID (ie 0) on error
+*/
+static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfile_ok)
+{
+ int adflags = ADFLAGS_HF;
+ cnid_t db_cnid, ad_cnid;
+ struct adouble ad;
+
+ adflags = ADFLAGS_HF | (S_ISDIR(st->st_mode) ? ADFLAGS_DIR : 0);
+
+ /* Get CNID from ad-file */
+ ad_cnid = CNID_INVALID;
+ if (ADFILE_OK) {
+ ad_init(&ad, vol);
+ if (ad_open(&ad, name, adflags | ADFLAGS_RDWR) != 0) {
+
+ if (vol->v_adouble != AD_VERSION_EA) {
+ dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s': %s", cwdbuf, name, strerror(errno));
+ return CNID_INVALID;
+ }
+ dbd_log( LOGDEBUG, "File without meta EA: \"%s/%s\"", cwdbuf, name);
+ adfile_ok = 1;
+ } else {
+ ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, 0, stamp);
+ if (ad_cnid == CNID_INVALID)
+ dbd_log( LOGSTD, "Bad CNID in adouble file of '%s/%s'", cwdbuf, name);
+ else
+ dbd_log( LOGDEBUG, "CNID from .AppleDouble file for '%s/%s': %u", cwdbuf, name, ntohl(ad_cnid));
+ ad_close(&ad, ADFLAGS_HF);
+ }
+ }
+
+ /* Get CNID from database */
+ if ((db_cnid = cnid_add(vol->v_cdb, st, did, (char *)name, strlen(name), ad_cnid)) == CNID_INVALID)
+ return CNID_INVALID;
+
+ /* Compare CNID from db and adouble file */
+ if (ad_cnid != db_cnid && adfile_ok == 0) {
+ /* Mismatch, overwrite ad file with value from db */
+ dbd_log(LOGSTD, "CNID mismatch for '%s/%s', CNID db: %u, ad-file: %u",
+ cwdbuf, name, ntohl(db_cnid), ntohl(ad_cnid));
+ ad_init(&ad, vol);
+ if (ad_open(&ad, name, adflags | ADFLAGS_HF | ADFLAGS_RDWR) != 0) {
+ dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s",
+ cwdbuf, name, strerror(errno));
+ return CNID_INVALID;
+ }
+ ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp);
+ ad_flush(&ad);
+ ad_close(&ad, ADFLAGS_HF);
+ }
+
+ return db_cnid;
+}
+
+static void check_orphaned(const char *name)
+{
+ int rc;
+ struct stat sb;
+
+ if (strlen(name) < 3)
+ return;
+
+ rc = lstat(&name[2], &sb);
+
+ if (rc != 0 && errno == ENOENT) {
+ dbd_log(LOGSTD, "Removing orphaned AppleDouble \"%s/%s\"", cwdbuf, name);
+ unlink(name);
+ }
+}
+
+/*
+ This is called recursively for all dirs.
+ volroot=1 means we're in the volume root dir, 0 means we aren't.
+ We use this when checking for netatalk private folders like .AppleDB.
+ did is our parents CNID.
+*/
static int dbd_readdir(int volroot, cnid_t did)
{
- int cwd, ret = 0, encoding_ok;
+ int cwd, ret = 0, adfile_ok, addir_ok;
+ cnid_t cnid = 0;
const char *name;
DIR *dp;
struct dirent *ep;
static struct stat st; /* Save some stack space */
- /* Check for .AppleDouble folder */
- if ((check_addir(volroot)) != 0)
- return -1;
+ /* Check again for .AppleDouble folder, check_adfile also checks/creates it */
+ if ((addir_ok = check_addir(volroot)) != 0)
+ if ( ! (dbd_flags & DBD_FLAGS_SCAN))
+ /* Fatal on rebuild run, continue if only scanning ! */
+ return -1;
- /* Check AppleDouble files in AppleDouble folder */
- if ((ret = read_addir()) != 0)
- return -1;
+ /* Check AppleDouble files in AppleDouble folder, but only if it exists or could be created */
+ if (ADDIR_OK)
+ if ((read_addir()) != 0)
+ if ( ! (dbd_flags & DBD_FLAGS_SCAN))
+ /* Fatal on rebuild run, continue if only scanning ! */
+ return -1;
if ((dp = opendir (".")) == NULL) {
dbd_log(LOGSTD, "Couldn't open the directory: %s",strerror(errno));
}
while ((ep = readdir (dp))) {
+ /* Check if we got a termination signal */
+ if (alarmed)
+ longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */
+
/* Check if its "." or ".." */
if (DIR_DOT_OR_DOTDOT(ep->d_name))
continue;
continue;
}
+ /* Check for special folders in volume root e.g. ".zfs" */
+ if (volroot) {
+ if ((name = check_special_dirs(ep->d_name)) != NULL) {
+ dbd_log(LOGSTD, "Ignoring special dir \"%s\"", name);
+ continue;
+ }
+ }
+
/* Skip .AppleDouble dir in this loop */
if (STRCMP(ep->d_name, == , ADv2_DIRNAME))
continue;
- if ((ret = stat(ep->d_name, &st)) < 0) {
- dbd_log( LOGSTD, "Lost file while reading dir '%s/%s', probably removed: %s", cwdbuf, ep->d_name, strerror(errno));
+ if (!vol->vfs->vfs_validupath(vol, ep->d_name)) {
+ dbd_log(LOGDEBUG, "Ignoring \"%s\"", ep->d_name);
+ continue;
+ }
+
+ if ((ret = lstat(ep->d_name, &st)) < 0) {
+ dbd_log( LOGSTD, "Lost file while reading dir '%s/%s', probably removed: %s",
+ cwdbuf, ep->d_name, strerror(errno));
+ continue;
+ }
+
+ switch (st.st_mode & S_IFMT) {
+ case S_IFREG:
+ case S_IFDIR:
+ case S_IFLNK:
+ break;
+ default:
+ dbd_log(LOGSTD, "Bad filetype: %s/%s", cwdbuf, ep->d_name);
+ if ( ! (dbd_flags & DBD_FLAGS_SCAN)) {
+ if ((unlink(ep->d_name)) != 0) {
+ dbd_log(LOGSTD, "Error removing: %s/%s: %s", cwdbuf, ep->d_name, strerror(errno));
+ }
+ }
continue;
}
+ /**************************************************************************
+ Statistics
+ **************************************************************************/
+ static unsigned long long statcount = 0;
+ static time_t t = 0;
+
+ if (t == 0)
+ t = time(NULL);
+
+ statcount++;
+ if ((statcount % 10000) == 0) {
+ if (dbd_flags & DBD_FLAGS_STATS)
+ dbd_log(LOGSTD, "Scanned: %10llu, time: %10llu s",
+ statcount, (unsigned long long)(time(NULL) - t));
+ }
+
/**************************************************************************
Tests
**************************************************************************/
- /* Check encoding */
- if ( -1 == (encoding_ok = check_name_encoding(ep->d_name)) ) {
- /* If its a file: skipp all other tests now ! */
- /* For dirs we skip tests too, but later */
- if (S_ISREG(st.st_mode))
- continue;
+ /* Check for invalid names and orphaned ._ files */
+ if (S_ISREG(st.st_mode) && (strncmp(ep->d_name, "._", strlen("._")) == 0))
+ check_orphaned(ep->d_name);
+
+ if (!vol->vfs->vfs_validupath(vol, ep->d_name)) {
+ dbd_log(LOGSTD, "Ignoring \"%s/%s\"", cwdbuf, ep->d_name);
+ continue;
}
- /* Check for appledouble file, create if missing */
- if (S_ISREG(st.st_mode)) {
- if ( 0 != check_adfile(ep->d_name, &st))
- continue;
+ /* Check for appledouble file, create if missing, but only if we have addir */
+ const char *name = NULL;
+ adfile_ok = -1;
+ if (ADDIR_OK)
+ adfile_ok = check_adfile(ep->d_name, &st, &name);
+
+ if (!S_ISLNK(st.st_mode)) {
+ if (name == NULL) {
+ name = ep->d_name;
+ } else {
+ update_cnid(did, &st, ep->d_name, name);
+ }
+
+ /* Check CNIDs */
+ cnid = check_cnid(name, did, &st, adfile_ok);
+
+ /* Check EA files */
+ if (vol->v_vfs_ea == AFPVOL_EA_AD)
+ check_eafiles(name);
}
-
+
/**************************************************************************
Recursion
**************************************************************************/
- if (S_ISDIR(st.st_mode)) {
+ if (S_ISDIR(st.st_mode) && cnid) { /* If we have no cnid for it we cant enter recursion */
strcat(cwdbuf, "/");
- strcat(cwdbuf, ep->d_name);
+ strcat(cwdbuf, name);
dbd_log( LOGDEBUG, "Entering directory: %s", cwdbuf);
if (-1 == (cwd = open(".", O_RDONLY))) {
dbd_log( LOGSTD, "Cant open directory '%s': %s", cwdbuf, strerror(errno));
continue;
}
- if (0 != chdir(ep->d_name)) {
+ if (0 != chdir(name)) {
dbd_log( LOGSTD, "Cant chdir to directory '%s': %s", cwdbuf, strerror(errno));
close(cwd);
continue;
}
- ret = dbd_readdir(0, did);
+ ret = dbd_readdir(0, cnid);
fchdir(cwd);
close(cwd);
*(strrchr(cwdbuf, '/')) = 0;
if (ret < 0)
- continue;
+ return -1;
}
}
- /*
- Use results of previous checks
+ /*
+ Use results of previous checks
*/
-
-exit_cleanup:
- closedir(dp);
+ if ((vol->v_adouble == AD_VERSION_EA) && (dbd_flags & DBD_FLAGS_V2TOEA)) {
+ if (rmdir(ADv2_DIRNAME) != 0) {
+ switch (errno) {
+ case ENOENT:
+ break;
+ default:
+ dbd_log(LOGSTD, "Error removing adouble dir \"%s/%s\": %s", cwdbuf, ADv2_DIRNAME, strerror(errno));
+ break;
+ }
+ }
+ }
+ closedir(dp);
return ret;
}
-static int scanvol(struct volinfo *vi, dbd_flags_t flags)
+/*
+ Main func called from cmd_dbd.c
+*/
+int cmd_dbd_scanvol(struct vol *vol_in, dbd_flags_t flags)
{
- /* Dont scanvol on no-appledouble vols */
- if (vi->v_flags & AFPVOL_NOADOUBLE) {
- dbd_log( LOGSTD, "Volume without AppleDouble support: skipping volume scanning.");
- return 0;
- }
-
- /* Make this stuff accessible from all funcs easily */
- volinfo = vi;
- dbd_flags = flags;
+ EC_INIT;
+ struct stat st;
/* Run with umask 0 */
umask(0);
- /* chdir to vol */
- strcpy(cwdbuf, volinfo->v_path);
- if (cwdbuf[strlen(cwdbuf) - 1] == '/')
- cwdbuf[strlen(cwdbuf) - 1] = 0;
- chdir(volinfo->v_path);
-
- /* Start recursion */
- if (dbd_readdir(1, 2) < 0) /* 2 = volumeroot CNID */
- return -1;
-
- return 0;
-}
-
-int cmd_dbd_scanvol(DBD *dbd, struct volinfo *volinfo, dbd_flags_t flags)
-{
- int ret = 0;
+ /* Make vol accessible for all funcs */
+ vol = vol_in;
+ dbd_flags = flags;
/* We only support unicode volumes ! */
- if ( volinfo->v_volcharset != CH_UTF8) {
- dbd_log( LOGSTD, "Not a Unicode volume: %s, %u != %u", volinfo->v_volcodepage, volinfo->v_volcharset, CH_UTF8);
- return -1;
+ if (vol->v_volcharset != CH_UTF8) {
+ dbd_log(LOGSTD, "Not a Unicode volume: %s, %u != %u", vol->v_volcodepage, vol->v_volcharset, CH_UTF8);
+ EC_FAIL;
}
- /* open/create dbd, copy rootinfo key */
- if (NULL == (dbd_rebuild = dbif_init(NULL)))
- return -1;
- if (0 != (dbif_open(dbd_rebuild, NULL, 0)))
- return -1;
- if (0 != (ret = dbif_copy_rootinfokey(dbd, dbd_rebuild)))
- goto exit_cleanup;
+ /*
+ * Get CNID database stamp, cnid_getstamp() passes the buffer,
+ * then cnid_resolve() actually gets the value from the db
+ */
+ cnid_getstamp(vol->v_cdb, stamp, sizeof(stamp));
- dbd_log( LOGSTD, "dumping rebuilddb");
- dbif_dump(dbd_rebuild, 0);
+ if (setjmp(jmp) != 0) {
+ EC_EXIT_STATUS(0); /* Got signal, jump from dbd_readdir */
+ }
- /* scanvol */
- if ( (scanvol(volinfo, flags)) != 0)
- return -1;
+ strcpy(cwdbuf, vol->v_path);
+ chdir(vol->v_path);
+
+ if ((vol->v_adouble == AD_VERSION_EA) && (dbd_flags & DBD_FLAGS_V2TOEA)) {
+ if (lstat(".", &st) != 0)
+ EC_FAIL;
+ if (ad_convert(".", &st, vol, NULL) != 0) {
+ switch (errno) {
+ case ENOENT:
+ break;
+ default:
+ dbd_log(LOGSTD, "Conversion error for \"%s\": %s", vol->v_path, strerror(errno));
+ break;
+ }
+ }
+ }
-exit_cleanup:
- dbif_close(dbd_rebuild);
- return ret;
+ /* Start recursion */
+ EC_NEG1( dbd_readdir(1, htonl(2)) ); /* 2 = volumeroot CNID */
+
+EC_CLEANUP:
+ EC_EXIT;
}
projects / netatalk.git / blobdiff