Gentoo Attachment #92063 for bug #140878

View | Details | Raw Unified
Collapse All | Expand All

(-) common-orig/Makefile (-2 / +2 lines)

Lines 14-22	Link Here

CFLAGS = -O

CFLAGS = -O

# For BSD Systems

# For BSD Systems

CURSES = -lcurses -ltermcap

# CURSES = -lcurses -ltermcap

# For SYS V Systems

# For SYS V Systems

# CURSES = -lcurses

CURSES = -lcurses

# For XENIX, some XENIX systems may need -ltinfo

# For XENIX, some XENIX systems may need -ltinfo

# CURSES = -ltcap -ltermcap -lx

# CURSES = -ltcap -ltermcap -lx

(-) common-orig/death.c (+2 lines)

Lines 175-184	Link Here

/* The following code is provided especially for systems which		-CJS-

/* The following code is provided especially for systems which		-CJS-

   have no flock system call. It has never been tested.		*/

   have no flock system call. It has never been tested.		*/

#ifndef LOCK_EX

#define LOCK_EX	1

#define LOCK_EX	1

#define LOCK_SH	2

#define LOCK_SH	2

#define LOCK_NB	4

#define LOCK_NB	4

#define LOCK_UN	8

#define LOCK_UN	8

#endif

/* An flock HACK.  LOCK_SH and LOCK_EX are not distinguished.  DO NOT release

/* An flock HACK.  LOCK_SH and LOCK_EX are not distinguished.  DO NOT release

   a lock which you failed to set!  ALWAYS release a lock you set! */

   a lock which you failed to set!  ALWAYS release a lock you set! */

(-) common-orig/io.c (-1 / +4 lines)

Lines 62-67	Link Here

#include <ctype.h>

#include <ctype.h>

#include <termios.h>

#if defined(SYS_V) && defined(lint)

#if defined(SYS_V) && defined(lint)

/* for AIX, prevent hundreds of unnecessary lint errors, must define before

/* for AIX, prevent hundreds of unnecessary lint errors, must define before

Lines 334-340	Link Here

#ifdef  __386BSD__

#ifdef  __386BSD__

  (void) signal (SIGTSTP, (sig_t)suspend);

  (void) signal (SIGTSTP, (sig_t)suspend);

#else

#else

  (void) signal (SIGTSTP, suspend);

  /* (void) signal (SIGTSTP, suspend); */

  /* libc6 defaults to BSD, this expects SYSV */

  (void) sysv_signal (SIGTSTP, suspend);

#endif

#endif

#endif

#endif

#endif

#endif

(-) common-orig/misc3.c (-2 / +1 lines)

Lines 1249-1256	Link Here

  int i;

  int i;

  register inven_type *i_ptr;

  register inven_type *i_ptr;

  vtype prt2;

  bigvtype prt1, prt2;

  bigvtype prt1;

#ifdef ATARIST_MWC

#ifdef ATARIST_MWC

  int32u holder;

  int32u holder;

#endif

#endif

(-) common-orig/misc4.c (-1 / +1 lines)

Lines 33-39	Link Here

void scribe_object()

void scribe_object()

  int item_val, j;

  int item_val, j;

  vtype out_val, tmp_str;

  bigvtype out_val, tmp_str;

  if (inven_ctr > 0 || equip_ctr > 0)

  if (inven_ctr > 0 || equip_ctr > 0)

(-) common-orig/moria1.c (-9 / +15 lines)

Lines 332-339	Link Here

	  objdes(tmp_val, &inventory[i], TRUE);

	  objdes(tmp_val, &inventory[i], TRUE);

	  tmp_val[lim] = 0;	 /* Truncate if too long. */

	  tmp_val[lim] = 0;	 /* Truncate if too long. */

	  (void) sprintf(out_val[i], "  %c) %s", 'a'+i, tmp_val);

	  (void) sprintf(out_val[i], "%c) %s", 'a'+i, tmp_val);

	  l = strlen(out_val[i]);

	  l = strlen(out_val[i]) + 2;

	  if (weight)

	  if (weight)

	    l += 9;

	    l += 9;

	  if (l > len)

	  if (l > len)

Lines 352-360	Link Here

	  /* don't need first two spaces if in first column */

	  /* don't need first two spaces if in first column */

	  if (col == 0)

	  if (col == 0)

	    prt(&out_val[i][2], current_line, col);

	  else

	    prt(out_val[i], current_line, col);

	    prt(out_val[i], current_line, col);

	  else

	      put_buffer("  ", current_line, col);

	      prt(out_val[i], current_line, col+2);

	  if (weight)

	  if (weight)

	      total_weight = inventory[i].weight*inventory[i].number;

	      total_weight = inventory[i].weight*inventory[i].number;

Lines 466-474	Link Here

	  objdes(prt2, &inventory[i], TRUE);

	  objdes(prt2, &inventory[i], TRUE);

	  prt2[lim] = 0; /* Truncate if necessary */

	  prt2[lim] = 0; /* Truncate if necessary */

	  (void) sprintf(out_val[line], "  %c) %-14s: %s", line+'a',

	  (void) sprintf(out_val[line], "%c) %-14s: %s", line+'a',

			 prt1, prt2);

	    prt1, prt2);

	  l = strlen(out_val[line]);

	  l = strlen(out_val[line]) + 2;

	  if (weight)

	  if (weight)

	    l += 9;

	    l += 9;

	  if (l > len)

	  if (l > len)

Lines 488-496	Link Here

	  /* don't need first two spaces when using whole screen */

	  /* don't need first two spaces when using whole screen */

	  if (col == 0)

	  if (col == 0)

	    prt(&out_val[line][2], line+1, col);

	  else

	    prt(out_val[line], line+1, col);

	    prt(out_val[line], line+1, col);

	  else

	      put_buffer("  ", line+1, col);

	      prt(out_val[line], line+1, col+2);

	  if (weight)

	  if (weight)

	      total_weight = i_ptr->weight*i_ptr->number;

	      total_weight = i_ptr->weight*i_ptr->number;

(-) common-orig/signals.c (+80 lines)

Lines 113-119	Link Here

  if(error_sig >= 0)	/* Ignore all second signals. */

  if(error_sig >= 0)	/* Ignore all second signals. */

      if(++signal_count > 10)	/* Be safe. We will die if persistent enough. */

      if(++signal_count > 10)	/* Be safe. We will die if persistent enough. */

#ifdef __FreeBSD__

	(void) signal(sig, SIG_DFL);

	(void) signal(sig, SIG_DFL);

#else

	(void) sysv_signal(sig, SIG_DFL);

#endif

      return;

      return;

  error_sig = sig;

  error_sig = sig;

Lines 126-132	Link Here

      if (death)

      if (death)

#ifdef __FreeBSD__

	(void) signal(sig, SIG_IGN);		/* Can't quit after death. */

	(void) signal(sig, SIG_IGN);		/* Can't quit after death. */

#else

	(void) sysv_signal(sig, SIG_IGN);		/* Can't quit after death. */

#endif

      else if (!character_saved && character_generated)

      else if (!character_saved && character_generated)

	  if (!get_check("Really commit *Suicide*?"))

	  if (!get_check("Really commit *Suicide*?"))

Lines 137-143	Link Here

	      put_qio();

	      put_qio();

	      error_sig = -1;

	      error_sig = -1;

#ifdef USG

#ifdef USG

#ifdef __FreeBSD__

	      (void) signal(sig, signal_handler);/* Have to restore handler. */

	      (void) signal(sig, signal_handler);/* Have to restore handler. */

#else

	      (void) sysv_signal(sig, signal_handler);/* Have to restore handler. */

#endif

#else

#else

	      (void) sigsetmask(smask);

	      (void) sigsetmask(smask);

#endif

#endif

Lines 179-185	Link Here

  restore_term();

  restore_term();

#if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC)

#if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC)

  /* always generate a core dump */

  /* always generate a core dump */

#ifdef __FreeBSD__

  (void) signal(sig, SIG_DFL);

  (void) signal(sig, SIG_DFL);

#else

  (void) sysv_signal(sig, SIG_DFL);

#endif

  (void) kill(getpid(), sig);

  (void) kill(getpid(), sig);

  (void) sleep(5);

  (void) sleep(5);

#endif

#endif

Lines 199-205	Link Here

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN);

  (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN);

#else

#else

#ifdef __FreeBSD__

  (void) signal(SIGTSTP, SIG_IGN);

  (void) signal(SIGTSTP, SIG_IGN);

#else

  (void) sysv_signal(SIGTSTP, SIG_IGN);

#endif

#endif

#endif

#ifndef USG

#ifndef USG

  mask = sigsetmask(0);

  mask = sigsetmask(0);

Lines 220-226	Link Here

#ifdef  __386BSD__

#ifdef  __386BSD__

  (void) signal(SIGTSTP, (sig_t)suspend);

  (void) signal(SIGTSTP, (sig_t)suspend);

#else

#else

#ifdef __FreeBSD__

  (void) signal(SIGTSTP, suspend);

  (void) signal(SIGTSTP, suspend);

#else

  (void) sysv_signal(SIGTSTP, suspend);

#endif

#endif

#endif

#endif

#endif

#ifndef USG

#ifndef USG

Lines 237-243	Link Here

#if !defined(ATARIST_MWC) && !defined(ATARIST_TC)

#if !defined(ATARIST_MWC) && !defined(ATARIST_TC)

  /* No signals for Atari ST compiled with MWC or TC.  */

  /* No signals for Atari ST compiled with MWC or TC.  */

#ifdef __FreeBSD__

  (void) signal(SIGINT, signal_handler);

  (void) signal(SIGINT, signal_handler);

#else

  (void) sysv_signal(SIGINT, signal_handler);

#endif

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  /* Atari ST compiled with GNUC has most signals, but we need a cast

  /* Atari ST compiled with GNUC has most signals, but we need a cast

Lines 259-266	Link Here

#else

#else

  /* Everybody except the atari st.  */

  /* Everybody except the atari st.  */

#ifdef __FreeBSD__

  (void) signal(SIGINT, signal_handler);

  (void) signal(SIGINT, signal_handler);

  (void) signal(SIGFPE, signal_handler);

  (void) signal(SIGFPE, signal_handler);

#else

  (void) sysv_signal(SIGINT, signal_handler);

  (void) sysv_signal(SIGFPE, signal_handler);

#endif

#if defined(MSDOS)

#if defined(MSDOS)

  /* many fewer signals under MSDOS */

  /* many fewer signals under MSDOS */

Lines 278-307	Link Here

  /* Everybody except Atari, MSDOS, and Amiga.  */

  /* Everybody except Atari, MSDOS, and Amiga.  */

  /* Ignore HANGUP, and let the EOF code take care of this case. */

  /* Ignore HANGUP, and let the EOF code take care of this case. */

#ifdef __FreeBSD__

  (void) signal(SIGHUP, SIG_IGN);

  (void) signal(SIGHUP, SIG_IGN);

  (void) signal(SIGQUIT, signal_handler);

  (void) signal(SIGQUIT, signal_handler);

  (void) signal(SIGILL, signal_handler);

  (void) signal(SIGILL, signal_handler);

  (void) signal(SIGTRAP, signal_handler);

  (void) signal(SIGTRAP, signal_handler);

  (void) signal(SIGIOT, signal_handler);

  (void) signal(SIGIOT, signal_handler);

#else

  (void) sysv_signal(SIGHUP, SIG_IGN);

  (void) sysv_signal(SIGQUIT, signal_handler);

  (void) sysv_signal(SIGILL, signal_handler);

  (void) sysv_signal(SIGTRAP, signal_handler);

  (void) sysv_signal(SIGIOT, signal_handler);

#endif

#ifdef SIGEMT  /* in BSD systems */

#ifdef SIGEMT  /* in BSD systems */

  (void) signal(SIGEMT, signal_handler);

  (void) signal(SIGEMT, signal_handler);

#endif

#endif

#ifdef SIGDANGER /* in SYSV systems */

#ifdef SIGDANGER /* in SYSV systems */

  (void) signal(SIGDANGER, signal_handler);

  (void) signal(SIGDANGER, signal_handler);

#endif

#endif

#ifdef __FreeBSD__

  (void) signal(SIGKILL, signal_handler);

  (void) signal(SIGKILL, signal_handler);

  (void) signal(SIGBUS, signal_handler);

  (void) signal(SIGBUS, signal_handler);

  (void) signal(SIGSEGV, signal_handler);

  (void) signal(SIGSEGV, signal_handler);

#else

  (void) sysv_signal(SIGKILL, signal_handler);

  (void) sysv_signal(SIGBUS, signal_handler);

  (void) sysv_signal(SIGSEGV, signal_handler);

#endif

#ifdef SIGSYS

#ifdef SIGSYS

#ifdef __FreeBSD__

  (void) signal(SIGSYS, signal_handler);

  (void) signal(SIGSYS, signal_handler);

#else

  (void) sysv_signal(SIGSYS, signal_handler);

#endif

#endif

#endif

#ifdef __FreeBSD__

  (void) signal(SIGTERM, signal_handler);

  (void) signal(SIGTERM, signal_handler);

  (void) signal(SIGPIPE, signal_handler);

  (void) signal(SIGPIPE, signal_handler);

#else

  (void) sysv_signal(SIGTERM, signal_handler);

  (void) sysv_signal(SIGPIPE, signal_handler);

#endif

#ifdef SIGXCPU	/* BSD */

#ifdef SIGXCPU	/* BSD */

#ifdef __FreeBSD__

  (void) signal(SIGXCPU, signal_handler);

  (void) signal(SIGXCPU, signal_handler);

#else

  (void) sysv_signal(SIGXCPU, signal_handler);

#endif

#endif

#endif

#ifdef SIGPWR /* SYSV */

#ifdef SIGPWR /* SYSV */

#ifdef __FreeBSD__

  (void) signal(SIGPWR, signal_handler);

  (void) signal(SIGPWR, signal_handler);

#else

  (void) sysv_signal(SIGPWR, signal_handler);

#endif

#endif

#endif

#endif

#endif

#endif

#endif

Lines 314-320	Link Here

#if !defined(ATARIST_MWC)

#if !defined(ATARIST_MWC)

  (void) signal(SIGINT, SIG_IGN);

  (void) signal(SIGINT, SIG_IGN);

#ifdef SIGQUIT

#ifdef SIGQUIT

#ifdef __FreeBSD__

  (void) signal(SIGQUIT, SIG_IGN);

  (void) signal(SIGQUIT, SIG_IGN);

#else

  (void) sysv_signal(SIGQUIT, SIG_IGN);

#endif

#endif

#endif

#endif

#endif

Lines 324-330	Link Here

#if !defined(ATARIST_MWC)

#if !defined(ATARIST_MWC)

  (void) signal(SIGINT, SIG_DFL);

  (void) signal(SIGINT, SIG_DFL);

#ifdef SIGQUIT

#ifdef SIGQUIT

#ifdef __FreeBSD__

  (void) signal(SIGQUIT, SIG_DFL);

  (void) signal(SIGQUIT, SIG_DFL);

#else

  (void) sysv_signal(SIGQUIT, SIG_DFL);

#endif

#endif

#endif

#endif

#endif

Lines 335-347	Link Here

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  (void) signal(SIGINT, (__Sigfunc)signal_handler);

  (void) signal(SIGINT, (__Sigfunc)signal_handler);

#else

#else

#ifdef __FreeBSD__

  (void) signal(SIGINT, signal_handler);

  (void) signal(SIGINT, signal_handler);

#else

  (void) sysv_signal(SIGINT, signal_handler);

#endif

#endif

#endif

#ifdef SIGQUIT

#ifdef SIGQUIT

#if defined(atarist) && defined(__GNUC__)

#if defined(atarist) && defined(__GNUC__)

  (void) signal(SIGQUIT, (__Sigfunc)signal_handler);

  (void) signal(SIGQUIT, (__Sigfunc)signal_handler);

#else

#else

#ifdef __FreeBSD__

  (void) signal(SIGQUIT, signal_handler);

  (void) signal(SIGQUIT, signal_handler);

#else

  (void) sysv_signal(SIGQUIT, signal_handler);

#endif

#endif

#endif

#endif

#endif

#endif

#endif

(-) common-orig/unix.c (-1 / +1 lines)

Lines 261-267	Link Here

#endif

#endif

#ifdef USG

#ifdef USG

unsigned short getuid();

/* unsigned short getuid(); */

#else

#else

#ifndef SECURE

#ifndef SECURE

#ifdef BSD4_3

#ifdef BSD4_3

Attachment #92063: 5.5.2-glibc.patch for bug #140878