#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 */
-volatile sig_atomic_t alarmed;
+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 DBD *dbd;
static int verbose; /* Logging flag */
NULL, /* Volume dirpath */
1, /* bdb logfile autoremove */
64 * 1024, /* bdb cachesize (64 MB) */
+ 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
}
}
-static int get_lock(const char *dbpath)
+
+/*!
+ * Get lock on db lock file
+ *
+ * @args cmd (r) !=0: lock, 0: unlock
+ * @args dbpath (r) path to lockfile, only used on first call,
+ * later the stored fd is used
+ * @returns 1 if lock was acquired, 0 if file is already locked, -1 on error
+ */
+int get_lock(int cmd, const char *dbpath)
{
- int lockfd;
+ static int lockfd = -1;
char lockpath[PATH_MAX];
struct flock lock;
struct stat st;
- if ( (strlen(dbpath) + strlen(LOCKFILENAME+1)) > (PATH_MAX - 1) ) {
- dbd_log( LOGSTD, ".AppleDB pathname too long");
- exit(EXIT_FAILURE);
+ if (cmd == 0) {
+ if (lockfd == -1)
+ return -1;
+
+ lock.l_start = 0;
+ lock.l_whence = SEEK_SET;
+ lock.l_len = 0;
+ lock.l_type = F_UNLCK;
+ fcntl(lockfd, F_SETLK, &lock);
+ close(lockfd);
+ lockfd = -1;
+ return 0;
}
- strncpy(lockpath, dbpath, PATH_MAX - 1);
- strcat(lockpath, "/");
- strcat(lockpath, LOCKFILENAME);
- if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0644)) < 0) {
- dbd_log( LOGSTD, "Error opening lockfile: %s", strerror(errno));
- exit(EXIT_FAILURE);
- }
+ if (lockfd == -1) {
+ if ( (strlen(dbpath) + strlen(LOCKFILENAME+1)) > (PATH_MAX - 1) ) {
+ dbd_log( LOGSTD, ".AppleDB pathname too long");
+ return -1;
+ }
+ strncpy(lockpath, dbpath, PATH_MAX - 1);
+ strcat(lockpath, "/");
+ strcat(lockpath, LOCKFILENAME);
- if ((stat(dbpath, &st)) != 0) {
- dbd_log( LOGSTD, "Error statting lockfile: %s", strerror(errno));
- exit(EXIT_FAILURE);
- }
+ if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0644)) < 0) {
+ dbd_log( LOGSTD, "Error opening lockfile: %s", strerror(errno));
+ return -1;
+ }
- if ((chown(lockpath, st.st_uid, st.st_gid)) != 0) {
- dbd_log( LOGSTD, "Error inheriting lockfile permissions: %s", strerror(errno));
- exit(EXIT_FAILURE);
+ if ((stat(dbpath, &st)) != 0) {
+ dbd_log( LOGSTD, "Error statting lockfile: %s", strerror(errno));
+ return -1;
+ }
+
+ if ((chown(lockpath, st.st_uid, st.st_gid)) != 0) {
+ dbd_log( LOGSTD, "Error inheriting lockfile permissions: %s", strerror(errno));
+ return -1;
+ }
}
lock.l_start = 0;
if (fcntl(lockfd, F_SETLK, &lock) < 0) {
if (errno == EACCES || errno == EAGAIN) {
if (exclusive) {
- dbd_log( LOGSTD, "Database is in use and exlusive was requested", strerror(errno));
- exit(EXIT_FAILURE);
+ dbd_log(LOGSTD, "Database is in use and exlusive was requested");
+ return -1;
};
+ dbd_log(LOGDEBUG, "get_lock: couldn't lock");
+ return 0;
} else {
dbd_log( LOGSTD, "Error getting fcntl F_WRLCK on lockfile: %s", strerror(errno));
- exit(EXIT_FAILURE);
+ return -1;
}
}
-
- return lockfd;
-}
-
-static void free_lock(int lockfd)
-{
- struct flock lock;
- lock.l_start = 0;
- lock.l_whence = SEEK_SET;
- lock.l_len = 0;
- lock.l_type = F_UNLCK;
- fcntl(lockfd, F_SETLK, &lock);
- close(lockfd);
+ dbd_log(LOGDEBUG, "get_lock: got lock");
+ return 1;
}
static void usage (void)
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) {
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 */
close(dbdirfd);
}
- /*
- Before we do anything else, check if there is an instance of cnid_dbd
- running already and silently exit if yes.
- */
- lockfd = get_lock(dbpath);
+ /* Get db lock, which exits if exclusive was requested and it already is locked */
+ if ((db_locked = get_lock(1, dbpath)) == -1)
+ goto exit_failure;
/* Prepare upgrade ? */
if (prep_upgrade) {
- if (dbif_prep_upgrade(dbpath))
+ if (dbif_env_remove(dbpath))
goto exit_failure;
goto exit_success;
}
/* 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);
+
+ if ((db_locked = get_lock(0, NULL)) != 0)
+ goto exit_failure;
+
+ snprintf(cmd, 8 + MAXPATHLEN, "rm -rf \"%s\"", dbpath);
dbd_log( LOGDEBUG, "Removing old database of volume: '%s'", volpath);
system(cmd);
+ if ((mkdir(dbpath, 0755)) != 0) {
+ dbd_log( LOGSTD, "Can't create dbpath \"%s\": %s", dbpath, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
dbd_log( LOGDEBUG, "Removed old database.");
+ if ((db_locked = get_lock(1, dbpath)) == -1)
+ goto exit_failure;
}
/*
if ((dbd = dbif_init(dbpath, "cnid2.db")) == NULL)
goto exit_failure;
- if (dbif_env_open(dbd, &db_param, exclusive ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) {
+ if (dbif_env_open(dbd,
+ &db_param,
+ exclusive ? (DBOPTIONS | DB_RECOVER) : DBOPTIONS) < 0) {
dbd_log( LOGSTD, "error opening database!");
goto exit_failure;
}
dbif_close(dbd);
goto exit_failure;
}
-
- if (dbd_stamp(dbd) < 0) {
- dbif_close(dbd);
- goto exit_failure;
- }
}
/* Now execute given command scan|rebuild|dump */
ret = 0;
exit_failure:
- free_lock(lockfd);
+ get_lock(0, NULL);
if ((fchdir(cdir)) < 0)
dbd_log(LOGSTD, "fchdir: %s", strerror(errno));