Changeset 182

Timestamp:

06/10/07 11:56:57 (2 years ago)

Author:

takkaria

Message:

• Clean up autoconf support more:
  
  • we never make use of info on what system we're built on, so remove config.sub and config.guess
    
  • stop checking for things we never use, or we use irrespectively of whether they're detected or not
    
  • use better SDL checking code
    
  • fix SOURCE line in src/Makefile so dependencies are generated once again
    
• Move signals code to signals.c, and permissions grabbing code to z-file.c
  
• Clean up the macros in z-virt.h
  
• Remove autoconf.h.in (autogenerated by autoheader, so unnecessary)
  
• Remove various double-includes and simplify bits of the header files
  

diff: +586 lines, -3898 lines, -3312 net.

Files:

• trunk/acinclude.m4 (modified) (4 diffs)
• trunk/config.guess (deleted)
• trunk/config.sub (deleted)
• trunk/configure.ac (modified) (10 diffs)
• trunk/mk/objective.mk (modified) (1 diff)
• trunk/mk/rules.mk.in (modified) (5 diffs)
• trunk/src/Makefile (modified) (1 diff)
• trunk/src/Makefile.src (modified) (1 diff)
• trunk/src/autoconf.h.in (deleted)
• trunk/src/config.h (modified) (3 diffs)
• trunk/src/externs.h (modified) (2 diffs)
• trunk/src/files.c (modified) (2 diffs)
• trunk/src/h-basic.h (modified) (5 diffs)
• trunk/src/signals.c (added)
• trunk/src/z-file.c (modified) (7 diffs)
• trunk/src/z-file.h (modified) (1 diff)
• trunk/src/z-virt.h (modified) (1 diff)

trunk/acinclude.m4

@@ -101 +101 @@
-
-  if test x$sdl_exec_prefix != x ; then
-    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-    fi
-  fi
-  if test x$sdl_prefix != x ; then
-    sdl_args="$sdl_args --prefix=$sdl_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_prefix/bin/sdl-config
-    fi
-  fi
-
-  if test "x$prefix" != xNONE; then
-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  fi
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       CXXFLAGS="$ac_save_CXXFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          CXXFLAGS="$ac_save_CXXFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
-                    , enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-    fi
-  fi
-  if test x$sdl_prefix != x ; then
-    sdl_args="$sdl_args --prefix=$sdl_prefix"
-    if test x${SDL_CONFIG+set} != xset ; then
-      SDL_CONFIG=$sdl_prefix/bin/sdl-config
-    fi
-  fi
-
-  if test "x$prefix" != xNONE; then
-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  fi
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-  no_sdl=""
-  if test "$SDL_CONFIG" = "no" ; then
-    no_sdl=yes
-  else
-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_sdltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $SDL_CFLAGS"
-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-      LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
-      rm -f conf.sdltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.sdltest");
-  */
-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_sdl_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_sdl_version");
-     exit(1);
-   }
-
-   if (($sdl_major_version > major) ||
-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       CXXFLAGS="$ac_save_CXXFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_sdl" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$SDL_CONFIG" = "no" ; then
-       echo "*** The sdl-config script installed by SDL could not be found"
-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
-       echo "*** full path to sdl-config."
-     else
-       if test -f conf.sdltest ; then
-        :
-       else
-          echo "*** Could not run SDL test program, checking why..."
-          CFLAGS="$CFLAGS $SDL_CFLAGS"
-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-          LIBS="$LIBS $SDL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          CXXFLAGS="$ac_save_CXXFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     SDL_CFLAGS=""
-     SDL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(SDL_CFLAGS)
-  AC_SUBST(SDL_LIBS)
-  rm -f conf.sdltest
-])
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl 
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
-            sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
-                    , enable_sdltest=yes)
-
-  if test x$sdl_exec_prefix != x ; then
-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-     if test x${SDL_CONFIG+set} != xset ; then
@@ -475 +113 @@
-  fi
-
-
-
-
+
-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
@@ -585 +221 @@
-#include <stdio.h>
-#include "SDL.h"
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
@@ -616 +247 @@
-  rm -f conf.sdltest
-])
+

trunk/configure.ac

@@ -1 +1 @@
-dnl Process this file with autoconf to produce a configure script.
-angband], [3.0.8], [bugs@rephial.org
+Angband], [3.0.8], [bugs@rephial.org], [angband
-AC_PREREQ([2.50])
-
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AC_CONFIG_HEADER(src/autoconf.h)
@@ -17 +14 @@
-dnl Check for C compiler
-AC_PROG_CC
-AC_ISC_POSIX
-AC_C_BIGENDIAN
-
-test "$GCC" = "yes" && CFLAGS="$CFLAGS -Wall -pipe -g -fno-strength-reduce"
@@ -32 +27 @@
-AC_PATH_PROG(MV, mv)
-AC_PATH_PROG(CP, cp)
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(RANLIB, ranlib)
-
-AC_ARG_WITH(setgid,
@@ -91 +84 @@
-        [enable_sdl_mixer=$enable_sdl_mixer],
-        [enable_sdl_mixer=yes])
+
+
-
-
@@ -127 +122 @@
-fi
-
+
-dnl X11 checking
-if test "$enable_x11" = "yes"; then
@@ -140 +136 @@
-        fi
-fi
+
-
-dnl SDL checking
@@ -158 +155 @@
-        fi
-fi
+
-
-dnl GTK checking
@@ -177 +175 @@
-fi
-
+
-dnl SDL mixer checking
-
-if test "$enable_sdl_mixer" = "yes"; then
-        AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, found_sdl_mixer=yes, found_sdl_mixer=no)
@@ -189 +187 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
-AC_TYPE_SIGNAL
-
-
-
-
-
-
+
+
+
-
-dnl XXX: Work around some autoconf bugs.
@@ -212 +206 @@
-
-
-
-
-
+
-
-AC_OUTPUT

trunk/mk/objective.mk

@@ -262 +262 @@
-                                echo "[building depend file for subobjective: $$i]"; \
-                        fi; \
-
+-f Makefile 
-                        if [ $(VERBOSITY) -gt 0 ]; then \
-                                echo "[finished subobjective: $$i]"; \

trunk/mk/rules.mk.in

@@ -21 +21 @@
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -55 +52 @@
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILDERS_INCLUDES = @BUILDERS_INCLUDES@
@@ -76 +68 @@
-CPP = @CPP@
-CPPFLAGS += @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS += @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_PATH = @DATA_PATH@
@@ -145 +133 @@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
@@ -184 +162 @@
-PICLDFLAGS = @PICLDFLAGS@
-LIBLDFLAGS = @LIBLDFLAGS@
-

trunk/src/Makefile

@@ -7 +7 @@
-HEADERS = $(HDRS) $(INCS)
-OBJECTS = $(ANGFILES) $(MAINFILES) $(ZFILES)
-FILE
+OBJECT
-
-# These are for OS-specific ports; ignore 'em until we use autoconf everywhere.

trunk/src/Makefile.src

@@ -44 +44 @@
-        randname.o \
-        pathfind.o \
+        signals.o \
-        save.o \
-        spells1.o \

trunk/src/config.h

@@ -16 +16 @@
- * have to modify any lines not indicated by "OPTION".
- *
-config
+basic
- *
- * And finally, remember that the "Makefile" will specify some rather
@@ -236 +236 @@
-
-/*
-
-
-
-
-
+
+
+
-# undef HANDLE_SIGNALS
-
-#endif
-
-
-/*
- * Hack -- Windows stuff
- */
-#ifdef WINDOWS
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
-
-/*
- * Hack -- EMX stuff
- */
-#ifdef USE_EMX
-
-/* Do not handle signals */
-# undef HANDLE_SIGNALS
-
-#endif
-
-
@@ -375 +351 @@
- * OPTION: Attempt to minimize the size of the game
- */
-#ifndef ANGBAND_LITE
-/* #define ANGBAND_LITE */
-
+
-
-/*

trunk/src/externs.h

@@ -334 +334 @@
-extern void close_game(void);
-extern void exit_game_panic(void);
-#ifdef HANDLE_SIGNALS
-extern void (*(*signal_aux)(int, void (*)(int)))(int);
-#endif
-extern void signals_ignore_tstp(void);
-extern void signals_handle_tstp(void);
-extern void signals_init(void);
-
-/* generate.c */
@@ -481 +475 @@
-/* pathfind.c */
-extern bool findpath(int y, int x);
+
+/* signals.c */
+extern void signals_ignore_tstp(void);
+extern void signals_handle_tstp(void);
+extern void signals_init(void);
-
-/* save.c */

trunk/src/files.c

@@ -12 +12 @@
-
-#define MAX_PANEL 12
-
-
-/*
- * Hack -- drop permissions
- */
-void safe_setuid_drop(void)
-{
-
-#ifdef SET_UID
-
-# ifdef SAFE_SETUID
-
-#  ifdef HAVE_SETEGID
-
-        if (setegid(getgid()) != 0)
-        {
-                quit("setegid(): cannot set permissions correctly!");
-        }
- 
-#  else /* HAVE_SETEGID */
-
-#   ifdef SAFE_SETUID_POSIX
-
-        if (setgid(getgid()) != 0)
-        {
-                quit("setgid(): cannot set permissions correctly!");
-        }
-    
-#   else /* SAFE_SETUID_POSIX */
-
-        if (setregid(getegid(), getgid()) != 0)
-        {
-                quit("setregid(): cannot set permissions correctly!");
-        }
-
-#   endif /* SAFE_SETUID_POSIX */
-
-#  endif /* HAVE_SETEGID */
-
-# endif /* SAFE_SETUID */
-
-#endif /* SET_UID */
-
-}
-
-
-/*
- * Hack -- grab permissions
- */
-void safe_setuid_grab(void)
-{
-
-#ifdef SET_UID
-
-# ifdef SAFE_SETUID
-
-#  ifdef HAVE_SETEGID
-
-        if (setegid(player_egid) != 0)
-        {
-                quit("setegid(): cannot set permissions correctly!");
-        }
-
-#  else /* HAVE_SETEGID */
-
-#   ifdef SAFE_SETUID_POSIX
-
-        if (setgid(player_egid) != 0)
-        {
-                quit("setgid(): cannot set permissions correctly!");
-        }
-
-#   else /* SAFE_SETUID_POSIX */
-
-        if (setregid(getegid(), getgid()) != 0)
-        {
-                quit("setregid(): cannot set permissions correctly!");
-        }
-
-#   endif /* SAFE_SETUID_POSIX */
-
-#  endif /* HAVE_SETEGID */
-
-# endif /* SAFE_SETUID */
-
-#endif /* SET_UID */
-
-}
-
-
@@ -4069 +3981 @@
-
-
-#ifdef HANDLE_SIGNALS
-
-
-#include <signal.h>
-
-
-typedef void (*Signal_Handler_t)(int);
-
-/*
- * Wrapper around signal() which it is safe to take the address
- * of, in case signal itself is hidden by some some macro magic.
- */
-static Signal_Handler_t wrap_signal(int sig, Signal_Handler_t handler)
-{
-        return signal(sig, handler);
-}
-
-/* Call this instead of calling signal() directly. */  
-Signal_Handler_t (*signal_aux)(int, Signal_Handler_t) = wrap_signal;
-
-
-/*
- * Handle signals -- suspend
- *
- * Actually suspend the game, and then resume cleanly
- */
-static void handle_signal_suspend(int sig)
-{
-        /* Protect errno from library calls in signal handler */
-        int save_errno = errno;
-
-        /* Disable handler */
-        (void)(*signal_aux)(sig, SIG_IGN);
-
-#ifdef SIGSTOP
-
-        /* Flush output */
-        Term_fresh();
-
-        /* Suspend the "Term" */
-        Term_xtra(TERM_XTRA_ALIVE, 0);
-
-        /* Suspend ourself */
-        (void)kill(0, SIGSTOP);
-
-        /* Resume the "Term" */
-        Term_xtra(TERM_XTRA_ALIVE, 1);
-
-        /* Redraw the term */
-        Term_redraw();
-
-        /* Flush the term */
-        Term_fresh();
-
-#endif
-
-        /* Restore handler */
-        (void)(*signal_aux)(sig, handle_signal_suspend);
-
-        /* Restore errno */
-        errno = save_errno;
-}
-
-
-/*
- * Handle signals -- simple (interrupt and quit)
- *
- * This function was causing a *huge* number of problems, so it has
- * been simplified greatly.  We keep a global variable which counts
- * the number of times the user attempts to kill the process, and
- * we commit suicide if the user does this a certain number of times.
- *
- * We attempt to give "feedback" to the user as he approaches the
- * suicide thresh-hold, but without penalizing accidental keypresses.
- *
- * To prevent messy accidents, we should reset this global variable
- * whenever the user enters a keypress, or something like that.
- */
-static void handle_signal_simple(int sig)
-{
-        /* Protect errno from library calls in signal handler */
-        int save_errno = errno;
-
-        /* Disable handler */
-        (void)(*signal_aux)(sig, SIG_IGN);
-
-
-        /* Nothing to save, just quit */
-        if (!character_generated || character_saved) quit(NULL);
-
-
-        /* Count the signals */
-        signal_count++;
-
-
-        /* Terminate dead characters */
-        if (p_ptr->is_dead)
-        {
-                /* Mark the savefile */
-                my_strcpy(p_ptr->died_from, "Abortion", sizeof(p_ptr->died_from));
-
-                /* HACK - Skip the tombscreen if it is already displayed */
-                if (score_idx == -1)
-                {
-                        /* Close stuff */
-                        close_game();
-                }
-
-                /* Quit */
-                quit("interrupt");
-        }
-
-        /* Allow suicide (after 5) */
-        else if (signal_count >= 5)
-        {
-                /* Cause of "death" */
-                my_strcpy(p_ptr->died_from, "Interrupting", sizeof(p_ptr->died_from));
-
-                /* Commit suicide */
-                p_ptr->is_dead = TRUE;
-
-                /* Stop playing */
-                p_ptr->playing = FALSE;
-
-                /* Leaving */
-                p_ptr->leaving = TRUE;
-
-                /* Close stuff */
-                close_game();
-
-                /* Quit */
-                quit("interrupt");
-        }
-
-        /* Give warning (after 4) */
-        else if (signal_count >= 4)
-        {
-                /* Make a noise */
-                Term_xtra(TERM_XTRA_NOISE, 0);
-
-                /* Clear the top line */
-                Term_erase(0, 0, 255);
-
-                /* Display the cause */
-                Term_putstr(0, 0, -1, TERM_WHITE, "Contemplating suicide!");
-
-                /* Flush */
-                Term_fresh();
-        }
-
-        /* Give warning (after 2) */
-        else if (signal_count >= 2)
-        {
-                /* Make a noise */
-                Term_xtra(TERM_XTRA_NOISE, 0);
-        }
-
-        /* Restore handler */
-        (void)(*signal_aux)(sig, handle_signal_simple);
-
-        /* Restore errno */
-        errno = save_errno;
-}
-
-
-/*
- * Handle signal -- abort, kill, etc
- */
-static void handle_signal_abort(int sig)
-{
-        /* Disable handler */
-        (void)(*signal_aux)(sig, SIG_IGN);
-
-
-        /* Nothing to save, just quit */
-        if (!character_generated || character_saved) quit(NULL);
-
-
-        /* Clear the bottom line */
-        Term_erase(0, 23, 255);
-
-        /* Give a warning */
-        Term_putstr(0, 23, -1, TERM_RED,
-                    "A gruesome software bug LEAPS out at you!");
-
-        /* Message */
-        Term_putstr(45, 23, -1, TERM_RED, "Panic save...");
-
-        /* Flush output */
-        Term_fresh();
-
-        /* Panic Save */
-        p_ptr->panic_save = 1;
-
-        /* Panic save */
-        my_strcpy(p_ptr->died_from, "(panic save)", sizeof(p_ptr->died_from));
-
-        /* Forbid suspend */
-        signals_ignore_tstp();
-
-        /* Attempt to save */
-        if (save_player())
-        {
-                Term_putstr(45, 23, -1, TERM_RED, "Panic save succeeded!");
-        }
-
-        /* Save failed */
-        else
-        {
-                Term_putstr(45, 23, -1, TERM_RED, "Panic save failed!");
-        }
-
-        /* Flush output */
-        Term_fresh();
-
-        /* Quit */
-        quit("software bug");
-}
-
-
-
-
-/*
- * Ignore SIGTSTP signals (keyboard suspend)
- */
-void signals_ignore_tstp(void)
-{
-
-#ifdef SIGTSTP
-        (void)(*signal_aux)(SIGTSTP, SIG_IGN);
-#endif
-
-}
-
-/*
- * Handle SIGTSTP signals (keyboard suspend)
- */
-void signals_handle_tstp(void)
-{
-
-#ifdef SIGTSTP
-        (void)(*signal_aux)(SIGTSTP, handle_signal_suspend);
-#endif
-
-}
-
-
-/*
- * Prepare to handle the relevant signals
- */
-void signals_init(void)
-{
-
-#ifdef SIGHUP
-        (void)(*signal_aux)(SIGHUP, SIG_IGN);
-#endif
-
-
-#ifdef SIGTSTP
-        (void)(*signal_aux)(SIGTSTP, handle_signal_suspend);
-#endif
-
-
-#ifdef SIGINT
-        (void)(*signal_aux)(SIGINT, handle_signal_simple);
-#endif
-
-#ifdef SIGQUIT
-        (void)(*signal_aux)(SIGQUIT, handle_signal_simple);
-#endif
-
-
-#ifdef SIGFPE
-        (void)(*signal_aux)(SIGFPE, handle_signal_abort);
-#endif
-
-#ifdef SIGILL
-        (void)(*signal_aux)(SIGILL, handle_signal_abort);
-#endif
-
-#ifdef SIGTRAP
-        (void)(*signal_aux)(SIGTRAP, handle_signal_abort);
-#endif
-
-#ifdef SIGIOT
-        (void)(*signal_aux)(SIGIOT, handle_signal_abort);
-#endif
-
-#ifdef SIGKILL
-        (void)(*signal_aux)(SIGKILL, handle_signal_abort);
-#endif
-
-#ifdef SIGBUS
-        (void)(*signal_aux)(SIGBUS, handle_signal_abort);
-#endif
-
-#ifdef SIGSEGV
-        (void)(*signal_aux)(SIGSEGV, handle_signal_abort);
-#endif
-
-#ifdef SIGTERM
-        (void)(*signal_aux)(SIGTERM, handle_signal_abort);
-#endif
-
-#ifdef SIGPIPE
-        (void)(*signal_aux)(SIGPIPE, handle_signal_abort);
-#endif
-
-#ifdef SIGEMT
-        (void)(*signal_aux)(SIGEMT, handle_signal_abort);
-#endif
-
-/*
- * SIGDANGER:
- * This is not a common (POSIX, SYSV, BSD) signal, it is used by AIX(?) to
- * signal that the system will soon be out of memory.
- */
-#ifdef SIGDANGER
-        (void)(*signal_aux)(SIGDANGER, handle_signal_abort);
-#endif
-
-#ifdef SIGSYS
-        (void)(*signal_aux)(SIGSYS, handle_signal_abort);
-#endif
-
-#ifdef SIGXCPU
-        (void)(*signal_aux)(SIGXCPU, handle_signal_abort);
-#endif
-
-#ifdef SIGPWR
-        (void)(*signal_aux)(SIGPWR, handle_signal_abort);
-#endif
-
-}
-
-
-#else   /* HANDLE_SIGNALS */
-
-
-/*
- * Do