diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2021-01-07 16:08:43 +0100 |
|---|---|---|
| committer | Christian Göttsche <cgzones@googlemail.com> | 2021-01-07 16:10:05 +0100 |
| commit | d800d7a3cef989e47778c0a18b623a44e299c9f3 (patch) | |
| tree | 8494874f4ec6f5799fc4b63122733661594a45d6 /dragonflybsd | |
| parent | 27db9297b77c7dd1cb48f334fded7f3c21d5730c (diff) | |
Drop usage of formatted error messages from <err.h>
They do not clean up the ncurses environment, leaving the terminal in a
broken state.
Also drop bare usage of exit(3).
Diffstat (limited to 'dragonflybsd')
| -rw-r--r-- | dragonflybsd/DragonFlyBSDProcessList.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/dragonflybsd/DragonFlyBSDProcessList.c b/dragonflybsd/DragonFlyBSDProcessList.c index d935a72c..edf2c863 100644 --- a/dragonflybsd/DragonFlyBSDProcessList.c +++ b/dragonflybsd/DragonFlyBSDProcessList.c @@ -15,7 +15,6 @@ in the source distribution for its full text. #include <sys/types.h> #include <sys/sysctl.h> #include <sys/user.h> -#include <err.h> #include <fcntl.h> #include <limits.h> #include <string.h> @@ -112,7 +111,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, ui dfpl->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf); if (dfpl->kd == NULL) { - errx(1, "kvm_open: %s", errbuf); + CRT_fatalError("kvm_openfiles() failed"); } return pl; @@ -294,25 +293,20 @@ static inline void DragonFlyBSDProcessList_scanJails(DragonFlyBSDProcessList* df char* nextpos; if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) { - fprintf(stderr, "initial sysctlbyname / jail.list failed\n"); - exit(3); + CRT_fatalError("initial sysctlbyname / jail.list failed"); } retry: if (len == 0) return; jls = xMalloc(len); - if (jls == NULL) { - fprintf(stderr, "xMalloc failed\n"); - exit(4); - } + if (sysctlbyname("jail.list", jls, &len, NULL, 0) == -1) { if (errno == ENOMEM) { free(jls); goto retry; } - fprintf(stderr, "sysctlbyname / jail.list failed\n"); - exit(5); + CRT_fatalError("sysctlbyname / jail.list failed"); } if (dfpl->jails) { |