[PATCH No. 2] ports/150287: Segfault: games/spider crashes after 51 moves

[Pascal Stumpf]

Ok; while we’re here, we can do some more cleanup. :-)

--- spider.c.orig       2010-09-07 00:00:48.000000000 +0200
+++ spider.c    2010-09-07 00:22:34.000000000 +0200
@@ -17,6 +17,7 @@
 #include       "defs.h"
 #include       "globals.h"
 #include       <ctype.h>
+#include       <stdlib.h>
 
 static void    fix_coords();
 
@@ -619,7 +620,7 @@
 
        return (type_names[type]);
 }
-#endif DEBUG
+#endif /* DEBUG */
 
 
 /*
--- movelog.c.orig      1991-09-28 19:46:17.000000000 +0200
+++ movelog.c   2010-09-07 00:00:30.000000000 +0200
@@ -16,6 +16,7 @@
 
 #include       "defs.h"
 #include       "globals.h"
+#include       <stdlib.h>
 #include       <string.h>
 #include       <sys/file.h>
 #include       <ctype.h>
@@ -33,6 +34,9 @@
 
 extern int     cheat_count;
 
+static int card_to_int(CardPtr card);
+static int restore_game(char *str, char *str2);
+
 make_deck_cache()
 {
 CardPtr        tmp;
--- gfx.c.orig  2010-09-07 00:01:08.000000000 +0200
+++ gfx.c       2010-09-07 00:21:23.000000000 +0200
@@ -15,6 +15,7 @@
  */
 #include       "defs.h"
 #include       "globals.h"
+#include       <stdlib.h>
 
 #ifdef ROUND_CARDS
 #include       <X11/Xmu/Drawing.h>
@@ -166,7 +167,7 @@
        gcflags |= GCFont;
 
        textgc = XCreateGC(dpy, RootWindow(dpy, screen), gcflags, &gcv);
-#endif KITLESS
+#endif /* KITLESS */
 
        tmpmap = XCreateBitmapFromData(dpy, RootWindow(dpy, screen),
                logo_bits, logo_width, logo_height);
@@ -1321,7 +1322,7 @@
        XDrawImageString(dpy, message_win, textgc, MESSAGE_X, message_y,
                last_message, strlen(last_message));
 }
-#endif KITLESS
+#endif /* KITLESS */
 
 void
 card_message(str, card)
--- util.c.orig 2010-09-07 00:01:46.000000000 +0200
+++ util.c      2010-09-07 00:02:35.000000000 +0200
@@ -23,6 +23,7 @@
 #include       "xaw_ui.h"
 #endif /* XAW */
 #include       <ctype.h>
+#include       <stdlib.h>
 #include       <string.h>
 #include       <pwd.h>
 
--- xv_stubs.c.orig     2010-09-07 00:01:59.000000000 +0200
+++ xv_stubs.c  2010-09-07 00:03:01.000000000 +0200
@@ -10,6 +10,7 @@
  *      @(#)xv_stubs.c 2.2     90/04/27
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <xview/xview.h>
 #include <xview/panel.h>
--- xv_ui.c.orig        2010-09-07 00:02:12.000000000 +0200
+++ xv_ui.c     2010-09-07 00:03:29.000000000 +0200
@@ -16,6 +16,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <xview/xview.h>
 #include <xview/canvas.h>
 #include <xview/icon_load.h>
--- defs.h.orig 2010-09-07 00:19:00.000000000 +0200
+++ defs.h      2010-09-07 00:20:09.000000000 +0200
@@ -31,7 +31,7 @@
 
 typedef enum   {Faceup, Facedown, Joker}       Type;
 
-#else DEBUG
+#else /* DEBUG */
 
 typedef        char    Suit;
 typedef        char    Rank;
@@ -60,7 +60,7 @@
 #define        Facedown        1
 #define        Joker           2
 
-#endif DEBUG
+#endif /* DEBUG */
 
 #define        NUM_DECKS       2
 #define        NUM_PILES       8
--- globals.h.orig      2010-09-07 00:21:42.000000000 +0200
+++ globals.h   2010-09-07 00:22:04.000000000 +0200
@@ -90,7 +90,7 @@
 void   button_press();
 void   button_release();
 void   do_expand();
-#endif KITLESS
+#endif /* KITLESS */
 
 #ifdef XAW
 Bool   can_get_help_files();
--- windows.c.orig      2010-09-07 00:23:35.000000000 +0200
+++ windows.c   2010-09-07 00:24:05.000000000 +0200
@@ -116,7 +116,7 @@
        XMapWindow(dpy, message_win);
        XMapWindow(dpy, table);
 }
-#endif KITLESS
+#endif /* KITLESS */
 
 #ifndef        KITLESS
 table_init(win)
@@ -140,4 +140,4 @@
         }
         XChangeWindowAttributes(dpy, table, winmask, &winattr);
 }
-#endif KITLESS
+#endif /* KITLESS */
--- events.c.orig       2010-09-07 00:24:57.000000000 +0200
+++ events.c    2010-09-07 00:26:21.000000000 +0200
@@ -16,6 +16,7 @@
 
 #include       "defs.h"
 #include       "globals.h"
+#include       <stdlib.h>
 
 extern int     cheat_count;
 
--- xaw_ui.c.orig       2010-09-07 00:27:06.000000000 +0200
+++ xaw_ui.c    2010-09-07 00:27:28.000000000 +0200
@@ -19,6 +19,7 @@
 #include       "xaw_ui.h"
 
 #include       "spider.bm"
+#include       <stdlib.h>
 
 static XtAppContext    spider_con;
 Widget         toplevel;