X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=klibc_fixups.c;h=d1a452a44981bc948bfb9659db9f0a773d5d3a34;hb=8372907752159970c86c3f7cc565c35cf2fa1ef9;hp=1241eb7d108061c98fc2af0c114f807dfe757983;hpb=534c853df52810b63b126e7e43d051a682829464;p=elogind.git

diff --git a/klibc_fixups.c b/klibc_fixups.c
index 1241eb7d1..d1a452a44 100644
--- a/klibc_fixups.c
+++ b/klibc_fixups.c
@@ -28,35 +28,50 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
+#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;
-	FILE *file;
-	char buf[255];
+	char line[LINE_SIZE];
+	char *buf;
+	char *bufline;
+	size_t bufsize;
+	size_t cur;
+	size_t count;
 	char *pos;
 	char *name;
 	char *idstr;
 	char *tail;
 
-	file = fopen(dbfile, "r");
-	if (file == NULL) {
-		dbg("unable to open file '%s'", dbfile);
+	if (file_map(dbfile, &buf, &bufsize) == 0) {
+		dbg("reading '%s' as db file", dbfile);
+	} else {
+		dbg("can't open '%s' as db file", dbfile);
 		return -1;
 	}
 
-	while (1) {
-		pos = fgets(buf, sizeof(buf), file);
-		if (pos == NULL)
-			break;
+	/* loop through the whole file */
+	cur = 0;
+	while (cur < bufsize) {
+		count = buf_get_line(buf, bufsize, cur);
+		bufline = &buf[cur];
+		cur += count+1;
+
+		if (count >= LINE_SIZE)
+			continue;
+
+		strncpy(line, bufline, count);
+		line[count] = '\0';
+		pos = line;
 
 		/* get name */
 		name = strsep(&pos, ":");
@@ -74,7 +89,7 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 
 		if (strcmp(uname, name) == 0) {
 			id = strtoul(idstr, &tail, 10);
-			if (tail == NULL)
+			if (tail[0] != '\0')
 				id = -1;
 			else
 				dbg("id for '%s' is '%li'", name, id);
@@ -82,7 +97,7 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 		}
 	}
 
-	fclose(file);
+	file_unmap(buf, bufsize);
 	return id;
 }