#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-#endif
#include <sys/time.h>
+#ifdef SOCKET_AVAIL
+# include HEADER_SOCKET
+# if defined HAVE_SYS_SOCKET_H
+# include <netinet/in.h>
+# include <arpa/inet.h>
+# include <netdb.h>
+# endif
+#endif
#if FD_HEADER_OK
# include HEADER_FD
#endif
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include "i_string.h"
#include "cmdlexcl.h"
cl_console::input_avail(void)
{
struct timeval tv;
- int i;
+ UCSOCKET_T i;
if ((i= get_in_fd()) < 0)
return(0);
add_console(mk_console(port_number_option.get_value((long)0)));
#endif
+ /* The following code is commented out because it produces gcc warnings
+ * newcmd.cc: In member function `virtual int cl_commander::init()':
+ * newcmd.cc:785: warning: 'Config' might be used uninitialized in this function
+ * newcmd.cc:786: warning: 'cn' might be used uninitialized in this function
+ */
+ /*
char *Config= config_file_option.get_value(Config);
char *cn= console_on_option.get_value(cn);
+ */
+ /* Here shoud probably be something else, but is still better then the former code... */
+ char *Config= config_file_option.get_value("");
+ char *cn= console_on_option.get_value("");
if (cn)
{
exec_on(con, Config);
need_config= DD_FALSE;
}
- if (need_config)
+ if (need_config &&
+ Config &&
+ *Config)
{
FILE *fc= fopen(Config, "r");
if (!fc)
fd_num= 0;
for (i= 0; i < cons->count; i++)
{
- int fd;
+ UCSOCKET_T fd;
class cl_console *c= (class cl_console*)(cons->at(i));
if ((fd= c->get_in_fd()) >= 0)
{
int
cl_commander::proc_input(void)
{
- int i;
+ UCSOCKET_T i;
for (i= 0; i < fd_num; i++)
if (FD_ISSET(i, &active_set))