X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd.c;h=57c56e08daf2e3e833c5100135dae8f696157694;hb=06b7f576daa4a127964febf210869f4729235dc3;hp=a08b92c07a6c573dbde6068407b9b80d2d2b4c52;hpb=0d0481713f2a145802f8afc86750b58f10174fd4;p=netatalk.git diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c index a08b92c0..57c56e08 100644 --- a/etc/cnid_dbd/cmd_dbd.c +++ b/etc/cnid_dbd/cmd_dbd.c @@ -1,6 +1,4 @@ /* - $Id: cmd_dbd.c,v 1.26 2010-04-20 16:46:20 hat001 Exp $ - Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -84,6 +82,7 @@ int nocniddb = 0; /* Dont open CNID database, only scan filesystem */ volatile sig_atomic_t alarmed; +struct volinfo volinfo; /* needed by pack.c:idxname() */ static DBD *dbd; static int verbose; /* Logging flag */ @@ -92,14 +91,17 @@ static struct db_param db_param = { NULL, /* Volume dirpath */ 1, /* bdb logfile autoremove */ 64 * 1024, /* bdb cachesize (64 MB) */ - -1, /* not used ... */ - -1, - "", - -1, - -1, - -1 + DEFAULT_MAXLOCKS, /* maxlocks */ + DEFAULT_MAXLOCKOBJS, /* maxlockobjs */ + 0, /* flush_interval */ + 0, /* flush_frequency */ + 1000, /* txn_frequency */ + 0, /* usock_file */ + -1, /* fd_table_size */ + -1, /* idle_timeout */ + -1 /* max_vols */ }; -static char dbpath[PATH_MAX]; /* Path to the dbd database */ +static char dbpath[MAXPATHLEN+1]; /* Path to the dbd database */ /* Provide some logging @@ -229,7 +231,7 @@ static void free_lock(int lockfd) static void usage (void) { - printf("Usage: dbd [-e|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u \n" + printf("Usage: dbd [-e|-t|-v|-x] -d [-i] | -s [-c|-n]| -r [-c|-f] | -u \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" @@ -266,6 +268,7 @@ static void usage (void) "General options:\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, the CNID must of course\n" @@ -279,7 +282,6 @@ int main(int argc, char **argv) int dump=0, scan=0, rebuild=0, prep_upgrade=0, rebuildindexes=0, dumpindexes=0, force=0; dbd_flags_t flags = 0; char *volpath; - struct volinfo volinfo; int cdir; if (geteuid() != 0) { @@ -289,7 +291,7 @@ int main(int argc, char **argv) /* Inhereting perms in ad_mkdir etc requires this */ ad_setfuid(0); - while ((c = getopt(argc, argv, ":cdefinrsuvx")) != -1) { + while ((c = getopt(argc, argv, ":cdefinrstuvx")) != -1) { switch(c) { case 'c': flags |= DBD_FLAGS_CLEANUP; @@ -310,6 +312,9 @@ int main(int argc, char **argv) case 'r': rebuild = 1; break; + case 't': + flags |= DBD_FLAGS_STATS; + break; case 'u': prep_upgrade = 1; break; @@ -380,12 +385,25 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + /* Enuser dbpath is there, create if necessary */ + struct stat st; + if (stat(volinfo.v_dbpath, &st) != 0) { + if (errno != ENOENT) { + dbd_log( LOGSTD, "Can't stat dbpath \"%s\": %s", volinfo.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)); + exit(EXIT_FAILURE); + } + } + /* Put "/.AppleDB" at end of volpath, get path from volinfo file */ - if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > (PATH_MAX - 1) ) { + if ( (strlen(volinfo.v_dbpath) + strlen("/.AppleDB")) > MAXPATHLEN ) { dbd_log( LOGSTD, "Volume pathname too long"); exit(EXIT_FAILURE); } - strncpy(dbpath, volinfo.v_dbpath, PATH_MAX - 9 - 1); + strncpy(dbpath, volinfo.v_dbpath, MAXPATHLEN - strlen("/.AppleDB")); strcat(dbpath, "/.AppleDB"); /* Check or create dbpath */ @@ -420,10 +438,12 @@ int main(int argc, char **argv) /* Check if -f is requested and wipe db if yes */ if ((flags & DBD_FLAGS_FORCE) && rebuild && (volinfo.v_flags & AFPVOL_CACHE)) { char cmd[8 + MAXPATHLEN]; - snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", dbpath); + close(lockfd); + snprintf(cmd, 8 + MAXPATHLEN, "rm -f \"%s/*\"", dbpath); dbd_log( LOGDEBUG, "Removing old database of volume: '%s'", volpath); system(cmd); dbd_log( LOGDEBUG, "Removed old database."); + lockfd = get_lock(dbpath); } /* @@ -445,11 +465,6 @@ int main(int argc, char **argv) dbif_close(dbd); goto exit_failure; } - - if (dbd_stamp(dbd) < 0) { - dbif_close(dbd); - goto exit_failure; - } } /* Now execute given command scan|rebuild|dump */ @@ -464,9 +479,12 @@ int main(int argc, char **argv) } /* Cleanup */ - if (! nocniddb && dbif_close(dbd) < 0) { - dbd_log( LOGSTD, "Error closing database"); - goto exit_failure; + dbd_log(LOGDEBUG, "Closing db"); + if (! nocniddb) { + if (dbif_close(dbd) < 0) { + dbd_log( LOGSTD, "Error closing database"); + goto exit_failure; + } } exit_success: