more tests (2)

diff --git a/gameoflife.c b/gameoflife.c
index 829b7fb1266efa969b521d41e692e5fa3db093f8..ef6b6afb15e07ce80f4735f8a04510e3d024fff1 100644 (file)
--- a/gameoflife.c
+++ b/gameoflife.c
@@ -172,15 +172,19 @@ int main (int argc, char *argv[])
     board_t *board = initboard (xsize, ysize);
 
     /* load data */
-    char *buffer = readdata (file);
+    char *buffer = NULL;
     board_t *element = NULL;
     int xelement = 0;
     int yelement = 0;
-    if (buffer) {
-        element = loadboard (buffer);
-        free (buffer);
+    if (file) {
+        buffer = readdata (file);
+        if (buffer) {
+            element = loadboard (buffer);
+            free (buffer);
+        }
         if (element == NULL) {
             VERBOSE (ERROR, fprintf (stderr, "incorrect file (%s)\n", file));
+            endwin ();
             return 1;
         }
         xelement = (xsize - element->xsize) / 2;
@@ -308,16 +312,14 @@ int main (int argc, char *argv[])
 /* test: gameoflife.exe -e 2>&1 | grep 'no board' */
 /* test: gameoflife.exe -e gameoflife.c 2>&1 | grep 'incorrect file' */
 /* test: gameoflife.exe -h | grep usage */
-/* test: gameoflife.exe -p 2>&1 | grep 'no dictionary' */
 /* test--: gameoflife.exe -p file.gol 2>&1 | grep 'not found' */
 /* test: gameoflife.exe -s 2>&1 | grep 'no speed' */
 /* test: gameoflife.exe -s 0 2>&1 | grep 'incorrect speed' */
 /* test: gameoflife.exe -v 2>&1 | grep missing */
-/* test: gameoflife.exe -x 2>&1 | grep 'no height' */
-/* test: gameoflife.exe -y 2>&1 | grep 'no width' */
+/* test: gameoflife.exe -x 2>&1 | grep 'no width' */
+/* test: gameoflife.exe -y 2>&1 | grep 'no height' */
 /* test: gameoflife.exe _ 2>&1 | grep invalid */
-/* test: echo q | gameoflife.exe -e glider.gol */
-/* test: echo q | gameoflife.exe -e new.gol */
-/* test: { echo clllldc; sleep 2; echo q; } | gameoflife.exe -e glider.gol */
+/* test: echo -n q | gameoflife.exe -e glider.gol */
+/* test: { echo clllldc; sleep 2; echo -n q; } | gameoflife.exe -e glider.gol */
 
 /* vim: set ts=4 sw=4 et: */