wm: glendy

Info  •  Files  •  Log  •  Branches

srv: manually parse put message and just write the numbers into the syncmsg

old method casued a bug which proc_put(), accepted "10  1", but some clients did not,
we now are a bit more strict about this.
in long term this generic parsing may be moved into a seprate function.

--- a/srv.c

+++ b/srv.c

@@ -240,11 +240,30 @@

 void

 proc_put(char *s)

 {

-	unsigned int x, y, r;

+	char *xpos, *ypos;

+	unsigned int x, y;

-	sscanf(s, "%u %n", &x, &r);

-	sscanf(s+r, "%u", &y);

+	xpos = strtok(s, " ");

+	ypos = strtok(nil, " ");

+	if(xpos == nil || ypos == nil)

+	{

+		print(playersock, "ERR invalidinput proc_put():"

+		"not enough arguments or malformed string\n");

+		return;

+	}

+	

+	if(!isnum(xpos) || !isnum(num))

+	{

+		print(playersock, "ERR invalidinput proc_put():"

+		"expected string in %s and %s\n", xpos, ypos);

+		

+		return;

+	}

+	

+	x = atoi(xpos);

+	y = atoi(ypos);

+	

 	dprint("put %d %d\n", x, y);

 	if(x >= SzX || x < 0 || y >= SzY || y < 0)

@@ -260,7 +279,7 @@

 		print(playersock, "GLND %d %d\n", x, y);

 	else

 	{

-		strncpy(syncmsg, s, 7);

+		sprintf("%u %u", x, y);

 		/* better be safe than sorry */

 		syncmsg[7] = '\0';

 		dprint("syncmsg = %s\n", syncmsg);