Changeset 199

Timestamp:

06/21/07 19:54:51 (2 years ago)

Author:

takkaria

Message:

Fix nits in #159.

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/src/Makefile.std (modified) (1 diff)
• trunk/src/birth.c (modified) (4 diffs)
• trunk/src/cmd0.c (modified) (1 diff)
• trunk/src/cmd5.c (modified) (3 diffs)
• trunk/src/config.h (modified) (9 diffs)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/files.c (modified) (1 diff)
• trunk/src/main.c (modified) (2 diffs)
• trunk/src/object1.c (modified) (3 diffs)
• trunk/src/signals.c (modified) (1 diff)
• trunk/src/util.c (modified) (5 diffs)
• trunk/src/xtra2.c (modified) (5 diffs)
• trunk/src/z-file.c (modified) (2 diffs)

trunk/configure.ac

@@ -190 +190 @@
-AC_C_CONST
-AC_TYPE_SIGNAL
-
+resgid set
-
-

trunk/src/Makefile.std

@@ -38 +38 @@
-
-# Support the GTK2 graphical tookit (main-gtk.c)
-
+
-
-# Support SDL frontend

trunk/src/birth.c

@@ -1171 +1171 @@
-
-
-#ifdef ALLOW_AUTOROLLER
-
-        s16b stat_limit[A_MAX];
-
@@ -1280 +1278 @@
-        }
-
-#endif /* ALLOW_AUTOROLLER */
-
-        /* Clean up */
-        clear_from(10);
@@ -1292 +1288 @@
-        {
-                int col = 42;
-
-#ifdef ALLOW_AUTOROLLER
-
-                /* Feedback */
@@ -1408 +1402 @@
-                /* Otherwise just get a character */
-                else
-
-#endif /* ALLOW_AUTOROLLER */
-
-                {
-                        /* Get a new character */

trunk/src/cmd0.c

@@ -596 +596 @@
-void process_command(bool no_request)
-{
-#ifdef ALLOW_REPEAT
-
-        /* Handle repeating the last command */
-        repeat_check();
-
-#endif /* ALLOW_REPEAT */
-
-        if (!no_request)

trunk/src/cmd5.c

@@ -299 +299 @@
-        cptr p = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "spell" : "prayer");
-
-#ifdef ALLOW_REPEAT
-
-        int result;
-
@@ -318 +316 @@
-                }
-        }
-
-#endif /* ALLOW_REPEAT */
-
-        /* Extract spells */
@@ -461 +457 @@
-        if (!flag) return (-1);
-
-#ifdef ALLOW_REPEAT
-
-        repeat_push(spell);
-
-#endif /* ALLOW_REPEAT */
-
-        /* Success */

trunk/src/config.h

@@ -36 +36 @@
-
-
-/*
- * OPTION: for multi-user machines running the game setuid to some other
- * user (like 'games') this SAFE_SETUID option allows the program to drop
- * its privileges when saving files that allow for user specified pathnames.
- * This lets the game be installed system wide without major security
- * concerns.  There should not be any side effects on any machines.
- *
- * This will handle "gids" correctly once the permissions are set right.
- */
-#define SAFE_SETUID
-
-
-/*
- * This flag enables the "POSIX" methods for "SAFE_SETUID".
- */
-#ifdef _POSIX_SAVED_IDS
-# define SAFE_SETUID_POSIX
-#endif
-
-
-
-
-/*
@@ -88 +67 @@
- */
-#define ALLOW_MACROS
-
-
-/*
- * OPTION: Allow characteres to be "auto-rolled"
- */
-#define ALLOW_AUTOROLLER
-
-
@@ -124 +97 @@
-
-
-/*
- * OPTION: Allow repeating of last command.
- */
-#define ALLOW_REPEAT
-
-
-/*
- * OPTION: Handle signals
- */
-#define HANDLE_SIGNALS
-
-
-/*
@@ -149 +111 @@
-#define MONSTER_FLOW
-
-
-/*
- * OPTION: Maximum flow depth when using "MONSTER_FLOW"
- */
-#define MONSTER_FLOW_DEPTH 32
-
-
@@ -208 +165 @@
-
-
-/*
- * Do not handle signals
- */
-#if defined(MACINTOSH) || defined(WINDOWS)
-# undef HANDLE_SIGNALS
-#endif
-
-
-
@@ -263 +213 @@
-
-
-/*
- * On multiuser systems, add the "uid" to savefile names
- */
-#ifdef SET_UID
-# define SAVEFILE_USE_UID
-#endif /* SET_UID */
-
-
-/*
@@ -281 +224 @@
-#define FIXED_PATHS
-#endif /* SET_UID */
-
-
-/*
- * OPTION: Capitalize the "user_name" (for "default" player name)
- * This option is only relevant on SET_UID machines.
- */
-#define CAPITALIZE_USER_NAME
-
-
@@ -310 +246 @@
-
-
-/*
- * Hack -- Mach-O (native binary format of OS X) is basically a Un*x
- * but has Mac OS/Windows-like user interface
- */
-#ifdef MACH_O_CARBON
-# ifdef SAVEFILE_USE_UID
-#  undef SAVEFILE_USE_UID
-# endif
-#endif
-
-
-/*
@@ -336 +262 @@
-# undef MONSTER_FLOW
-# undef DRS_SMART_OPTIONS
-# undef GJW_RANDART
-# undef ALLOW_BORG
-# undef ALLOW_DEBUG

trunk/src/defines.h

@@ -1404 +1404 @@
-/* Number of bytes used in squelch sub-quality array */
-#define SQUELCH_BYTES    6
+
+
+
+/*** Monster AI stuff ***/
+
+/*
+ * Maximum flow depth when using "MONSTER_FLOW"
+ */
+#define MONSTER_FLOW_DEPTH 3
-
-

trunk/src/files.c

@@ -2503 +2503 @@
-                char temp[128];
-
-def SAVEFILE_USE_UID
+ defined(SET_UID)
-                /* Rename the savefile, using the player_uid and base_name */
-                strnfmt(temp, sizeof(temp), "%d.%s", player_uid, op_ptr->base_name);

trunk/src/main.c

@@ -294 +294 @@
-        player_uid = getuid();
-
-
-
-
+
-
-        /* Save some info for later */
@@ -302 +300 @@
-        player_egid = getegid();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-#endif /* SET_UID */

trunk/src/object1.c

@@ -2753 +2753 @@
-
-
-#ifdef ALLOW_REPEAT
-
-        /* Get the item index */
-        if (repeat_pull(cp))
@@ -2776 +2774 @@
-                }
-        }
-
-#endif /* ALLOW_REPEAT */
-
-
@@ -3410 +3406 @@
-        if (oops && str) msg_print(str);
-
-#ifdef ALLOW_REPEAT
-
-        /* Save item if available */
-        if (item) repeat_push(*cp);
-
-#endif /* ALLOW_REPEAT */
-
-        /* Result */

trunk/src/signals.c

@@ -16 +16 @@
- *    are included in all such copies.  Other copyrights may also apply.
- */
-
-
+
+
+
-
-#include <signal.h>

trunk/src/util.c

@@ -2938 +2938 @@
-        }
-
-#ifdef ALLOW_REPEAT
-
-        /* Get the item index */
-        else if ((max != 1) && repeat_pull(&amt))
@@ -2946 +2944 @@
-        }
-
-#endif /* ALLOW_REPEAT */
-
-        /* Prompt if needed */
-        else if ((max != 1))
@@ -2984 +2980 @@
-        if (amt < 0) amt = 0;
-
-#ifdef ALLOW_REPEAT
-
-        if (amt) repeat_push(amt);
-
-#endif /* ALLOW_REPEAT */
-
-        /* Return the result */
@@ -3674 +3666 @@
-
-
-#ifdef ALLOW_REPEAT
-
-#define REPEAT_MAX 20
-
@@ -3774 +3764 @@
-        }
-}
-
-#endif /* ALLOW_REPEAT */
-
-

trunk/src/xtra2.c

@@ -3238 +3238 @@
-        cptr p;
-
-#ifdef ALLOW_REPEAT
-
-        if (repeat_pull(dp))
-        {
@@ -3253 +3251 @@
-                }
-        }
-
-#endif /* ALLOW_REPEAT */
-
-        /* Initialize */
@@ -3344 +3340 @@
-        (*dp) = dir;
-
-#ifdef ALLOW_REPEAT
-
-        repeat_push(dir);
-
-#endif /* ALLOW_REPEAT */
-
-        /* A "valid" direction was entered */
@@ -3379 +3371 @@
-        cptr p;
-
-#ifdef ALLOW_REPEAT
-
-        if (repeat_pull(dp))
-        {
-                return (TRUE);
-        }
-
-#endif /* ALLOW_REPEAT */
-
-        /* Initialize */
@@ -3419 +3407 @@
-        (*dp) = dir;
-
-#ifdef ALLOW_REPEAT
-
-        repeat_push(dir);
-
-#endif /* ALLOW_REPEAT */
-
-        /* Success */

trunk/src/z-file.c

@@ -22 +22 @@
-# include <sys/types.h>
-# include <sys/stat.h>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-# endif
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-#ifdef SET_UID
-
-
-
-
-
-
-
+
+
-                quit("setegid(): cannot set permissions correctly!");
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                quit("setgid(): cannot set permissions correctly!");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-#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 */
-
-}
-
@@ -370 +332 @@
-                my_strcpy(buf, pw->pw_name, len);
-
-
-
-
-
-
+
+
-
-                return;