[PATCH] fix stupid cut-and-paste error for msr devices on gentoo boxes.

[elogind.git] / klibc_fixups.c

diff --git a/klibc_fixups.c b/klibc_fixups.c
index eaa240c183fa59c6a34161d21c8ad30ea3d9f9d9..e68ce22b506fe62da91e689bebd1e6dbc4fbd938 100644 (file)
--- a/klibc_fixups.c
+++ b/klibc_fixups.c
@@ -30,19 +30,20 @@
 
 #include "udev.h"
 #include "klibc_fixups.h"
+#include "udev_lib.h"
 #include "logging.h"
 
 #define PW_FILE                "/etc/passwd"
 #define GR_FILE                "/etc/group"
 #define UTMP_FILE      "/var/run/utmp"
 
-
 /* return the id of a passwd style line, selected by the users name */
 static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 {
        unsigned long id = -1;
-       char line[255];
+       char line[LINE_SIZE];
        char *buf;
+       char *bufline;
        size_t bufsize;
        size_t cur;
        size_t count;
@@ -59,19 +60,19 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
        }
 
        /* loop through the whole file */
-
        cur = 0;
-       while (1) {
+       while (cur < bufsize) {
                count = buf_get_line(buf, bufsize, cur);
+               bufline = &buf[cur];
+               cur += count+1;
 
-               strncpy(line, buf + cur, count);
+               if (count >= LINE_SIZE)
+                       continue;
+
+               strncpy(line, bufline, count);
                line[count] = '\0';
                pos = line;
 
-               cur += count+1;
-               if (cur > bufsize)
-                       break;
-
                /* get name */
                name = strsep(&pos, ":");
                if (name == NULL)
@@ -124,38 +125,4 @@ struct group *getgrnam(const char *name)
                return &gr;
 }
 
-
-int ufd = -1;
-
-void setutent()
-{
-       if (ufd < 0)
-               ufd = open(UTMP_FILE, O_RDONLY);
-       fcntl(ufd, F_SETFD, FD_CLOEXEC);
-       lseek(ufd, 0, SEEK_SET);
-}
-
-void endutent() {
-       if (ufd < 0)
-               return;
-       close(ufd);
-       ufd = -1;
-}
-
-struct utmp *getutent(void)
-{
-       static struct utmp utmp;
-       int retval;
-
-       if (ufd < 0) {
-               setutent();
-               if (ufd < 0)
-                       return NULL;
-       }
-       retval = read(ufd, &utmp, sizeof(struct utmp));
-       if (retval < 1)
-               return NULL;
-       return &utmp;
-}
-
 #endif