Path: ns-mx!uunet!charon.amdahl.com!amdahl!fadden
From: fadden@uts.amdahl.com (Andy McFadden)
Newsgroups: comp.sys.apple2,comp.binaries.apple2
Subject: NuLib patch #2 (needed for XENIX users only)
Message-ID: <a0ur021q14p600@amdahl.uts.amdahl.com>
Date: 12 Nov 91 18:43:00 GMT
Reply-To: fadden@amdahl.uts.amdahl.com (Andy McFadden)
Organization: Amdahl Corporation, Sunnyvale CA
Lines: 92
Xref: ns-mx comp.sys.apple2:25923 comp.binaries.apple2:2189

This patch will bring NuLib up to version 3.13.

Summary of NuLib versions:
3.10	Original release
3.11	NeXT fixes
3.12	IMPORTANT LZW-II uncompression fix
3.13	XENIX fixes

Basically, when I fixed the directory stuff to make NuLib work under System V,
I managed to screw up people using XENIX (which is mostly like System V, but
uses directory stuff like BSD's).  Credit goes to Morgan Davis for finding
and fixing this.

If you have "patch", then feed this article to it.  If not, then edit "nuadd.c"
and change the "dirent" include stuff to be:

#ifdef UNIX
# include <sys/types.h>
# include <sys/stat.h>
# ifdef SYSV
#  ifdef XENIX386
#   include <sys/ndir.h>        /* maybe <sys/ndir.h>, <dirent.h>, <dir.h>...*/
#  else
#   include <dirent.h>
#  endif
# endif
# ifdef BSD43
#  include <sys/dir.h>
# endif
#endif

Then around line 100 in EvalArgs(), change the direct/dirent declaration to be:

#ifdef SYSV
# ifdef XENIX386
    struct direct *dp;          /* XENIX is like SYSV but with BSD dir stuff */
# else
    struct dirent *dp;
# endif
#else
    struct direct *dp;
#endif


*** nuadd.c	Wed Oct 30 10:17:42 1991
--- newnuadd.c	Tue Nov 12 10:22:12 1991
***************
*** 22,32 ****
  #ifdef UNIX
  # include <sys/types.h>
  # include <sys/stat.h>
- # ifdef XENIX386
- #  include <sys/ndir.h>		/* maybe <sys/ndir.h>, <dirent.h>, <dir.h>...*/
- # endif
  # ifdef SYSV
! #  include <dirent.h>
  # endif
  # ifdef BSD43
  #  include <sys/dir.h>
--- 22,33 ----
  #ifdef UNIX
  # include <sys/types.h>
  # include <sys/stat.h>
  # ifdef SYSV
! #  ifdef XENIX386
! #   include <sys/ndir.h>	/* maybe <sys/ndir.h>, <dirent.h>, <dir.h>...*/
! #  else
! #   include <dirent.h>
! #  endif
  # endif
  # ifdef BSD43
  #  include <sys/dir.h>
***************
*** 96,102 ****
--- 97,107 ----
      DIR *dirp;
  #endif
  #ifdef SYSV
+ # ifdef XENIX386
+     struct direct *dp;		/* XENIX is like SYSV but with BSD dir stuff */
+ # else
      struct dirent *dp;
+ # endif
  #else
      struct direct *dp;
  #endif


-- 
fadden@uts.amdahl.com (Andy McFadden)
fadden@cory.berkeley.edu (expires in December)
[ Above opinions are mine, Amdahl has nothing to do with them, etc, etc. ]