user_list.c: Simplify populate_user_list().

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index 8e21b238a26a0e7a4da29e0d210dfd64ecadf74d..5652774e0685fc423b462071d72ef728e8b99547 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,28 +19,26 @@
 static struct list_head user_list;
 
 /*
- * lookup user in user list file. Fills in a user struct containing
- * filename of the user's public key as well as the permissions of that user.
- * Returns 1 on success, 0 if user does not exist and < 0 on errors.
+ * Fill the list of users known to para_server.
+ *
+ * Populates a linked list of all users in \a user_list_file.  Returns on
+ * success, calls exit() on errors.
  */
 static void populate_user_list(char *user_list_file)
 {
-       FILE *file_ptr = NULL;
-       char *char_ptr;
-       char line[MAXLINE];
-       /* keyword, user, key, perms */
-       char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE];
-       int num, ret;
+       int ret = -E_USERLIST;
+       FILE *file_ptr = fopen(user_list_file, "r");
 
-       file_ptr = fopen(user_list_file, "r");
-       ret = -E_USERLIST;
        if (!file_ptr)
-               goto out;
+               goto err;
        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;
+
                ret = para_fgets(line, MAXLINE, file_ptr);
-               if (ret < 0)
-                       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
                if (ret <= 0)
                        break;
                if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
@@ -48,13 +46,12 @@ static void populate_user_list(char *user_list_file)
                if (strcmp(w, "user"))
                        continue;
                PARA_DEBUG_LOG("found entry for %s\n", n);
-               u = para_malloc(sizeof(struct user));
+               u = para_malloc(sizeof(*u));
                u->name = para_strdup(n);
                ret = get_rsa_key(k, &u->rsa, LOAD_PUBLIC_KEY);
                if (ret < 0)
                        break;
-               char_ptr = p;
-               num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
+               num = sscanf(p, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
                        tmp[0], tmp[1], tmp[2], tmp[3]);
                PARA_DEBUG_LOG("found %i perm entries\n", num);
                u->perms = 0;
@@ -74,12 +71,11 @@ static void populate_user_list(char *user_list_file)
                }
                para_list_add(&u->node, &user_list);
        }
-out:
-       if (file_ptr)
-               fclose(file_ptr);
+       fclose(file_ptr);
        if (ret >= 0)
                return;
-       PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+err:
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
        exit(EXIT_FAILURE);
 }