From d733b8a9fbc13a91fa6bd1250930735edba70d31 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Fri, 24 Jan 1997 19:31:53 +0000 Subject: [PATCH] I need to learn to read man pages more closely. readlink() does NOT null append the return string (bleah!) so you need to do it yourself. This explains why Bus and PS/2 meece weren't displayed in the Mouse selection menu. --- release/sysinstall/menus.c | 12 ++++-------- usr.sbin/sade/menus.c | 12 ++++-------- usr.sbin/sysinstall/menus.c | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 4d85fae50e6..8c28473016f 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -328,18 +328,14 @@ DMenu MenuDocumentation = { static int whichMouse(dialogMenuItem *self) { + int i; char buf[BUFSIZ]; - if (!file_readable("/dev/mouse")) { - msgDebug("No /dev/mouse device!\n"); + if (!file_readable("/dev/mouse")) return FALSE; - } - if (readlink("/dev/mouse", buf, sizeof buf) == -1) { - msgDebug("Can't read /dev/mouse symlink!\n"); + if ((i = readlink("/dev/mouse", buf, sizeof buf)) == -1) return FALSE; - } - if (isDebug) - msgDebug("The evil link value is `%s'\n", buf); + buf[i] = '\0'; if (!strcmp(self->prompt, "COM1")) return !strcmp(buf, "/dev/cuaa0"); else if (!strcmp(self->prompt, "COM2")) diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 4d85fae50e6..8c28473016f 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -328,18 +328,14 @@ DMenu MenuDocumentation = { static int whichMouse(dialogMenuItem *self) { + int i; char buf[BUFSIZ]; - if (!file_readable("/dev/mouse")) { - msgDebug("No /dev/mouse device!\n"); + if (!file_readable("/dev/mouse")) return FALSE; - } - if (readlink("/dev/mouse", buf, sizeof buf) == -1) { - msgDebug("Can't read /dev/mouse symlink!\n"); + if ((i = readlink("/dev/mouse", buf, sizeof buf)) == -1) return FALSE; - } - if (isDebug) - msgDebug("The evil link value is `%s'\n", buf); + buf[i] = '\0'; if (!strcmp(self->prompt, "COM1")) return !strcmp(buf, "/dev/cuaa0"); else if (!strcmp(self->prompt, "COM2")) diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 4d85fae50e6..8c28473016f 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -328,18 +328,14 @@ DMenu MenuDocumentation = { static int whichMouse(dialogMenuItem *self) { + int i; char buf[BUFSIZ]; - if (!file_readable("/dev/mouse")) { - msgDebug("No /dev/mouse device!\n"); + if (!file_readable("/dev/mouse")) return FALSE; - } - if (readlink("/dev/mouse", buf, sizeof buf) == -1) { - msgDebug("Can't read /dev/mouse symlink!\n"); + if ((i = readlink("/dev/mouse", buf, sizeof buf)) == -1) return FALSE; - } - if (isDebug) - msgDebug("The evil link value is `%s'\n", buf); + buf[i] = '\0'; if (!strcmp(self->prompt, "COM1")) return !strcmp(buf, "/dev/cuaa0"); else if (!strcmp(self->prompt, "COM2"))