[BusyBox-cvs] r9838 - in trunk/busybox/shell: .

[solar at busybox.net]

Author: solar
Date: 2005-02-09 17:44:31 -0700 (Wed, 09 Feb 2005)
New Revision: 9838

Log:
- no need to check if JOBS is defined. Config.in ensures it.
Modified:
   trunk/busybox/shell/ash.c


Changeset:
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2005-02-09 21:07:23 UTC (rev 9837)
+++ trunk/busybox/shell/ash.c	2005-02-10 00:44:31 UTC (rev 9838)
@@ -12583,7 +12583,7 @@
 	char *prompt;
 	const char *ifs;
 	char *p;
-#if defined(CONFIG_ASH_TIMEOUT) && JOBS
+#if defined(CONFIG_ASH_TIMEOUT)
 	fd_set set;
 	int timeout;
 	struct timeval timeout_struct;
@@ -12595,7 +12595,7 @@
 
 	rflag = 0;
 	prompt = NULL;
-#if defined(CONFIG_ASH_TIMEOUT) && JOBS
+#if defined(CONFIG_ASH_TIMEOUT)
 	timeout = 0;
 
 	while ((i = nextopt("p:rt:")) != '\0')
@@ -12607,7 +12607,7 @@
 			prompt = optionarg;
 		else if (i == 'r')
 			rflag = 1;
-#if defined(CONFIG_ASH_TIMEOUT) && JOBS
+#if defined(CONFIG_ASH_TIMEOUT)
 		else
 			timeout = atoi(optionarg);
 #endif
@@ -12619,7 +12619,7 @@
 		error("arg count");
 	if ((ifs = bltinlookup("IFS")) == NULL)
 		ifs = defifs;
-#if defined(CONFIG_ASH_TIMEOUT) && JOBS
+#if defined(CONFIG_ASH_TIMEOUT)
 	c = 0;
 #endif
 	status = 0;
@@ -12627,7 +12627,7 @@
 	backslash = 0;
 
 	STARTSTACKSTR(p);
-#if defined(CONFIG_ASH_TIMEOUT) && JOBS
+#if defined(CONFIG_ASH_TIMEOUT)
 	if (timeout > 0) {
 		tcgetattr(0, &tty);
 		old_tty = tty;
@@ -12642,8 +12642,7 @@
 		timeout_struct.tv_sec = timeout;
 		timeout_struct.tv_usec = 0;
 
-		i = select (FD_SETSIZE, &set, NULL, NULL, &timeout_struct);
-		if(i == 1)
+		if ((i = select (FD_SETSIZE, &set, NULL, NULL, &timeout_struct)) == 1)
 		{
 			read(0, &c, 1);
 			if(c == '\n' || c == 4) /* Handle newlines and EOF */