]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: remove lib/procutils.c
authorKarel Zak <kzak@redhat.com>
Tue, 7 Sep 2021 15:42:37 +0000 (17:42 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 6 Oct 2021 09:01:54 +0000 (11:01 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
include/Makemodule.am
include/procutils.h [deleted file]
lib/Makemodule.am
lib/procutils.c [deleted file]
meson.build

index f22e37e626fba3891d6a7137ed93b51acb8a211a..b162e456a62a495d22e35748b8a4e82fb77ec072 100644 (file)
@@ -48,7 +48,6 @@ dist_noinst_HEADERS += \
        include/pathnames.h \
        include/pidfd-utils.h \
        include/plymouth-ctrl.h \
-       include/procutils.h \
        include/procfs.h \
        include/pt-bsd.h \
        include/pt-mbr.h \
diff --git a/include/procutils.h b/include/procutils.h
deleted file mode 100644 (file)
index c9f5bb5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef UTIL_LINUX_PROCUTILS
-#define UTIL_LINUX_PROCUTILS
-
-#include <dirent.h>
-#include <sys/types.h>
-
-struct proc_tasks {
-       DIR *dir;
-};
-
-extern struct proc_tasks *proc_open_tasks(pid_t pid);
-extern void proc_close_tasks(struct proc_tasks *tasks);
-extern int proc_next_tid(struct proc_tasks *tasks, pid_t *tid);
-
-struct proc_processes {
-       DIR *dir;
-
-       const char *fltr_name;
-       uid_t fltr_uid;
-
-       unsigned int has_fltr_name : 1,
-                    has_fltr_uid : 1;
-};
-
-extern struct proc_processes *proc_open_processes(void);
-extern void proc_close_processes(struct proc_processes *ps);
-
-extern void proc_processes_filter_by_name(struct proc_processes *ps, const char *name);
-extern void proc_processes_filter_by_uid(struct proc_processes *ps, uid_t uid);
-extern int proc_next_pid(struct proc_processes *ps, pid_t *pid);
-
-extern char *proc_get_command(pid_t pid);
-extern char *proc_get_command_name(pid_t pid);
-
-extern int proc_is_procfs(int fd);
-
-#endif /* UTIL_LINUX_PROCUTILS */
index 6971773c207f837652aa47c9f679a78c8d79f24f..62bea572799df41b78511581aa71a9b41f71783d 100644 (file)
@@ -42,7 +42,6 @@ libcommon_la_SOURCES = \
 if LINUX
 libcommon_la_SOURCES += \
        lib/linux_version.c \
-       lib/procutils.c \
        lib/loopdev.c
 endif
 
diff --git a/lib/procutils.c b/lib/procutils.c
deleted file mode 100644 (file)
index 89a5dfc..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (C) 2011 Davidlohr Bueso <dave@gnu.org>
- * Copyright (C) 2011-2020 Karel Zak <kzak@redhat.com>
- *
- * procutils.c: General purpose procfs parsing utilities
- *
- * No copyright is claimed.  This code is in the public domain; do with
- * it what you wish.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/vfs.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <ctype.h>
-
-#include "procutils.h"
-#include "statfs_magic.h"
-#include "fileutils.h"
-#include "all-io.h"
-#include "c.h"
-
-/*
- * @pid: process ID for which we want to obtain the threads group
- *
- * Returns: newly allocated tasks structure
- */
-struct proc_tasks *proc_open_tasks(pid_t pid)
-{
-       struct proc_tasks *tasks;
-       char path[PATH_MAX];
-
-       snprintf(path, sizeof(path), "/proc/%d/task/", pid);
-
-       tasks = malloc(sizeof(struct proc_tasks));
-       if (tasks) {
-               tasks->dir = opendir(path);
-               if (tasks->dir)
-                       return tasks;
-       }
-
-       free(tasks);
-       return NULL;
-}
-
-/*
- * @tasks: allocated tasks structure
- *
- * Returns: nothing
- */
-void proc_close_tasks(struct proc_tasks *tasks)
-{
-       if (tasks && tasks->dir)
-               closedir(tasks->dir);
-       free(tasks);
-}
-
-/*
- * @tasks: allocated task structure
- * @tid: [output] one of the thread IDs belonging to the thread group
- *        If when an error occurs, it is set to 0.
- *
- * Returns: 0 on success, 1 on end, -1 on failure or no more threads
- */
-int proc_next_tid(struct proc_tasks *tasks, pid_t *tid)
-{
-       struct dirent *d;
-       char *end;
-
-       if (!tasks || !tid)
-               return -EINVAL;
-
-       *tid = 0;
-       errno = 0;
-
-       do {
-               d = readdir(tasks->dir);
-               if (!d)
-                       return errno ? -1 : 1;          /* error or end-of-dir */
-
-               if (!isdigit((unsigned char) *d->d_name))
-                       continue;
-               errno = 0;
-               *tid = (pid_t) strtol(d->d_name, &end, 10);
-               if (errno || d->d_name == end || (end && *end))
-                       return -1;
-
-       } while (!*tid);
-
-       return 0;
-}
-
-/* returns process command path, use free() for result */
-static char *proc_file_strdup(pid_t pid, const char *name)
-{
-       char buf[BUFSIZ], *res = NULL;
-       ssize_t sz = 0;
-       size_t i;
-       int fd;
-
-       snprintf(buf, sizeof(buf), "/proc/%d/%s", (int) pid, name);
-       fd = open(buf, O_RDONLY);
-       if (fd < 0)
-               goto done;
-
-       sz = read_all(fd, buf, sizeof(buf));
-       if (sz <= 0)
-               goto done;
-
-       for (i = 0; i < (size_t) sz; i++) {
-
-               if (buf[i] == '\0')
-                       buf[i] = ' ';
-       }
-       buf[sz - 1] = '\0';
-       res = strdup(buf);
-done:
-       if (fd >= 0)
-               close(fd);
-       return res;
-}
-
-/* returns process command path, use free() for result */
-char *proc_get_command(pid_t pid)
-{
-       return proc_file_strdup(pid, "cmdline");
-}
-
-/* returns process command name, use free() for result */
-char *proc_get_command_name(pid_t pid)
-{
-       return proc_file_strdup(pid, "comm");
-}
-
-struct proc_processes *proc_open_processes(void)
-{
-       struct proc_processes *ps;
-
-       ps = calloc(1, sizeof(struct proc_processes));
-       if (ps) {
-               ps->dir = opendir("/proc");
-               if (ps->dir)
-                       return ps;
-       }
-
-       free(ps);
-       return NULL;
-}
-
-void proc_close_processes(struct proc_processes *ps)
-{
-       if (ps && ps->dir)
-               closedir(ps->dir);
-       free(ps);
-}
-
-void proc_processes_filter_by_name(struct proc_processes *ps, const char *name)
-{
-       ps->fltr_name = name;
-       ps->has_fltr_name = name ? 1 : 0;
-}
-
-void proc_processes_filter_by_uid(struct proc_processes *ps, uid_t uid)
-{
-       ps->fltr_uid = uid;
-       ps->has_fltr_uid = 1;
-}
-
-int proc_next_pid(struct proc_processes *ps, pid_t *pid)
-{
-       struct dirent *d;
-
-       if (!ps || !pid)
-               return -EINVAL;
-
-       *pid = 0;
-       errno = 0;
-
-       do {
-               char buf[BUFSIZ], *p;
-
-               errno = 0;
-               d = readdir(ps->dir);
-               if (!d)
-                       return errno ? -1 : 1;          /* error or end-of-dir */
-
-
-               if (!isdigit((unsigned char) *d->d_name))
-                       continue;
-
-               /* filter out by UID */
-               if (ps->has_fltr_uid) {
-                       struct stat st;
-
-                       if (fstatat(dirfd(ps->dir), d->d_name, &st, 0))
-                               continue;
-                       if (ps->fltr_uid != st.st_uid)
-                               continue;
-               }
-
-               /* filter out by NAME */
-               if (ps->has_fltr_name) {
-                       char procname[256];
-                       FILE *f;
-
-                       snprintf(buf, sizeof(buf), "%s/stat", d->d_name);
-                       f = fopen_at(dirfd(ps->dir), buf, O_CLOEXEC|O_RDONLY, "r");
-                       if (!f)
-                               continue;
-
-                       p = fgets(buf, sizeof(buf), f);
-                       fclose(f);
-                       if (!p)
-                               continue;
-
-                       if (sscanf(buf, "%*d (%255[^)])", procname) != 1)
-                               continue;
-
-                       /* ok, we got the process name. */
-                       if (strcmp(procname, ps->fltr_name) != 0)
-                               continue;
-               }
-
-               p = NULL;
-               errno = 0;
-               *pid = (pid_t) strtol(d->d_name, &p, 10);
-               if (errno || d->d_name == p || (p && *p))
-                       return errno ? -errno : -1;
-
-               return 0;
-       } while (1);
-
-       return 0;
-}
-
-/* checks if fd is file in a procfs;
- * returns 1 if true, 0 if false or couldn't determine */
-int proc_is_procfs(int fd)
-{
-       struct statfs st;
-       int ret;
-
-       do {
-               errno = 0;
-               ret = fstatfs(fd, &st);
-
-               if (ret < 0) {
-                       if (errno != EINTR && errno != EAGAIN)
-                               return 0;
-                       xusleep(250000);
-               }
-       } while (ret != 0);
-
-       return st.f_type == STATFS_PROC_MAGIC;
-}
-
-#ifdef TEST_PROGRAM_PROCUTILS
-
-static int test_tasks(int argc, char *argv[])
-{
-       pid_t tid, pid;
-       struct proc_tasks *ts;
-
-       if (argc != 2)
-               return EXIT_FAILURE;
-
-       pid = strtol(argv[1], (char **) NULL, 10);
-       printf("PID=%d, TIDs:", pid);
-
-       ts = proc_open_tasks(pid);
-       if (!ts)
-               err(EXIT_FAILURE, "open list of tasks failed");
-
-       while (proc_next_tid(ts, &tid) == 0)
-               printf(" %d", tid);
-
-       printf("\n");
-        proc_close_tasks(ts);
-       return EXIT_SUCCESS;
-}
-
-static int test_processes(int argc, char *argv[])
-{
-       pid_t pid;
-       struct proc_processes *ps;
-
-       ps = proc_open_processes();
-       if (!ps)
-               err(EXIT_FAILURE, "open list of processes failed");
-
-       if (argc >= 3 && strcmp(argv[1], "--name") == 0)
-               proc_processes_filter_by_name(ps, argv[2]);
-
-       if (argc >= 3 && strcmp(argv[1], "--uid") == 0)
-               proc_processes_filter_by_uid(ps, (uid_t) atol(argv[2]));
-
-       while (proc_next_pid(ps, &pid) == 0)
-               printf(" %d", pid);
-
-       printf("\n");
-        proc_close_processes(ps);
-       return EXIT_SUCCESS;
-}
-
-static int test_isprocfs(int argc, char *argv[])
-{
-       const char *name = argc > 1 ? argv[1] : "/proc";
-       int fd = open(name, O_RDONLY);
-       int is = 0;
-
-       if (fd >= 0) {
-               is = proc_is_procfs(fd);
-               close(fd);
-       } else
-               err(EXIT_FAILURE, "cannot open %s", name);
-
-       printf("%s: %s procfs\n", name, is ? "is" : "is NOT");
-       return is ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-
-int main(int argc, char *argv[])
-{
-       if (argc < 2) {
-               fprintf(stderr, "usage: %1$s --tasks <pid>\n"
-                               "       %1$s --is-procfs [<dir>]\n"
-                               "       %1$s --processes [---name <name>] [--uid <uid>]\n",
-                               program_invocation_short_name);
-               return EXIT_FAILURE;
-       }
-
-       if (strcmp(argv[1], "--tasks") == 0)
-               return test_tasks(argc - 1, argv + 1);
-       if (strcmp(argv[1], "--processes") == 0)
-               return test_processes(argc - 1, argv + 1);
-       if (strcmp(argv[1], "--is-procfs") == 0)
-               return test_isprocfs(argc - 1, argv + 1);
-
-       return EXIT_FAILURE;
-}
-#endif /* TEST_PROGRAM_PROCUTILS */
index 03e70eab72c2bb5828303e66a989c68fd090282a..f315cbb171928f7158609e9447e68f76b74f3e2f 100644 (file)
@@ -2672,9 +2672,9 @@ exes += exe
 
 # XXX: HAVE_OPENAT && HAVE_DIRFD
 exe = executable(
-  'test_procutils',
-  'lib/procutils.c',
-  c_args : ['-DTEST_PROGRAM_PROCUTILS'],
+  'test_procfs',
+  'lib/procfs.c',
+  c_args : ['-DTEST_PROGRAM_PROCFS'],
   include_directories : dir_include)
 exes += exe