Re: 0.8.11 (fwd)

[Randy Terbush <ra...@zyzzyva.com>]

> I did.  Unfortunately, the other makes compilation fail on SunOS at least.
> (Besides which, it's in a form which my 'patch' doesn't understand, so I
> had to apply it manually just to try it out... sigh...).  So, I think we
> can't use this particular version --- perhaps someone else can come up
> with a better version (along the same lines as Randy's bsdi-rfc931 patch,
> which addresses a similar issue in a more portable way).
> 
> rst

I took a stab at this, but I don't think your going to like my
patch....  We really need to be including <sys/param.h> for
everything.  If I stick #include <sys/param.h> in conf.h, we
get all kinds of errors about redefining BSD, since at some
point in time, the NCSA code decided to explicitly define this.

I have tried this patch on BSDI 1.1 and 2.0, NetBSD-current,
SunOS 4.1.3, and HPUX-9.01.  The solution is cleaner IF it
works....

*** mod_include.c.orig	Sun Aug 27 16:31:19 1995
--- mod_include.c	Sun Aug 27 16:56:33 1995
***************
*** 648,654 ****
              }
              else {
                  int l,x;
! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
                  sprintf(tag,"%qd",finfo.st_size);
  #else
                  sprintf(tag,"%ld",finfo.st_size);
--- 648,654 ----
              }
              else {
                  int l,x;
! #if BSD4_4
                  sprintf(tag,"%qd",finfo.st_size);
  #else
                  sprintf(tag,"%ld",finfo.st_size);


*** conf.h.orig	Sun Aug 27 16:47:24 1995
--- conf.h	Sun Aug 27 16:50:11 1995
***************
*** 63,79 ****
   * conf.h: system-dependant #defines and includes...
   */
  
  
  /* Define one of these according to your system. */
  #if defined(SUNOS4)
- #define BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  char *crypt(char *pw, char *salt);
  #define JMP_BUF sigjmp_buf
       
  #elif defined(SOLARIS2)
- #undef BSD
  #define NO_KILLPG
  #undef NO_SETSID
  #define bzero(a,b) memset(a,0,b)
--- 63,78 ----
   * conf.h: system-dependant #defines and includes...
   */
  
+ #include <sys/param.h>
  
  /* Define one of these according to your system. */
  #if defined(SUNOS4)
  #undef NO_KILLPG
  #undef NO_SETSID
  char *crypt(char *pw, char *salt);
  #define JMP_BUF sigjmp_buf
       
  #elif defined(SOLARIS2)
  #define NO_KILLPG
  #undef NO_SETSID
  #define bzero(a,b) memset(a,0,b)
***************
*** 82,95 ****
  #define FCNTL_SERIALIZED_ACCEPT
  
  #elif defined(IRIX)
- #undef BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define JMP_BUF sigjmp_buf
  #define FCNTL_SERIALIZED_ACCEPT
   
  #elif defined(HPUX)
- #undef BSD
  #define NO_KILLPG
  #undef NO_SETSID
  #ifndef _HPUX_SOURCE
--- 81,92 ----
***************
*** 99,112 ****
  #define JMP_BUF sigjmp_buf
  
  #elif defined(AIX)
- #undef BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define NEED_SELECT_H
  #define JMP_BUF sigjmp_buf
  
  #elif defined(ULTRIX)
- #define BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define ULTRIX_BRAIN_DEATH
--- 96,107 ----
***************
*** 119,133 ****
  
  #elif defined(OSF1)
  #include <sys/file.h>
- #ifndef BSD
- #define BSD		/* Really defined by sys hdrs, but just in case */
- #endif
  #undef NO_KILLPG
  #undef NO_SETSID
  #define JMP_BUF sigjmp_buf
  
  #elif defined(SEQUENT)
- #define BSD
  #undef NO_KILLPG
  #define NO_SETSID
  #define NEED_STRDUP
--- 114,124 ----
***************
*** 135,141 ****
  
  #elif defined(NEXT)
  typedef unsigned short mode_t;
- #define BSD
  #undef NO_KILLPG
  #define NO_SETSID
  #define NEED_STRDUP
--- 126,131 ----
***************
*** 178,184 ****
  #define JMP_BUF jmp_buf
  
  #elif defined(LINUX)
- #undef BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #undef NEED_STRDUP
--- 168,173 ----
***************
*** 188,210 ****
  #define JMP_BUF sigjmp_buf
  #define FCNTL_SERIALIZED_ACCEPT
  
- #elif defined(NETBSD)
- #define BSD
- #define JMP_BUF sigjmp_buf
- 
  #elif defined(SCO)
- #undef BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define NEED_INITGROUPS
  
  #elif defined(CONVEXOS)
- #define BSD
  #define NEED_STRDUP
  #define getwd(d) getcwd(d,MAX_STRING_LEN)
  
  #elif defined(AUX)
- #define BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define NEED_STRDUP
--- 177,192 ----
***************
*** 221,233 ****
  #define getwd(d) getcwd(d,MAX_STRING_LEN)
  
  #elif defined(__NetBSD__)
- #define BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define JMP_BUF sigjmp_buf
  
  #elif defined(UTS21)
- #undef BSD
  #undef NO_KILLPG
  #define NO_SETSID
  #define NEED_WAITPID
--- 203,213 ----
***************
*** 238,244 ****
  #include <sys/types.h>
  
  #elif defined(APOLLO)
- #define BSD
  #undef NO_KILLPG
  #undef NO_SETSID
  #define timezone	_bky_timezone
--- 218,223 ----
***************
*** 247,258 ****
  #undef NO_KILLPG
  #undef NO_SETSID
  #define JMP_BUF sigjmp_buf
- #include <sys/param.h>
  
  /* Unknown system - Edit these to match */
  #else
- /* BSD is whether your system uses BSD calls or System V calls. */
- #define BSD
  /* NO_KILLPG is set on systems that don't have killpg */
  #undef NO_KILLPG
  /* NO_SETSID is set on systems that don't have setsid */
--- 226,234 ----