Update copyright notice

[empserver] / src / client / expect.c

diff --git a/src/client/expect.c b/src/client/expect.c
index 3384529397cd434f210048fb4b75c7ed65a7358d..b435a783e6f8a9f7efb04f30ace8549381ae59f4 100644 (file)
--- a/src/client/expect.c
+++ b/src/client/expect.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,10 +25,10 @@
  *  ---
  *
  *  expect.c: Read from the socket, expecting to see a particular code.
- * 
+ *
  *  Known contributors to this file:
- *      Steve McClure, 1998
- *      Markus Armbruster, 2007
+ *     Steve McClure, 1998
+ *     Markus Armbruster, 2007-2013
  */
 
 #include <config.h>
@@ -39,21 +38,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef _WIN32
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#endif
 #include "misc.h"
 #include "proto.h"
 
-#ifdef _WIN32
-#define read(sock, buffer, buf_size) \
-       w32_recv((sock), (buffer), (buf_size), 0)
-#define write(sock, buffer, buf_size) \
-       w32_send((sock), (buffer), (buf_size), 0)
-#endif
-
 int
 recvline(int s, char *buf)
 {
@@ -116,8 +106,8 @@ sendcmd(int s, char *cmd, char *arg)
     ssize_t n;
     int len;
 
-    len = snprintf(buf, sizeof(buf), "%s %s\n",
-                  cmd, arg != NULL ? arg : "");
+    len = snprintf(buf, sizeof(buf), "%s%s%s\n",
+                  cmd, arg ? " " : "", arg ? arg : "");
     if (len >= (int)sizeof(buf)) {
        fprintf(stderr, "%s too long\n", cmd);
        exit(1);