Path: utzoo!news-server.csri.toronto.edu!cs.utexas.edu!samsung!emory!att!bu.edu!transfer!lectroid!jjmhome!acestes!paradis
From: paradis@acestes.UUCP (Jim Paradis)
Newsgroups: comp.os.minix
Subject: Bash patches (4/4)
Message-ID: <165@acestes.UUCP>
Date: 11 Mar 91 21:17:11 GMT
Reply-To: paradis@acestes.UUCP (Jim Paradis)
Organization: Alberichs Rings & Things
Lines: 131

This is part 4 of the bash patches for MINIX.

You should be sitting in the "alloc_file" subdirectory of the main bash
source directory when you apply these patches

-------------8<---- cut here ---------8<---- cut here ----8<-----------
*** bash-1.05/alloc-files/getpagesize.h	Mon Nov  7 10:49:04 1988
--- minix_bash/alloc-files/getpagesize.h	Thu Nov  1 22:25:58 1990
***************
*** 6,12 ****
  
  #ifndef HAVE_GETPAGESIZE
  
! #include <sys/param.h>
  
  #ifdef EXEC_PAGESIZE
  #define getpagesize() EXEC_PAGESIZE
--- 6,16 ----
  
  #ifndef HAVE_GETPAGESIZE
  
! #ifdef MINIX
! #define NBPC 4096
! #else MINIX
! #include <sys/param.h>
! #endif /* MINIX */
  
  #ifdef EXEC_PAGESIZE
  #define getpagesize() EXEC_PAGESIZE

*** bash-1.05/alloc-files/malloc.c	Wed Feb 28 07:50:36 1990
--- minix_bash/alloc-files/malloc.c	Thu Nov  1 23:42:48 1990
***************
*** 167,173 ****
  
  #ifndef BSD42
  #ifndef SYSV
! #include <sys/vlimit.h>		/* warn the user when near the end */
  #endif /* not SYSV */
  #else /* if BSD42 */
  #include <sys/time.h>
--- 167,175 ----
  
  #ifndef BSD42
  #ifndef SYSV
! #ifndef MINIX
! #include <sys/vlimit.h>		/* warn the user when near the end */
! #endif /* not MINIX */
  #endif /* not SYSV */
  #else /* if BSD42 */
  #include <sys/time.h>
***************
*** 194,200 ****
  				     being the distance to the true
  				     beginning of the block.  */
  
! extern char etext;
  
  /* These two are for user programs to look at, when they are interested.  */
  
--- 196,204 ----
  				     being the distance to the true
  				     beginning of the block.  */
  
! #ifndef MINIX
! extern char etext;
! #endif /* MINIX */
  
  /* These two are for user programs to look at, when they are interested.  */
  
***************
*** 329,334 ****
--- 333,339 ----
  #endif
  #endif
  
+ #ifndef MINIX
    if (!data_space_start)
      {
        data_space_start = start_of_data ();
***************
*** 336,341 ****
--- 341,347 ----
  
    if (lim_data == 0)
      get_lim_data ();
+ #endif /* MINIX */
  
   /* On initial startup, get two blocks of each size up to 1k bytes */
    if (!gotpool)
***************
*** 343,349 ****
  
    /* Find current end of memory and issue warning if getting near max */
  
! #ifndef VMS
    /* Maximum virtual memory on VMS is difficult to calculate since it
     * depends on several dynmacially changing things. Also, alignment
     * isn't that important. That is why much of the code here is ifdef'ed
--- 349,355 ----
  
    /* Find current end of memory and issue warning if getting near max */
  
! #if !defined(VMS) && !defined(MINIX)
    /* Maximum virtual memory on VMS is difficult to calculate since it
     * depends on several dynmacially changing things. Also, alignment
     * isn't that important. That is why much of the code here is ifdef'ed
***************
*** 726,731 ****
--- 732,738 ----
   *	data.  On SYSV systems this is the data space only.
   */
  
+ #ifndef MINIX
  #ifdef SYSV
  
  get_lim_data ()
***************
*** 760,765 ****
--- 767,773 ----
  
  #endif /* BSD42 */
  #endif /* not SYSV */
+ #endif /* not MINIX */
  
  #ifdef VMS
  /* There is a problem when dumping and restoring things on VMS. Calls

-- 
Jim Paradis                  UUCP:  harvard!m2c!jjmhome!acestes!paradis
9 Carlstad St.               AT&T:  (508) 792-3810
Worcester, MA 01607-1569     ICBM:  42deg 13' 52",  71deg 47' 51"