#include <atalk/logger.h>
#include <atalk/cnid_dbd_private.h>
-#include <atalk/volinfo.h>
+#include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
#include <atalk/util.h>
#include "cmd_dbd.h"
#include "dbd.h"
#include "dbif.h"
#include "db_param.h"
+#include "pack.h"
#define DBOPTIONS (DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN)
int nocniddb = 0; /* Dont open CNID database, only scan filesystem */
-struct volinfo volinfo; /* needed by pack.c:idxname() */
volatile sig_atomic_t alarmed; /* flags for signals */
int db_locked; /* have we got the fcntl lock on lockfile ? */
static void usage (void)
{
printf("dbd (Netatalk %s)\n"
- "Usage: dbd [-
e|-t|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u <path to netatalk volume>\n"
+ "Usage: dbd [-
CeFtvx] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u <path to netatalk volume>\n"
"dbd can dump, scan, reindex and rebuild Netatalk dbd CNID databases.\n"
"dbd must be run with appropiate permissions i.e. as root.\n\n"
"Main commands are:\n"
" -d Dump CNID database\n"
" Option: -i dump indexes too\n\n"
" -s Scan volume:\n"
- " 1. Compare CNIDs in database with volume\n"
- " 2. Check if .AppleDouble dirs exist\n"
- " 3. Check if AppleDouble file exist\n"
- " 4. Report orphaned AppleDouble files\n"
- " 5. Check for directories inside AppleDouble directories\n"
- " 6. Check name encoding by roundtripping, log on error\n"
- " 7. Check for orphaned CNIDs in database (requires -e)\n"
- " 8. Open and close adouble files\n"
" Options: -c Don't check .AppleDouble stuff, only ckeck orphaned.\n"
" -n Don't open CNID database, skip CNID checks.\n\n"
" -r Rebuild volume:\n"
- " 1. Sync CNIDSs in database with volume\n"
- " 2. Make sure .AppleDouble dir exist, create if missing\n"
- " 3. Make sure AppleDouble file exists, create if missing\n"
- " 4. Delete orphaned AppleDouble files\n"
- " 5. Check for directories inside AppleDouble directories\n"
- " 6. Check name encoding by roundtripping, log on error\n"
- " 7. Check for orphaned CNIDs in database (requires -e)\n"
- " 8. Open and close adouble files\n"
" Options: -c Don't create .AppleDouble stuff, only cleanup orphaned.\n"
" -f wipe database and rebuild from IDs stored in AppleDouble\n"
- " files, only available for volumes without 'nocnidcache'\n"
- " option. Implies -e.\n\n"
+ " metadata file or EA. Implies -e.\n\n"
" -u Upgrade:\n"
" Opens the database which triggers any necessary upgrades,\n"
" then closes and exits.\n\n"
"General options:\n"
+ " -C convert from adouble:v2 to adouble:ea (use with -r)\n"
+ " -F location of the afp.conf config file\n"
" -e only work on inactive volumes and lock them (exclusive)\n"
" -x rebuild indexes (just for completeness, mostly useless!)\n"
" -t show statistics while running\n"
" -v verbose\n\n"
- "WARNING:\n"
- "For -r -f restore of the CNID database from the adouble files,\n"
- "the CNID must of course be synched to them files first with a plain -r rebuild!\n"
, VERSION
);
}
dbd_flags_t flags = 0;
char *volpath;
int cdir;
+ AFPObj obj = { 0 };
+ struct vol *vol;
if (geteuid() != 0) {
usage();
/* Inhereting perms in ad_mkdir etc requires this */
ad_setfuid(0);
- while ((c = getopt(argc, argv, ":cdefinrstuvx")) != -1) {
+ while ((c = getopt(argc, argv, ":cCdefFinrstuvx")) != -1) {
switch(c) {
case 'c':
flags |= DBD_FLAGS_CLEANUP;
break;
+ case 'C':
+ flags |= DBD_FLAGS_V2TOEA;
+ break;
case 'd':
dump = 1;
break;
exclusive = 1;
flags |= DBD_FLAGS_FORCE | DBD_FLAGS_EXCL;
break;
+ case 'F':
+ obj.cmdlineconfigfile = strdup(optarg);
+ break;
case ':':
case '?':
usage();
else
setuplog("default:debug", "/dev/tty");
- /* Load .volinfo file */
- if (loadvolinfo(volpath, &volinfo) == -1) {
- dbd_log( LOGSTD, "Not a Netatalk volume at '%s', no .volinfo file at '%s/.AppleDesktop/.volinfo' or unknown volume options", volpath, volpath);
+ /* Load config */
+ if (afp_config_parse(&obj) != 0) {
+ dbd_log( LOGSTD, "Couldn't load afp.conf");
+ exit(EXIT_FAILURE);
+ }
+
+ if (load_volumes(&obj, NULL) != 0) {
+ dbd_log( LOGSTD, "Couldn't load volumes");
+ exit(EXIT_FAILURE);
+ }
+
+ if ((vol = getvolbypath(&obj, volpath)) == NULL) {
+ dbd_log( LOGSTD, "Couldn't find volume for '%s'", volpath);
exit(EXIT_FAILURE);
}
- if (vol_load_charsets(&volinfo) == -1) {
- dbd_log( LOGSTD, "Error loading charsets!");
+
+ if (load_charset(vol) != 0) {
+ dbd_log( LOGSTD, "Couldn't load charsets for '%s'", volpath);
exit(EXIT_FAILURE);
}
- if (volinfo.v_adouble == AD_VERSION_EA)
+ pack_setvol(vol);
+
+ if (vol->v_adouble == AD_VERSION_EA)
dbd_log( LOGDEBUG, "adouble:ea volume");
- else if (volinfo.v_adouble == AD_VERSION2)
+ else if (vol->v_adouble == AD_VERSION2)
dbd_log( LOGDEBUG, "adouble:v2 volume");
else {
dbd_log( LOGSTD, "unknown adouble volume");
exit(EXIT_FAILURE);
}
+ /* -C v2 to ea conversion only on adouble:ea volumes */
+ if ((flags & DBD_FLAGS_V2TOEA) && (vol->v_adouble!= AD_VERSION_EA)) {
+ dbd_log( LOGSTD, "Can't run adouble:v2 to adouble:ea conversion because not an adouble:ea volume");
+ exit(EXIT_FAILURE);
+ }
+
/* Sanity checks to ensure we can touch this volume */
- if (volinfo.v_vfs_ea != AFPVOL_EA_AD && volinfo.v_vfs_ea != AFPVOL_EA_SYS) {
- dbd_log( LOGSTD, "Unknown Extended Attributes option: %u", volinfo.v_vfs_ea);
+ if (vol->v_vfs_ea != AFPVOL_EA_AD && vol->v_vfs_ea != AFPVOL_EA_SYS) {
+ dbd_log( LOGSTD, "Unknown Extended Attributes option: %u", vol->v_vfs_ea);
exit(EXIT_FAILURE);
}
/* Enuser dbpath is there, create if necessary */
struct stat st;
- if (stat(volinfo.v_dbpath, &st) != 0) {
+ if (stat(vol->v_dbpath, &st) != 0) {
if (errno != ENOENT) {
- dbd_log( LOGSTD, "Can't stat dbpath \"%s\": %s", volinfo.v_dbpath, strerror(errno));
+ dbd_log( LOGSTD, "Can't stat dbpath \"%s\": %s", vol->v_dbpath, strerror(errno));
exit(EXIT_FAILURE);
}
- if ((mkdir(volinfo.v_dbpath, 0755)) != 0) {
- dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno));
+ if ((mkdir(vol->v_dbpath, 0755)) != 0) {
+ dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", vol->v_dbpath, strerror(errno));
exit(EXIT_FAILURE);
}
}
/* Put "/.AppleDB" at end of volpath, get path from volinfo file */
- if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) {
+ if ( (strlen(vol->v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) {
dbd_log( LOGSTD, "Volume pathname too long");
exit(EXIT_FAILURE);
}
- strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB"));
+ strncpy(dbpath, vol->v_dbpath, MAXPATHLEN - strlen("/.AppleDB"));
strcat(dbpath, "/.AppleDB");
/* Check or create dbpath */
dbd_log( LOGSTD, "Error dumping database");
}
} else if ((rebuild && ! nocniddb) || scan) {
- if (cmd_dbd_scanvol(dbd, &volinfo, flags) < 0) {
+ if (cmd_dbd_scanvol(dbd, vol, flags) < 0) {
dbd_log( LOGSTD, "Error repairing database.");
}
}
projects / netatalk.git / blobdiff