Merge branch 'readline'

[empserver] / src / client / secure.c

diff --git a/src/client/secure.c b/src/client/secure.c
index 258ee313c41948d8b5269343d3d3f44b181fa6b5..14bb6d1fe27ef93eef90a16b8371177debffb51b 100644 (file)
--- a/src/client/secure.c
+++ b/src/client/secure.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,40 +25,83 @@
  *  ---
  *
  *  secure.c: Check redir etc. to protect against tampering deity
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2017
  */
 
 #include <config.h>
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
 #include <string.h>
 #include "ringbuf.h"
 #include "secure.h"
 
-struct ring recent_input;
+static struct ring recent_input;
 
+/*
+ * Remember input @inp for a while.
+ */
 void
-save_input(char *inp)
+save_input(char inp)
 {
-    size_t len = strlen(inp);
-    int left;
+    int eol;
 
-    left = ring_putm(&recent_input, inp, len);
-    if (left < 0) {
-       ring_discard(&recent_input, ring_search(&recent_input, "\n"));
-       ring_putm(&recent_input, inp, len);
+    while (ring_putc(&recent_input, inp) < 0) {
+       eol = ring_search(&recent_input, "\n", 0);
+       assert(eol >= 0);
+       ring_discard(&recent_input, eol + 1);
     }
 }
 
+/*
+ * Can you still remember a line of input that ends with @tail?
+ * It must end with a newline.
+ */
 int
 seen_input(char *tail)
 {
-    int dist = ring_search(&recent_input, tail);
+    size_t len = strlen(tail);
 
-    if (dist < 0)
-       return 0;
+    assert(len && tail[len - 1] == '\n');
+    return ring_search(&recent_input, tail, 0) >= 0;
+}
 
-    ring_discard(&recent_input, dist + strlen(tail));
-    return 1;
+/*
+ * Can you still remember input that looks like an execute @arg?
+ * @arg must end with a newline.
+ */
+int
+seen_exec_input(char *arg)
+{
+    size_t len = strlen(arg);
+    int n, i, j, ch;
+    unsigned char buf[RING_SIZE + 1];
+
+    assert(len && arg[len - 1] == '\n');
+
+    n = 1;
+    for (;;) {
+       /* find next line ending with arg */
+       n = ring_search(&recent_input, arg, n + 1);
+       if (n <= 0)
+           return 0;
+
+       /* extract command (same or previous line) */
+       i = n - 1;
+       if (ring_peek(&recent_input, i) == '\n')
+           i--;
+       j = sizeof(buf);
+       buf[--j] = 0;
+       for (; i >= 0 && (ch = ring_peek(&recent_input, i)) != '\n'; i--)
+           buf[--j] = ch;
+
+       /* compare command */
+       for (; isspace(buf[j]); j++) ;
+       for (i = j; buf[i] && !isspace(buf[i]); i++) ;
+       if (i - j >= 2 && !strncmp("execute", (char *)buf + j, i - j))
+           return 1;
+    }
 }