/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* Steve McClure, 1998
*/
-#include "misc.h"
-#include "fnlist.h"
+#include <config.h>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
-#include <sys/types.h>
#ifndef _WIN32
+#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
-#else
-#include <winsock.h>
#endif
+#include "misc.h"
int
-expect(s, match, buf)
- int s;
- int match;
- s_char *buf;
+recvline(int s, char *buf)
{
- int size;
- s_char *p;
- int n;
- int code;
- int newline;
- s_char *ptr;
- int cc;
+ int size;
+ char *p;
+ int n;
+ int code;
+ int newline;
+ char *ptr;
+ int cc;
- size = 1024;
+ size = 1024;
#ifndef _WIN32
- (void) alarm(30);
+ (void)alarm(30);
#endif
- ptr = buf;
- n = recv(s, ptr, size, MSG_PEEK);
- if (n <= 0) {
- fprintf(stderr, "Expecting code %d\n", match);
+ ptr = buf;
+ n = recv(s, ptr, size, MSG_PEEK);
+ if (n <= 0) {
#ifdef _WIN32
- errno = WSAGetLastError();
+ errno = WSAGetLastError();
#endif
- perror("recv");
- return 0;
- }
- size -= n;
- buf[n] = '\0';
- if ((p = strchr(ptr, '\n')) == 0) {
- do {
+ perror("recv");
+ return 0;
+ }
+ size -= n;
+ buf[n] = '\0';
+ if ((p = strchr(ptr, '\n')) == NULL) {
+ do {
#ifndef _WIN32
- cc = read(s, ptr, n);
+ cc = read(s, ptr, n);
#else
- cc = recv(s, ptr, n, 0);
+ cc = recv(s, ptr, n, 0);
#endif
- if (cc < 0) {
+ if (cc < 0) {
#ifdef _WIN32
errno = WSAGetLastError();
#endif
- perror("expect: read");
- return 0;
- }
- if (cc != n) {
- fprintf(stderr,
- "expect: short read (%d not %d)\n",
- cc, n);
- return 0;
- }
- ptr += n;
- if ((n = recv(s, ptr, size, MSG_PEEK)) <= 0) {
- fprintf(stderr, "Expecting %d, got %s\n",
- match, buf);
- return 0;
- }
- size -= n;
- ptr[n] = '\0';
- } while ((p = index(ptr, '\n')) == 0);
- newline = 1 + p - buf;
- *p = 0;
- } else
- newline = 1 + p - ptr;
+ perror("expect: read");
+ return 0;
+ }
+ if (cc != n) {
+ fprintf(stderr, "expect: short read (%d not %d)\n", cc, n);
+ return 0;
+ }
+ ptr += n;
+ if ((n = recv(s, ptr, size, MSG_PEEK)) <= 0) {
+#ifdef _WIN32
+ errno = WSAGetLastError();
+#endif
+ perror("recv");
+ return 0;
+ }
+ size -= n;
+ ptr[n] = '\0';
+ } while ((p = strchr(ptr, '\n')) == 0);
+ newline = 1 + p - buf;
+ *p = 0;
+ } else
+ newline = 1 + p - ptr;
#ifndef _WIN32
- cc = read(s, buf, newline);
+ cc = read(s, buf, newline);
#else
- cc = recv(s, buf, newline, 0);
+ cc = recv(s, buf, newline, 0);
#endif
- if (cc < 0) {
+ if (cc < 0) {
#ifdef _WIN32
- errno = WSAGetLastError();
+ errno = WSAGetLastError();
#endif
- perror("expect: read #2");
- return 0;
- }
- if (cc != newline) {
- fprintf(stderr, "expect: short read #2 (%d not %d)\n",
- cc, newline);
- return 0;
- }
- buf[newline] = '\0';
+ perror("expect: read #2");
+ return 0;
+ }
+ if (cc != newline) {
+ fprintf(stderr, "expect: short read #2 (%d not %d)\n",
+ cc, newline);
+ return 0;
+ }
+ buf[newline] = '\0';
#ifndef _WIN32
- (void) alarm(0);
+ (void)alarm(0);
#endif
- if (!isxdigit(*buf)) {
- fprintf(stderr, "Expecting %d, got %s\n", match, buf);
- return 0;
- }
- if (isdigit(*buf))
- code = *buf - '0';
- else {
- if (isupper(*buf))
- *buf = tolower(*buf);
- code = 10 + *buf - 'a';
- }
- if (code == match)
- return 1;
+ if (!isxdigit(*buf)) {
+ fprintf(stderr, "Malformed line %s\n", buf);
return 0;
+ }
+ if (isdigit(*buf))
+ code = *buf - '0';
+ else {
+ if (isupper(*buf))
+ *buf = tolower(*buf);
+ code = 10 + *buf - 'a';
+ }
+ return code;
+}
+
+int
+expect(int s, int match, char *buf)
+{
+ int code = recvline(s, buf);
+ return code == match;
}
void
-sendcmd(s, cmd, arg)
- int s;
- int cmd;
- s_char *arg;
+sendcmd(int s, char *cmd, char *arg)
{
- extern struct fn fnlist[];
- s_char buf[128];
- int cc;
- int len;
+ char buf[128];
+ int cc;
+ int len;
- (void) sprintf(buf, "%s %s\n", fnlist[cmd].name, arg != 0 ? arg : "");
- len = strlen(buf);
+ (void)sprintf(buf, "%s %s\n", cmd, arg != NULL ? arg : "");
+ len = strlen(buf);
#ifndef _WIN32
- cc = write(s, buf, len);
+ cc = write(s, buf, len);
#else
- cc = send(s, buf, len, 0);
+ cc = send(s, buf, len, 0);
#endif
- if (cc < 0) {
+ if (cc < 0) {
#ifdef _WIN32
- errno = WSAGetLastError();
+ errno = WSAGetLastError();
#endif
- perror("sendcmd: write");
- }
- if (cc != len) {
- fprintf(stderr, "sendcmd: short write (%d not %d)\n", cc, len);
- }
+ perror("sendcmd: write");
+ }
+ if (cc != len) {
+ fprintf(stderr, "sendcmd: short write (%d not %d)\n", cc, len);
+ }
}
projects / empserver / blobdiff