[netrek-cvs] server/Vanilla/newstartd newaccess.c, 1.3, 1.4 newstartd.c, 1.8, 1.9

[James Cameron]

Update of /cvsroot/netrek/server/Vanilla/newstartd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6838/newstartd

Modified Files:
	newaccess.c newstartd.c 
Log Message:
netrekd compilation fixes

Index: newstartd.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/newstartd/newstartd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- newstartd.c	22 Apr 2006 02:16:46 -0000	1.8
+++ newstartd.c	8 May 2006 08:50:21 -0000	1.9
@@ -36,21 +36,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <signal.h>
+#include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <arpa/inet.h>
 
 #include "defs.h"
-#include INC_STRINGS
 #include INC_FCNTL
 #include "struct.h"
 #include "data.h"
@@ -383,7 +376,7 @@
   struct sockaddr_in naddr;
   socklen_t addrlen;
   fd_set accept_fds;
-  int len, i, st, newsock;
+  int i, st, newsock;
   
   int foo = 1;
   
@@ -617,22 +610,22 @@
   pr = &(prog[port_idx]);
   switch (pr->nargs) {
   case 0:
-    execl (pr->prog, pr->progname, peerhostname, 0);
+    execl (pr->prog, pr->progname, peerhostname, (char *) NULL);
     break;
   case 1:
-    execl (pr->prog, pr->progname, pr->arg[0], peerhostname, 0);
+    execl (pr->prog, pr->progname, pr->arg[0], peerhostname, (char *) NULL);
     break;
   case 2:
     execl (pr->prog, pr->progname, pr->arg[0], pr->arg[1], 
-	   peerhostname, 0);
+	   peerhostname, (char *) NULL);
     break;
   case 3:
     execl (pr->prog, pr->progname, pr->arg[0], pr->arg[1], 
-	   pr->arg[2], peerhostname, 0);
+	   pr->arg[2], peerhostname, (char *) NULL);
     break;
   case 4:
     execl (pr->prog, pr->progname, pr->arg[0], pr->arg[1], 
-	   pr->arg[2], pr->arg[3], peerhostname, 0);
+	   pr->arg[2], pr->arg[3], peerhostname, (char *) NULL);
     break;
   default: ;
   }

Index: newaccess.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/newstartd/newaccess.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- newaccess.c	22 Apr 2006 02:16:46 -0000	1.3
+++ newaccess.c	8 May 2006 08:50:21 -0000	1.4
@@ -13,6 +13,7 @@
 #include <netdb.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #include <signal.h>
 
@@ -53,10 +54,10 @@
     char		line[256];
     register char	*cp;
     int			canplay;
-    int			ncanplay;
-    int			netmatch;
+    int			ncanplay = 0;
+    int			netmatch = 0;
     int			count, sockt;
-    unsigned LONG	net_addr;
+    in_addr_t		net_addr;
     struct netent	*np;
     struct sockaddr_in	addr;
     socklen_t		addrlen;
@@ -66,7 +67,7 @@
     char		snet_name[256];
     int			snetmatch;
     int			sncanplay;
-    unsigned LONG	snet_addr;
+    in_addr_t		snet_addr;
     static int		snet_gotconf = 0;
 #endif
 
@@ -147,9 +148,9 @@
     
     np = getnetbyaddr(net_addr, AF_INET);
     if (np != NULL)
-	(void) strcpy(net_name, np->n_name);
+	strcpy(net_name, np->n_name);
     else
-	(void) strcpy(net_name,inet_ntoa(*(struct in_addr *)&net_addr));
+	strcpy(net_name,inet_ntoa(*(struct in_addr *)&net_addr));
     
 #ifdef SUBNET
     snet_addr = inet_snetof(addr.sin_addr.s_addr);