diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-01-24 19:31:53 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1997-01-24 19:31:53 +0000 |
| commit | d733b8a9fbc13a91fa6bd1250930735edba70d31 (patch) | |
| tree | 862257d98451d7a87e8e7683a6a702d2e4f6a866 /usr.sbin | |
| parent | 5214787fd545d0b4fd9880d8f719e997ab70476a (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/menus.c | 12 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 4d85fae50e6c..8c28473016f6 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 4d85fae50e6c..8c28473016f6 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")) |