X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=d54b619a2d58ef98519f83bd3a88dd331be447b6;hp=cf53c0fa8e538d3cc9ffd66452beeaf998ffd70d;hb=5ceb90b647125035d52ae935a7fdae037b5b50a4;hpb=1a4ab483a2a41160e548e799609f964a7a6f3400

diff --git a/user_list.c b/user_list.c
index cf53c0fa..d54b619a 100644
--- a/user_list.c
+++ b/user_list.c
@@ -13,30 +13,78 @@
 #include "list.h"
 #include "user_list.h"
 
-static struct list_head user_list;
+static INITIALIZED_LIST_HEAD(user_list);
 
 /*
- * Fill the list of users known to para_server.
+ * Wrapper for fgets(3).
  *
- * Populates a linked list of all users in \a user_list_file.  Returns on
- * success, calls exit() on errors.
+ * Unlike fgets(3), an integer value is returned. On success, this function
+ * returns 1. On errors, -E_FGETS is returned. A zero return value indicates an
+ * end of file condition.
  */
-static void populate_user_list(char *user_list_file)
+static int xfgets(char *line, int size, FILE *f)
+{
+again:
+	if (fgets(line, size, f))
+		return 1;
+	if (feof(f))
+		return 0;
+	if (!ferror(f))
+		return -E_FGETS;
+	if (errno != EINTR) {
+		PARA_ERROR_LOG("%s\n", strerror(errno));
+		return -E_FGETS;
+	}
+	clearerr(f);
+	goto again;
+}
+
+/**
+ * Remove all entries from the user list.
+ *
+ * This is called on shutdown and when the user list is reloaded because the
+ * server received SIGHUP.
+ */
+void user_list_deplete(void)
+{
+	struct user *u, *tmpu;
+
+	list_for_each_entry_safe(u, tmpu, &user_list, node) {
+		list_del(&u->node);
+		free(u->name);
+		free_public_key(u->pubkey);
+		free(u);
+	}
+}
+
+/**
+ * Initialize the list of users allowed to connect to para_server.
+ *
+ * \param user_list_file The file containing access information.
+ *
+ * If this function is called for the second time, the contents of the
+ * previous call are discarded, i.e. the user list is reloaded.
+ *
+ * This function either succeeds or calls exit(3).
+ */
+void user_list_init(const char *user_list_file)
 {
 	int ret = -E_USERLIST;
 	FILE *file_ptr = fopen(user_list_file, "r");
+	struct user *u;
 
 	if (!file_ptr)
 		goto err;
+
+	user_list_deplete();
 	for (;;) {
 		int num;
 		char line[255];
 		/* keyword, name, key, perms */
 		char w[255], n[255], k[255], p[255], tmp[4][255];
-		struct user *u;
 		struct asymmetric_key *pubkey;
 
-		ret = para_fgets(line, sizeof(line), file_ptr);
+		ret = xfgets(line, sizeof(line), file_ptr);
 		if (ret <= 0)
 			break;
 		if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
@@ -93,32 +141,6 @@ err:
 	exit(EXIT_FAILURE);
 }
 
-/**
- * Initialize the list of users allowed to connect to para_server.
- *
- * \param user_list_file The file containing access information.
- *
- * If this function is called for the second time, the contents of the
- * previous call are discarded, i.e. the user list is reloaded.
- */
-void init_user_list(char *user_list_file)
-{
-	struct user *u, *tmp;
-	static int initialized;
-
-	if (initialized) {
-		list_for_each_entry_safe(u, tmp, &user_list, node) {
-			list_del(&u->node);
-			free(u->name);
-			free_public_key(u->pubkey);
-			free(u);
-		}
-	} else
-		INIT_LIST_HEAD(&user_list);
-	initialized = 1;
-	populate_user_list(user_list_file);
-}
-
 /**
  * Lookup a user in the user list.
  *
@@ -127,7 +149,7 @@ void init_user_list(char *user_list_file)
  * \return A pointer to the corresponding user struct if the user was found, \p
  * NULL otherwise.
  */
-const struct user *lookup_user(const char *name)
+const struct user *user_list_lookup(const char *name)
 {
 	const struct user *u;
 	list_for_each_entry(u, &user_list, node) {