From 262739658bab36f6dc057dfe68a2f7e43a71e41e Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 30 Sep 2006 21:17:23 +0200 Subject: [PATCH] introduce para_fgets(), a wrapper for fgets() stdio sucks badly. The only serious user of fgets() is para_server's get_user() function. So make it use the wrapper and simplify it as we're at it. --- command.c | 70 +++++++++++++++++++++++++++---------------------------- error.h | 1 + fd.c | 26 +++++++++++++++++++++ fd.h | 4 +++- 4 files changed, 64 insertions(+), 37 deletions(-) diff --git a/command.c b/command.c index 55070a3d..ad3f5041 100644 --- a/command.c +++ b/command.c @@ -31,6 +31,7 @@ #include "net.h" #include "daemon.h" #include "string.h" +#include "fd.h" static RC4_KEY rc4_recv_key; static RC4_KEY rc4_send_key; @@ -1011,51 +1012,48 @@ static int get_user(struct user *user) { char line[MAXLINE]; /* keyword, user, key, perms */ char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE]; - int num; + int num, ret; file_ptr = open_user_list(user_list); if (!file_ptr) return -E_USERLIST; - while (fgets(line, MAXLINE, file_ptr)) { -// PARA_DEBUG_LOG("%s: Read line (%i bytes) " -// "from config file\n", __func__, strlen(line)); + for (;;) { + 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) continue; - if (!strcmp(w, "user") && !strcmp(user->name, n)) { - PARA_DEBUG_LOG("found entry for %s\n", n); - strcpy(user->name, n); - strcpy(user->pubkey_file, k); - user->perms = 0; - char_ptr = p; - num = sscanf(char_ptr, "%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); - user->perms = 0; - while (num > 0) { - num--; - //PARA_DEBUG_LOG("%s: tmp[%i]=%s\n", __func__, - // num, tmp[num]); - if (!strcmp(tmp[num], "AFS_READ")) - user->perms = - user->perms | AFS_READ; - else if (!strcmp(tmp[num], "AFS_WRITE")) - user->perms = - user->perms | AFS_WRITE; - else if (!strcmp(tmp[num], "DB_READ")) - user->perms = user->perms | DB_READ; - else if (!strcmp(tmp[num], "DB_WRITE")) - user->perms = user->perms | DB_WRITE; - else /* unknown permission */ - PARA_WARNING_LOG("unknown permission:" - "%s\n", tmp[num]); - } - fclose(file_ptr); - return 1; + if (strcmp(w, "user") || strcmp(user->name, n)) + continue; + PARA_DEBUG_LOG("found entry for %s\n", n); + strcpy(user->name, n); + strcpy(user->pubkey_file, k); + user->perms = 0; + char_ptr = p; + num = sscanf(char_ptr, "%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); + user->perms = 0; + while (num > 0) { + num--; + if (!strcmp(tmp[num], "AFS_READ")) + user->perms = user->perms | AFS_READ; + else if (!strcmp(tmp[num], "AFS_WRITE")) + user->perms = user->perms | AFS_WRITE; + else if (!strcmp(tmp[num], "DB_READ")) + user->perms = user->perms | DB_READ; + else if (!strcmp(tmp[num], "DB_WRITE")) + user->perms = user->perms | DB_WRITE; + else /* unknown permission */ + PARA_WARNING_LOG("unknown permission: %s\n", + tmp[num]); } + break; } fclose(file_ptr); - return 0; + return ret; } static void init_rc4_keys(void) diff --git a/error.h b/error.h index cb5e2b02..05efb790 100644 --- a/error.h +++ b/error.h @@ -396,6 +396,7 @@ extern const char **para_errlist[]; #define FD_ERRORS \ PARA_ERROR(F_GETFL, "failed to get fd flags"), \ PARA_ERROR(F_SETFL, "failed to set fd flags"), \ + PARA_ERROR(FGETS, "fgets error"), \ #define WRITE_ERRORS \ diff --git a/fd.c b/fd.c index dd07466c..d53a3b45 100644 --- a/fd.c +++ b/fd.c @@ -140,3 +140,29 @@ __must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *strea return 0; return -E_FREAD; } +/** +* paraslash's wrapper for fgets(3) +* \param line pointer to the buffer to store the line +* \param size the size of the buffer given by \a line +* \param f the stream to read from +* +* \return Unlike the standard fgets() function, 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. +*/ +__must_check int para_fgets(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; +} diff --git a/fd.h b/fd.h index 46178bd4..6cb3cbad 100644 --- a/fd.h +++ b/fd.h @@ -23,4 +23,6 @@ int para_select(int n, fd_set *readfds, fd_set *writefds, struct timeval *timeout_tv); int mark_fd_nonblock(int fd); void para_fd_set(int fd, fd_set *fds, int *max_fileno); -__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, FILE *stream); +__must_check int para_fread(void *dest, size_t nbytes, size_t nmemb, + FILE *stream); +__must_check int para_fgets(char *line, int size, FILE *f); -- 2.30.2