randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-10-19 16:07:28 +02:00
parent 3b3ccdc5bc
commit 36df04837a
4 changed files with 7 additions and 2 deletions

View File

@ -1271,6 +1271,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC;
*/ */
int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC; int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC;
#else #else
#define MAX_HISTORY 0
int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
#define read_line_input(prompt, command, maxsize, state) \ #define read_line_input(prompt, command, maxsize, state) \
read_line_input(prompt, command, maxsize) read_line_input(prompt, command, maxsize)

View File

@ -562,13 +562,15 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv)
} }
{ {
struct timeval tv;
struct timeval *tv_ptr = NULL; struct timeval *tv_ptr = NULL;
#if ENABLE_FEATURE_TELNETD_INETD_WAIT
struct timeval tv;
if ((opt & OPT_WAIT) && !G.sessions) { if ((opt & OPT_WAIT) && !G.sessions) {
tv.tv_sec = sec_linger; tv.tv_sec = sec_linger;
tv.tv_usec = 0; tv.tv_usec = 0;
tv_ptr = &tv; tv_ptr = &tv;
} }
#endif
count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr); count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr);
} }
if (count == 0) /* "telnetd -w SEC" timed out */ if (count == 0) /* "telnetd -w SEC" timed out */

View File

@ -513,8 +513,8 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
/* xxx_shift and xxx_scale variables allow us to replace /* xxx_shift and xxx_scale variables allow us to replace
* expensive divides with multiply and shift */ * expensive divides with multiply and shift */
unsigned pmem_shift, pmem_scale, pmem_half; unsigned pmem_shift, pmem_scale, pmem_half;
unsigned tmp_unsigned;
#if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
unsigned tmp_unsigned;
unsigned pcpu_shift, pcpu_scale, pcpu_half; unsigned pcpu_shift, pcpu_scale, pcpu_half;
unsigned busy_jifs; unsigned busy_jifs;
#endif #endif

View File

@ -53,6 +53,8 @@
#include "math.h" #include "math.h"
#if ENABLE_ASH_RANDOM_SUPPORT #if ENABLE_ASH_RANDOM_SUPPORT
# include "random.h" # include "random.h"
#else
# define CLEAR_RANDOM_T(rnd) ((void)0)
#endif #endif
#if defined SINGLE_APPLET_MAIN #if defined SINGLE_APPLET_MAIN