server: Move para_fgets() to user_list.c.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index c9d265e55af7cdcddcb03fcb8dbfaeba86a92906..dfd8248c7f21940d7a94b9fe79442f02693a070a 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -13,7 +13,31 @@
 #include "list.h"
 #include "user_list.h"
 
-static struct list_head user_list;
+INITIALIZED_LIST_HEAD(user_list);
+
+/*
+ * Wrapper for fgets(3).
+ *
+ * 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 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;
+}
 
 /*
  * Fill the list of users known to para_server.
@@ -36,7 +60,7 @@ static void populate(char *user_list_file)
                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)
@@ -104,18 +128,13 @@ err:
 void user_list_init(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;
+       list_for_each_entry_safe(u, tmp, &user_list, node) {
+               list_del(&u->node);
+               free(u->name);
+               free_public_key(u->pubkey);
+               free(u);
+       }
        populate(user_list_file);
 }