[netrek-cvs] server/Vanilla/tools keyman.c, 1.2, 1.3 metaget.c, 1.1, 1.2 players.c, 1.4, 1.5 watchmes.c, 1.1, 1.2

[James Cameron]

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

Modified Files:
	keyman.c metaget.c players.c watchmes.c 
Log Message:


Index: metaget.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/metaget.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- metaget.c	14 Jan 2006 00:48:08 -0000	1.1
+++ metaget.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <netinet/in.h>

Index: watchmes.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/watchmes.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- watchmes.c	21 Mar 2005 05:23:47 -0000	1.1
+++ watchmes.c	22 Apr 2006 02:16:47 -0000	1.2
@@ -18,7 +18,7 @@
 #include "proto.h"
 
 static void spew_mess(struct message *mess);
-static void log(struct message *m);
+static void logmessage(struct message *m);
 
 int main(int argc, char **argv)
 {
@@ -61,7 +61,7 @@
 	    oldmctl++;
 	    if (oldmctl==MAXMESSAGE) oldmctl=0;
 	    if (filter)
-		log(&(messages[oldmctl]));
+		logmessage(&(messages[oldmctl]));
 	    else {
                 MCOPY(&messages[oldmctl],&msg,sizeof(struct message));
 #ifdef RCD
@@ -127,7 +127,7 @@
 }
 
 
-static void log(struct message *m)
+static void logmessage(struct message *m)
 {
     time_t curtime;
     struct tm *tmstruct;

Index: players.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/players.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- players.c	10 Apr 2006 04:24:51 -0000	1.4
+++ players.c	22 Apr 2006 02:16:47 -0000	1.5
@@ -217,9 +217,9 @@
 {
   char buf[2];
   struct sockaddr addr;
-  int len = sizeof(addr);
+  socklen_t addrlen = sizeof(addr);
   int sock = 0;
-  int stat = recvfrom(sock, buf, 1, MSG_TRUNC, &addr, &len);
+  int stat = recvfrom(sock, buf, 1, MSG_TRUNC, &addr, &addrlen);
   if (stat < 0 && errno == ENOTSOCK)
     fprintf(stderr, "players: must be called by netrekd with UDP file descriptor setup\n");
   if (stat < 0) { perror("players: recvfrom"); return; }
@@ -248,7 +248,7 @@
   }
   
   /* send the reply */
-  stat = sendto(sock, packet, strlen(packet), 0, &addr, len);
+  stat = sendto(sock, packet, strlen(packet), 0, &addr, addrlen);
   if (stat < 0) { perror("players: sendto"); return; }
 }
 

Index: keyman.c
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/tools/keyman.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- keyman.c	30 Sep 2005 05:46:19 -0000	1.2
+++ keyman.c	22 Apr 2006 02:16:47 -0000	1.3
@@ -8,6 +8,8 @@
 
 #include <stdio.h>
 #ifdef RSA
+#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/file.h>