X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=adu.c;h=b227589dbbb8e5f467421178c1d78ae052e1efb0;hb=d623adf133aaaee36091b840b8644c1884cd970c;hp=787b0e899d18cb86b20c53263603bcee735ba8ec;hpb=c9621313e2699755e65d6424fd4546c33924f272;p=adu.git

diff --git a/adu.c b/adu.c
index 787b0e8..b227589 100644
--- a/adu.c
+++ b/adu.c
@@ -1,4 +1,20 @@
-/** \file adu.c The main functions used by all modes of operation. */
+/*
+ * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file adu.c \brief The main functions used by all modes of operation. */
+
+/**
+ * \mainpage adu API reference
+ *
+ * - Modes of operation: \ref select.c, \ref create.c, \ref interactive.c
+ * - User handling: \ref user.c
+ * - Error handling: \ref error.h
+ * - Library-type functions: \ref fd.c, \ref format.c, \ref string.c, \ref portable_io.h, \ref bloom.c
+ */
+
 #include "adu.h"
 #include <dirent.h> /* readdir() */
 #include <pwd.h>
@@ -11,7 +27,14 @@
 #include "string.h"
 #include "error.h"
 
+/** Define the array of error descriptions. */
 DEFINE_ERRLIST;
+
+/**
+ * The error code of the last called osl library function.
+ *
+ * \sa osl().
+ */
 int osl_errno;
 
 /** In case a signal is received, its number is stored here. */
@@ -106,6 +129,7 @@ static void close_dir_table(void)
 
 	if (!dir_table)
 		return;
+	NOTICE_LOG("closing dir table\n");
 	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
 	if (ret < 0)
 		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
@@ -113,7 +137,7 @@ static void close_dir_table(void)
 	dir_table = NULL;
 }
 
-void close_all_tables(void)
+static void close_all_tables(void)
 {
 	close_dir_table();
 	close_user_tables();
@@ -124,6 +148,12 @@ static void signal_handler(int s)
 	signum = s;
 }
 
+/**
+ * Check whether to terminate adu.
+ *
+ * Check whether a signal was caught that should terminate the
+ * adu process. If yes, close all osl tables and exit gracefully.
+ */
 void check_signals(void)
 {
 	if (likely(!signum))
@@ -144,17 +174,29 @@ static int init_signals(void)
 	return 1;
 }
 
+/**
+ * Open the directory table.
+ *
+ * \param create If non-zero, create the table first.
+ *
+ * \return Standard.
+ */
 int open_dir_table(int create)
 {
+
+	if (dir_table)
+		return 1;
 	dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
 
 	if (create) {
+		NOTICE_LOG("creating dir table\n");
 		int ret = osl(osl_create_table(&dir_table_desc));
 		if (ret < 0) {
 			free((char *)dir_table_desc.dir);
 			return ret;
 		}
 	}
+	INFO_LOG("opening dir table\n");
 	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
 
@@ -179,7 +221,7 @@ static int check_args(void)
 	return 1;
 }
 
-static int print_complete_help_and_die(void)
+static void print_complete_help_and_die(void)
 {
 	const char **line;
 
@@ -209,6 +251,17 @@ static int print_complete_help_and_die(void)
 	exit(EXIT_FAILURE);
 }
 
+/**
+ * The main function of adu.
+ *
+ * \param argc Usual argument count.
+ * \param argv Usual argument vector.
+ *
+ * Check command line options, init the signal handlers and
+ * call the main function of the selected mode.
+ *
+ * \return \p EXIT_SUCCESS on success, \p EXIT_FAILURE otherwise.
+ */
 int main(int argc, char **argv)
 {
 	int ret;
@@ -249,6 +302,7 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		goto out;
 out:
+	close_all_tables();
 	if (ret < 0) {
 		ERROR_LOG("%s\n", adu_strerror(-ret));
 		return -EXIT_FAILURE;