From bbe8faee2b43a4ca18662dadd3f3f1c7bd8898d1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 13 Feb 2016 07:50:06 +0100
Subject: [PATCH] get code to compile, failing Lua tests

---
 src/util/gamedata.test.c | 25 +++++++++++++++++++++++++
 src/util/password.c      |  4 ++--
 src/util/password.test.c |  3 ++-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/util/gamedata.test.c

diff --git a/src/util/gamedata.test.c b/src/util/gamedata.test.c
new file mode 100644
index 000000000..b28066b97
--- /dev/null
+++ b/src/util/gamedata.test.c
@@ -0,0 +1,25 @@
+#include <platform.h>
+#include "gamedata.h"
+
+#include <CuTest.h>
+#include <tests.h>
+#include <stdio.h>
+
+static void test_gamedata(CuTest * tc)
+{
+    gamedata *data;
+    data = gamedata_open("test.dat", "wb", 0);
+    CuAssertPtrNotNull(tc, data);
+    gamedata_close(data);
+    data = gamedata_open("test.dat", "rb", 0);
+    CuAssertPtrNotNull(tc, data);
+    gamedata_close(data);
+    CuAssertIntEquals(tc, 0, remove("test.dat"));
+}
+
+CuSuite *get_gamedata_suite(void)
+{
+    CuSuite *suite = CuSuiteNew();
+    SUITE_ADD_TEST(suite, test_gamedata);
+    return suite;
+}
diff --git a/src/util/password.c b/src/util/password.c
index 24aff3d01..c7850eec8 100644
--- a/src/util/password.c
+++ b/src/util/password.c
@@ -3,8 +3,8 @@
 
 #include <md5.h>
 #include <crypt_blowfish.h>
-#include <drepper.h>
 #include <mtrand.h>
+#include <drepper.h>
 
 #include <assert.h>
 #include <string.h>
@@ -79,7 +79,7 @@ static const char * password_hash_i(const char * passwd, const char *input, int
                 salt_len = strlen(input);
             }
             assert(salt_len < MAXSALTLEN);
-            stpncpy(salt, input, salt_len);
+            memcpy(salt, input, salt_len);
             salt[salt_len] = 0;
         } else {
             input = password_gensalt(salt, sizeof(salt));
diff --git a/src/util/password.test.c b/src/util/password.test.c
index bee535cdd..3df2d2ed8 100644
--- a/src/util/password.test.c
+++ b/src/util/password.test.c
@@ -1,6 +1,7 @@
 #include <platform.h>
-#include <CuTest.h>
 #include "password.h"
+#include <CuTest.h>
+#include <string.h>
 
 static void test_passwords(CuTest *tc) {
     const char *hash, *expect;