summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorEric Andersen2000-07-06 17:20:46 +0000
committerEric Andersen2000-07-06 17:20:46 +0000
commitf86aee74ce995369a15bfa845d60376a8fc15279 (patch)
tree0a7b0da968ea6aea168ac5944f020f0c759165bc /utility.c
parentb1e379f7f3cd138127b083ab3eb393c07bbbbaea (diff)
downloadbusybox-f86aee74ce995369a15bfa845d60376a8fc15279.zip
busybox-f86aee74ce995369a15bfa845d60376a8fc15279.tar.gz
setkeycodes needs get_console_fd(), so if you disable chvt and deallocvt, but
leave setkeycodes active, busybox will not link. Also fix a trivial use-before-initialize warning. Both fixes from Jon McClintock <jonm@bluemug.com>. -Erik
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/utility.c b/utility.c
index afc0e8f..e1e0f71 100644
--- a/utility.c
+++ b/utility.c
@@ -902,7 +902,7 @@ unsigned long my_getpwnamegid(char *name)
#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR || BB_ID */
-#if (defined BB_CHVT) || (defined BB_DEALLOCVT)
+#if (defined BB_CHVT) || (defined BB_DEALLOCVT) || (defined BB_SETKEYCODES)
#include <linux/kd.h>
@@ -987,7 +987,7 @@ int get_console_fd(char *tty_name)
}
-#endif /* BB_CHVT || BB_DEALLOCVT */
+#endif /* BB_CHVT || BB_DEALLOCVT || BB_SETKEYCODES */
#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED)
@@ -1328,7 +1328,7 @@ extern pid_t* findPidByName( char* pidName)
fatalError( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
/* Now search for a match */
- for (i=1; i<pid_array[0] ; i++) {
+ for (i=1, j=0; i<pid_array[0] ; i++) {
char* p;
struct pid_info info;