lslogins: merge read_utmp() code

The code is used only in lslogins, so it does not make sense to maintain it in libcommon. Signed-off-by: Karel Zak <kzak@redhat.com>
util-linux · Jul 16, 2015 · a6bf40e · a6bf40e · sgn · Jul 13, 2021
1 parent 2b8a9bd
commit a6bf40e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 111 deletions.
diff --git a/include/Makemodule.am b/include/Makemodule.am
@@ -42,7 +42,6 @@ dist_noinst_HEADERS += \
 	include/pt-sgi.h \
 	include/pt-sun.h \
 	include/randutils.h \
-	include/readutmp.h \
 	include/rpmatch.h \
 	include/setproctitle.h \
 	include/statfs_magic.h \

diff --git a/include/readutmp.h b/include/readutmp.h
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
@@ -24,8 +24,7 @@ libcommon_la_SOURCES = \
 	lib/timeutils.c \
 	lib/ttyutils.c \
 	lib/exec_shell.c \
-	lib/strv.c \
-	lib/readutmp.c
+	lib/strv.c
 
 if LINUX
 libcommon_la_SOURCES += \

diff --git a/lib/readutmp.c b/lib/readutmp.c
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/syslog.h>
+#include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 #include <shadow.h>
@@ -35,7 +36,6 @@
 #include <signal.h>
 #include <err.h>
 #include <limits.h>
-
 #include <search.h>
 
 #include <libsmartcols.h>
@@ -56,7 +56,6 @@
 #include "optutils.h"
 #include "pathnames.h"
 #include "logindefs.h"
-#include "readutmp.h"
 #include "procutils.h"
 
 /*
@@ -476,6 +475,37 @@ static struct utmp *get_last_btmp(struct lslogins_control *ctl, const char *user
 
 }
 
+static int read_utmp(char const *file, size_t *nents, struct utmp **res)
+{
+	size_t n_read = 0, n_alloc = 0;
+	struct utmp *utmp = NULL, *u;
+
+	if (utmpname(file) < 0)
+		return -errno;
+
+	setutent();
+	errno = 0;
+
+	while ((u = getutent()) != NULL) {
+		if (n_read == n_alloc) {
+			n_alloc += 32;
+			utmp = xrealloc(utmp, n_alloc * sizeof (struct utmp));
+		}
+		utmp[n_read++] = *u;
+	}
+	if (!u && errno) {
+		free(utmp);
+		return -errno;
+	}
+
+	endutent();
+
+	*nents = n_read;
+	*res = utmp;
+
+	return 0;
+}
+
 static int parse_wtmp(struct lslogins_control *ctl, char *path)
 {
 	int rc = 0;