hpbsd.diffs

早期freebsd实现

***************
*** 272,277 ****
--- 278,286 ----
  #ifdef hpux
  	{"hpux", "1"},
  #endif
+ #ifdef hp9000
+ 	{"hp9000", "1"},
+ #endif
  #ifdef vax
  	{"vax", "1"},
  #endif
***************
*** 321,326 ****
--- 330,338 ----
  #endif
  #ifdef luna2
  	{"luna2", "1"},
+ #endif
+ #ifdef luna68k
+ 	{"luna68k", "1"},
  #endif
  #ifdef luna88k
  	{"luna88k", "1"},
diff -cr ../X11R5.pure/mit/demos/x11perf/x11perf.c mit/demos/x11perf/x11perf.c
*** ../X11R5.pure/mit/demos/x11perf/x11perf.c	Sat Jul 27 13:07:54 1991
--- mit/demos/x11perf/x11perf.c	Sun Jun  6 11:10:21 1993
***************
*** 781,788 ****
  		    int k = j;
  		    do {
  			doit[k] = True;
! 		    } while (strcmp(cp2, (test[k].option + 1)) != 0 &&
! 			     (test[k].versions & xparms.version) &&
  			     test[++k].option != NULL);
  		    if (*cp2 != '-' && test[k].option == NULL)
  			usage();
--- 781,788 ----
  		    int k = j;
  		    do {
  			doit[k] = True;
! 		    } while (!(strcmp(cp2, (test[k].option + 1)) == 0 &&
! 			       (test[k].versions & xparms.version)) &&
  			     test[++k].option != NULL);
  		    if (*cp2 != '-' && test[k].option == NULL)
  			usage();
diff -cr ../X11R5.pure/mit/demos/xgc/lex.l mit/demos/xgc/lex.l
*** ../X11R5.pure/mit/demos/xgc/lex.l	Sat Jul 22 05:01:33 1989
--- mit/demos/xgc/lex.l	Sun Jun  6 11:10:22 1993
***************
*** 10,15 ****
--- 10,18 ----
  #include "gram.h"
  #include "constants.h"
  
+ #ifdef FLEX_SCANNER
+ int yylineno;
+ #endif
  %}
  
  %p				4000
diff -cr ../X11R5.pure/mit/extensions/server/xinput/xexevents.c mit/extensions/server/xinput/xexevents.c
*** ../X11R5.pure/mit/extensions/server/xinput/xexevents.c	Thu Jul 25 07:48:38 1991
--- mit/extensions/server/xinput/xexevents.c	Sun Jun  6 11:10:22 1993
***************
*** 733,738 ****
--- 733,739 ----
      XID   id;
      {
      register InputClientsPtr other, prev;
+     extern int RT_INPUTCLIENT;
      if (!wOtherInputMasks(pWin))
  	return(Success);
      prev = 0;
diff -cr ../X11R5.pure/mit/fonts/clients/mkfontdir/mkfontdir.c mit/fonts/clients/mkfontdir/mkfontdir.c
*** ../X11R5.pure/mit/fonts/clients/mkfontdir/mkfontdir.c	Wed Jul 17 12:33:46 1991
--- mit/fonts/clients/mkfontdir/mkfontdir.c	Sun Jun  6 11:29:53 1993
***************
*** 39,48 ****
--- 39,50 ----
  #endif
  #ifndef PATH_MAX
  #include <sys/param.h>
+ #ifndef PATH_MAX
  #ifdef MAXPATHLEN
  #define PATH_MAX MAXPATHLEN
  #else
  #define PATH_MAX 1024
+ #endif
  #endif
  #endif
  
diff -cr ../X11R5.pure/mit/lib/X/XConnDis.c mit/lib/X/XConnDis.c
*** ../X11R5.pure/mit/lib/X/XConnDis.c	Fri May 28 19:59:32 1993
--- mit/lib/X/XConnDis.c	Sun Jun  6 11:10:23 1993
***************
*** 452,458 ****
--- 452,462 ----
      sprintf (unaddr.sun_path, "%s%d", X_UNIX_PATH, idisplay);
  
      addr = (struct sockaddr *) &unaddr;
+ #ifdef SUN_LEN
+     addrlen = SUN_LEN(&unaddr);
+ #else
      addrlen = strlen(unaddr.sun_path) + sizeof(unaddr.sun_family);
+ #endif
  
  #ifdef hpux /* this is disgusting */
      ounaddr.sun_family = AF_UNIX;
diff -cr ../X11R5.pure/mit/lib/X/Xsi/XlcLoad.c mit/lib/X/Xsi/XlcLoad.c
*** ../X11R5.pure/mit/lib/X/Xsi/XlcLoad.c	Fri May 28 20:08:39 1993
--- mit/lib/X/Xsi/XlcLoad.c	Sun Jun  6 11:10:24 1993
***************
*** 111,116 ****
--- 111,121 ----
      }
  }
  
+ #ifdef _FSTDIO
+ 	/* do not conflict with fgetline in bsd stdio */
+ #define fgetline fgetlineX
+ #endif
+ 
  static char *
  fgetline(buf, len, fp)
      char       *buf;
diff -cr ../X11R5.pure/mit/lib/Xaw/AsciiSrc.c mit/lib/Xaw/AsciiSrc.c
*** ../X11R5.pure/mit/lib/Xaw/AsciiSrc.c	Fri Jul 26 10:10:21 1991
--- mit/lib/Xaw/AsciiSrc.c	Sun Jun  6 11:10:24 1993
***************
*** 92,98 ****
  static String MyStrncpy(), StorePiecesInString();
  static Boolean SetValues(), WriteToFile();
  extern int errno, sys_nerr;
- extern char* sys_errlist[];
  
  #define superclass		(&textSrcClassRec)
  AsciiSrcClassRec asciiSrcClassRec = {
--- 92,97 ----
***************
*** 989,994 ****
--- 988,994 ----
  	    String params[2];
  	    Cardinal num_params = 2;
  	    char msg[11];
+ 	    extern char* sys_errlist[];
  	    
  	    params[0] = src->ascii_src.string;
  	    if (errno <= sys_nerr)
diff -cr ../X11R5.pure/mit/lib/Xaw/TextPop.c mit/lib/Xaw/TextPop.c
*** ../X11R5.pure/mit/lib/Xaw/TextPop.c	Fri Jul 26 10:11:11 1991
--- mit/lib/Xaw/TextPop.c	Sun Jun  6 11:10:25 1993
***************
*** 61,67 ****
  #include <errno.h>
  
  extern int errno, sys_nerr;
- extern char* sys_errlist[];
  
  #define INSERT_FILE ("Enter Filename:")
  
--- 61,66 ----
***************
*** 226,231 ****
--- 225,231 ----
    TextWidget ctx = (TextWidget) closure;
    char buf[BUFSIZ], msg[BUFSIZ];
    Widget temp_widget;
+   extern char* sys_errlist[];
  
    sprintf(buf, "%s.%s", FORM_NAME, TEXT_NAME);
    if ( (temp_widget = XtNameToWidget(ctx->text.file_insert, buf)) == NULL ) {
diff -cr ../X11R5.pure/mit/lib/Xmu/LocBitmap.c mit/lib/Xmu/LocBitmap.c
*** ../X11R5.pure/mit/lib/Xmu/LocBitmap.c	Wed Jul  3 01:10:42 1991
--- mit/lib/Xmu/LocBitmap.c	Sun Jun  6 11:31:12 1993
***************
*** 40,49 ****
--- 40,51 ----
  #endif /* X_NOT_POSIX */
  #ifndef PATH_MAX
  #include <sys/param.h>
+ #ifndef PATH_MAX
  #ifdef MAXPATHLEN
  #define PATH_MAX MAXPATHLEN
  #else
  #define PATH_MAX 1024
+ #endif
  #endif
  #endif /* PATH_MAX */
  
diff -cr ../X11R5.pure/mit/rgb/Imakefile mit/rgb/Imakefile
*** ../X11R5.pure/mit/rgb/Imakefile	Fri May 28 18:08:22 1993
--- mit/rgb/Imakefile	Sun Jun  6 11:10:25 1993
***************
*** 12,20 ****
           SRCS = $(SRCS1) $(SRCS2)
           OBJS = $(OBJS1) $(OBJS2)
       PROGRAMS = rgb showrgb
      DATAFILES = rgb.pag rgb.dir
        DATADEP = rgb.dir		/* just want one run of rgb */
! #if !(defined(SGIArchitecture) || SystemV4)
         DBMLIB = -ldbm
  #endif
  #if defined(SparcArchitecture) && HasGcc
--- 12,25 ----
           SRCS = $(SRCS1) $(SRCS2)
           OBJS = $(OBJS1) $(OBJS2)
       PROGRAMS = rgb showrgb
+ #if HasDB
+     DATAFILES = rgb.db
+       DATADEP = rgb.db
+ #else
      DATAFILES = rgb.pag rgb.dir
        DATADEP = rgb.dir		/* just want one run of rgb */
! #endif
! #if !(defined(SGIArchitecture) || SystemV4 || HasDB)
         DBMLIB = -ldbm
  #endif
  #if defined(SparcArchitecture) && HasGcc
diff -cr ../X11R5.pure/mit/rgb/rgb.c mit/rgb/rgb.c
*** ../X11R5.pure/mit/rgb/rgb.c	Mon Jul  1 08:39:37 1991
--- mit/rgb/rgb.c	Sun Jun  6 11:10:26 1993
***************
*** 31,42 ****
  #include <errno.h>
  extern int errno;			/* some systems are still stupid */
  extern int sys_nerr;
- extern char *sys_errlist[];
  
  char *ProgramName;
  
  char *SysError ()
  {
      return ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno] : "?");
  }
  
--- 31,42 ----
  #include <errno.h>
  extern int errno;			/* some systems are still stupid */
  extern int sys_nerr;
  
  char *ProgramName;
  
  char *SysError ()
  {
+     extern char *sys_errlist[];
      return ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno] : "?");
  }
  
***************
*** 67,72 ****
--- 67,73 ----
      else
  	dbname = RGB_DB;
  
+ #ifndef DBM_SUFFIX
      strcpy (name, dbname);
      strcat (name, ".dir");
      fd = open (name, O_WRONLY|O_CREAT, 0666);
***************
*** 90,95 ****
--- 91,100 ----
      (void) close (fd);
  
      rgb_dbm = dbm_open (dbname, O_RDWR, 0666);
+ #else
+     /* using Berkeley DB ndbm compatibility */
+     rgb_dbm = dbm_open (dbname, O_RDWR | O_CREAT, 0666);
+ #endif
      if (!rgb_dbm) {
  	fprintf (stderr,
  		 "%s:  unable to open dbm database \"%s\" (error %d, %s)\n",
diff -cr ../X11R5.pure/mit/server/Imakefile mit/server/Imakefile
*** ../X11R5.pure/mit/server/Imakefile	Fri May 28 18:10:33 1993
--- mit/server/Imakefile	Sun Jun  6 11:35:27 1993
***************
*** 46,53 ****
--- 46,57 ----
  #if SystemV4 && X386Server
          SYSLIBS = -lm /usr/ucblib/libucb.a
  #else
+ #ifdef HasDB
+         SYSLIBS = -lm
+ #else
          SYSLIBS = -lm -ldbm
  #endif
+ #endif
             CBRT = ddx/mi/cbrt.o
  
  XCOMM
***************
*** 113,118 ****
--- 117,126 ----
  ALL1 = XmacII
  #endif
  
+ #if XsolServer
+ ALL1 = Xsol
+ #endif
+ 
  #if XlunaServer
  ALL1 = Xluna
  #endif
***************
*** 125,130 ****
--- 133,142 ----
  ALL1 = X386
  #endif
  
+ #if XhpBSDServer
+ ALL1 = XhpBSD
+ #endif
+ 
  #if XnonServer
  ALL2 = Xnon
  #endif
***************
*** 297,302 ****
--- 309,327 ----
  #endif /* XmacIIServer */
  
  
+ #if XsolServer
+ XCOMM
+ XCOMM OMRON Luna server for 4.4BSD
+ XCOMM
+ SUBDIRS0 = MFBSubdirs ddx/sol
+ SOLDIRS = $(SUBDIRS0) $(DEPDIRS)
+ SOLOBJS = ddx/sol/solInit.o
+ SOLLIBS = MFBLibs ddx/sol/libsol.a $(MFB) $(MI)
+ 
+ ServerTarget(Xsol,$(SOLDIRS),$(SOLOBJS),$(SOLLIBS),$(SYSLIBS))
+ #endif /* XlunaServer */
+ 
+ 
  #if XlunaServer
  XCOMM
  XCOMM OMRON Luna server
***************
*** 343,348 ****
--- 368,388 ----
  INSTPGMFLAGS = $(INSTUIDFLAGS)     /* server must be suid root  */
  ServerTarget(X386,$(X386DIRS),$(X386OBJS),$(X386LIBS),$(SYSLIBS))
  #endif /* X386Server */
+ 
+ 
+ #if XhpBSDServer
+ XCOMM
+ XCOMM XhpBSD server for BSD on HP Series 300/400/700 machines
+ XCOMM
+ SUBDIRS0 = StdSubdirs ddx/hpbsd
+ HPBSDDIRS = $(SUBDIRS0) $(DEPDIRS)
+ HPBSDOBJS = ddx/hpbsd/init.o
+ HPBSDLIBS0 = ddx/hpbsd/topcat/libtopcat.a ddx/hpbsd/hyperion/libhyper.a
+ HPBSDLIBS1 = ddx/hpbsd/libhpbsd.a ddx/hpbsd/input/libinput.a
+ HPBSDLIBS2 = ddx/hpbsd/cfb/libcfb.a ddx/hpbsd/mfb/libmfb.a
+ HPBSDLIBS = $(HPBSDLIBS0) $(HPBSDLIBS1) $(HPBSDLIBS2) StdLibs $(FONT)
+ ServerTarget(XhpBSD,$(HPBSDDIRS),$(HPBSDOBJS),$(HPBSDLIBS),$(SYSLIBS))
+ #endif /* XhpBSDServer */
  
  
  #if XnonServer
diff -cr ../X11R5.pure/mit/server/include/servermd.h mit/server/include/servermd.h
*** ../X11R5.pure/mit/server/include/servermd.h	Mon Jul  1 03:29:43 1991
--- mit/server/include/servermd.h	Sun Jun  6 11:10:27 1993
***************
*** 178,183 ****
--- 178,192 ----
  
  #endif /* hpux */
  
+ #if defined(hp9000)				/* BSD on hp's */
+ 
+ #define IMAGE_BYTE_ORDER	MSBFirst
+ #define BITMAP_BIT_ORDER	MSBFirst
+ #define GLYPHPADBYTES		2
+ #define GETLEFTBITS_ALIGNMENT	4
+ 
+ #endif /* hp9000 */
+ 
  #if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
  
  #define IMAGE_BYTE_ORDER	MSBFirst        /* Values for Pegasus only */
diff -cr ../X11R5.pure/mit/util/makedepend/main.c mit/util/makedepend/main.c
*** ../X11R5.pure/mit/util/makedepend/main.c	Fri Jul 26 03:51:49 1991
--- mit/util/makedepend/main.c	Sun Jun  6 11:10:27 1993
***************
*** 13,18 ****
--- 13,24 ----
  #endif
  #include <signal.h>
  
+ #ifdef X_NOT_POSIX
+ #include <sys/file.h>
+ #else
+ #include <unistd.h>
+ #endif
+ 
  #ifdef DEBUG
  int	_debugmask;
  #endif
***************
*** 267,278 ****
--- 273,288 ----
  	sigemptyset(&sig_act.sa_mask);
  	sigaddset(&sig_act.sa_mask, SIGINT);
  	sigaddset(&sig_act.sa_mask, SIGQUIT);
+ #ifdef SIGBUS
  	sigaddset(&sig_act.sa_mask, SIGBUS);
+ #endif
  	sigaddset(&sig_act.sa_mask, SIGILL);
  	sigaddset(&sig_act.sa_mask, SIGSEGV);
  	sigaddset(&sig_act.sa_mask, SIGHUP);
  	sigaddset(&sig_act.sa_mask, SIGPIPE);
+ #ifdef SIGSYS
  	sigaddset(&sig_act.sa_mask, SIGSYS);
+ #endif
  #else
  	sig_act.sa_mask = ((1<<(SIGINT -1))
  			   |(1<<(SIGQUIT-1))
***************
*** 288,296 ****
--- 298,310 ----
  	sigaction(SIGINT, &sig_act, (struct sigaction *)0);
  	sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
  	sigaction(SIGILL, &sig_act, (struct sigaction *)0);
+ #ifdef SIGBUS
  	sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
+ #endif
  	sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
+ #ifdef SIGSYS
  	sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
+ #endif
  #endif /* USGISH