hpbsd.diffs

早期freebsd实现

diff -cr ../X11R5.pure/mit/clients/twm/lex.l mit/clients/twm/lex.l
*** ../X11R5.pure/mit/clients/twm/lex.l	Sat Dec 16 08:02:02 1989
--- mit/clients/twm/lex.l	Sun Jun  6 11:10:17 1993
***************
*** 43,48 ****
--- 43,67 ----
  
  extern int ParseError;
  
+ #ifdef FLEX_SCANNER
+ #undef YY_INPUT
+ #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
+ doinput (buf, size)
+ char *buf;
+ {
+ 	int c;
+ 
+ 	if (size == 0)
+ 		return (0);
+ 
+ 	if ((c = (*twmInputFunc)()) <= 0)
+ 		return (0);
+ 
+ 	buf[0] = c;
+ 	return (1);
+ }
+ #endif
+ 
  %}
  
  string				\"([^"]|\\.)*\"
***************
*** 89,94 ****
--- 108,116 ----
  %%
  yywrap() { return(1);}
  
+ #ifdef FLEX_SCANNER
+ int yylineno;
+ #else
  #undef unput
  #undef input
  #undef output
***************
*** 97,99 ****
--- 119,122 ----
  #define input()		(*twmInputFunc)()
  #define output(c)	TwmOutput(c)
  #define feof()		(1)
+ #endif
diff -cr ../X11R5.pure/mit/clients/xdm/dm.h mit/clients/xdm/dm.h
*** ../X11R5.pure/mit/clients/xdm/dm.h	Fri May 28 18:10:30 1993
--- mit/clients/xdm/dm.h	Sun Jun  6 11:19:29 1993
***************
*** 56,63 ****
--- 56,65 ----
  #endif
  #ifndef NGROUPS_MAX
  # include	<sys/param.h>
+ #ifndef NGROUPS_MAX
  #ifdef NGROUPS
  #define NGROUPS_MAX NGROUPS
+ #endif
  #endif
  #endif
  
diff -cr ../X11R5.pure/mit/clients/xdm/xdmshell.c mit/clients/xdm/xdmshell.c
*** ../X11R5.pure/mit/clients/xdm/xdmshell.c	Fri Jul 19 10:56:13 1991
--- mit/clients/xdm/xdmshell.c	Sun Jun  6 11:10:17 1993
***************
*** 36,42 ****
  #include <errno.h>
  extern int errno;
  extern int sys_nerr;
- extern char *sys_errlist[];
  
  #ifdef macII
  #define ON_CONSOLE_ONLY
--- 36,41 ----
***************
*** 62,67 ****
--- 61,67 ----
  static char *SysErrorMsg (n)
      int n;
  {
+     extern char *sys_errlist[];
      char *s = (n > 0 && n < sys_nerr) ? sys_errlist[n] : "unknown";
      return (s ? s : "null system error");
  }
diff -cr ../X11R5.pure/mit/clients/xload/Imakefile mit/clients/xload/Imakefile
*** ../X11R5.pure/mit/clients/xload/Imakefile	Wed Jul 17 16:46:31 1991
--- mit/clients/xload/Imakefile	Sun Jun  6 11:10:18 1993
***************
*** 4,9 ****
--- 4,13 ----
  #if defined(SunArchitecture) && defined(i386Architecture)
    SYS_LIBRARIES = -lkvm
  #endif
+ #ifdef BSD44
+   SYS_LIBRARIES = -lutil -lkvm
+   EXTRA_DEFINES = -DUSE_GETLOADAVG
+ #endif
  #if SystemV4
  #ifdef SonyArchitecture
    SYS_LIBRARIES = -lmld
diff -cr ../X11R5.pure/mit/clients/xload/get_load.c mit/clients/xload/get_load.c
*** ../X11R5.pure/mit/clients/xload/get_load.c	Fri Jul 26 06:21:17 1991
--- mit/clients/xload/get_load.c	Sun Jun  6 11:10:18 1993
***************
*** 114,119 ****
--- 114,123 ----
  #endif
  #endif
  
+ #ifdef hp9000
+ #include <sys/param.h>
+ #endif
+ 
  #ifdef X_NOT_POSIX
  extern long lseek();
  #endif
***************
*** 182,187 ****
--- 186,209 ----
       lastNullCpu = info.cpu_total.low32;
  }
  #else /* not apollo */
+ #if defined(USE_GETLOADAVG)
+ 
+ void InitLoadPoint()			   /* getloadavg() library version */
+ {
+ }
+ 
+ /* ARGSUSED */
+ void GetLoadPoint( w, closure, call_data ) /* getloadavg() library version */
+ Widget	w;		/* unused */
+ caddr_t	closure;	/* unused */
+ caddr_t	call_data;	/* pointer to (double) return value */
+ {
+     double *loadavg = (double *)call_data;
+     if (getloadavg(loadavg, 1) != 1)
+ 	*loadavg = 1.0;
+ }
+ 
+ #else /* not USE_GETLOADAVG */
  #if defined(SYSV) && defined(SYSV386)
  /*
   * inspired by 'avgload' by John F. Haugh II
***************
*** 561,567 ****
  	(void) lseek(kmem, loadavg_seek, 0);
  #endif
  
! #if defined(sun) || defined (UTEK) || defined(sequent) || defined(alliant) || defined(SVR4) || defined(sgi) || defined(hcx)
  	{
  		long temp;
  		(void) read(kmem, (char *)&temp, sizeof(long));
--- 583,589 ----
  	(void) lseek(kmem, loadavg_seek, 0);
  #endif
  
! #if defined(sun) || defined (UTEK) || defined(sequent) || defined(alliant) || defined(SVR4) || defined(sgi) || defined(hcx) || defined(hp9000)
  	{
  		long temp;
  		(void) read(kmem, (char *)&temp, sizeof(long));
***************
*** 712,717 ****
--- 734,740 ----
  #endif /* LOADSTUB else */
  #endif /* KVM_ROUTINES else */
  #endif /* SYSV && SYSV386 else */
+ #endif /* USE_GETLOADAVG */
  
  static xload_error(str1, str2)
  char *str1, *str2;
diff -cr ../X11R5.pure/mit/clients/xman/Imakefile mit/clients/xman/Imakefile
*** ../X11R5.pure/mit/clients/xman/Imakefile	Fri May 28 18:08:17 1993
--- mit/clients/xman/Imakefile	Sun Jun  6 11:10:18 1993
***************
*** 10,17 ****
  #endif
  MANPATHS = $(SYSMANPATH) $(LOCALMANPATH)
  HELPFILE = -DHELPFILE=\"$(LIBDIR)$(PATHSEP)xman.help\"
  	
!         DEFINES = $(HELPFILE) $(MANPATHS)
          DEPLIBS = XawClientDepLibs
  LOCAL_LIBRARIES = XawClientLibs
             SRCS = ScrollByL.c handler.c man.c buttons.c help.c \
--- 10,20 ----
  #endif
  MANPATHS = $(SYSMANPATH) $(LOCALMANPATH)
  HELPFILE = -DHELPFILE=\"$(LIBDIR)$(PATHSEP)xman.help\"
+ #if BSD44
+ BSD44MAN = -DBSD44MAN
+ #endif
  	
!         DEFINES = $(HELPFILE) $(MANPATHS) $(BSD44MAN)
          DEPLIBS = XawClientDepLibs
  LOCAL_LIBRARIES = XawClientLibs
             SRCS = ScrollByL.c handler.c man.c buttons.c help.c \
diff -cr ../X11R5.pure/mit/clients/xman/vendor.h mit/clients/xman/vendor.h
*** ../X11R5.pure/mit/clients/xman/vendor.h	Wed Aug 21 06:49:23 1991
--- mit/clients/xman/vendor.h	Sun Jun  6 11:10:19 1993
***************
*** 29,35 ****
   * complete than the cat directories.
   */
  
! #if ( defined(UTEK) || defined(apollo) )
  #  define SEARCHDIR  CAT
  #else
  #  define SEARCHDIR  MAN
--- 29,35 ----
   * complete than the cat directories.
   */
  
! #if ( defined(UTEK) || defined(apollo) || defined(BSD44MAN) )
  #  define SEARCHDIR  CAT
  #else
  #  define SEARCHDIR  MAN
***************
*** 62,67 ****
--- 62,70 ----
  #ifdef sgi
  #  define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man"
  #endif /* sgi */
+ #ifdef BSD44MAN
+ #  define SYSMANPATH "/usr/share/man:/usr/share/man/old:/usr/contrib/man:/usr/local/man"
+ #endif
  
  #ifndef SYSMANPATH
  #  define SYSMANPATH "/usr/man"
diff -cr ../X11R5.pure/mit/clients/xset/xset.c mit/clients/xset/xset.c
*** ../X11R5.pure/mit/clients/xset/xset.c	Tue Jul 23 10:32:47 1991
--- mit/clients/xset/xset.c	Sun Jun  6 11:10:19 1993
***************
*** 33,38 ****
--- 33,43 ----
  #include <X11/extensions/MITMisc.h>
  #endif
  
+ #ifdef _BSD_RUNE_T_
+ /* override clash with bsd44 ctype.h macro */
+ #undef isnumber
+ #endif
+ 
  #define ON 1
  #define OFF 0
  
diff -cr ../X11R5.pure/mit/clients/xterm/main.c mit/clients/xterm/main.c
*** ../X11R5.pure/mit/clients/xterm/main.c	Fri May 28 18:46:35 1993
--- mit/clients/xterm/main.c	Sun Jun  6 11:21:24 1993
***************
*** 142,147 ****
--- 142,149 ----
  #include <sys/resource.h>
  #endif
  #ifdef hpux
+ #define USE_SYSV_UTMP
+ #define HAS_UTMP_UT_HOST
  #define HAS_BSD_GROUPS
  #include <sys/ptyio.h>
  #endif /* hpux */
***************
*** 177,186 ****
  #endif /* apollo */
  
  #include <utmp.h>
  #ifdef LASTLOG
  #include <lastlog.h>
  #endif
! #include <sys/param.h>	/* for NOFILE */
  
  #ifdef  PUCC_PTYD
  #include <local/openpty.h>
--- 179,190 ----
  #endif /* apollo */
  
  #include <utmp.h>
+ #include <sys/param.h>	/* for NOFILE */
  #ifdef LASTLOG
+ #if !defined(BSD4_4)
  #include <lastlog.h>
  #endif
! #endif
  
  #ifdef  PUCC_PTYD
  #include <local/openpty.h>
***************
*** 192,203 ****
--- 196,218 ----
  #endif
  
  #ifndef UTMP_FILENAME
+ #ifdef _PATH_UTMP
+ #define UTMP_FILENAME _PATH_UTMP
+ #else
  #define UTMP_FILENAME "/etc/utmp"
  #endif
+ #endif
  #ifndef LASTLOG_FILENAME
+ #ifdef _PATH_LASTLOG
+ #define LASTLOG_FILENAME _PATH_LASTLOG
+ #else
  #define LASTLOG_FILENAME "/usr/adm/lastlog"  /* only on BSD systems */
  #endif
+ #endif
  #ifndef WTMP_FILENAME
+ #ifdef _PATH_WTMP
+ #define WTMP_FILENAME _PATH_WTMP
+ #else
  #if defined(SYSV)
  #define WTMP_FILENAME "/etc/wtmp"
  #else
***************
*** 204,209 ****
--- 219,225 ----
  #define WTMP_FILENAME "/usr/adm/wtmp"
  #endif
  #endif
+ #endif
  
  #include <signal.h>
  
***************
*** 390,396 ****
--- 406,416 ----
   */
  #ifdef USE_LOGIN_DASH_P
  #ifndef LOGIN_FILENAME
+ #if defined(BSD4_4)
+ #define LOGIN_FILENAME "/usr/bin/login"
+ #else
  #define LOGIN_FILENAME "/bin/login"
+ #endif
  #endif
  static char bin_login[] = LOGIN_FILENAME;
  #endif
Common subdirectories: ../X11R5.pure/mit/clients/xterm/tektests and mit/clients/xterm/tektests
diff -cr ../X11R5.pure/mit/config/Imake.tmpl mit/config/Imake.tmpl
*** ../X11R5.pure/mit/config/Imake.tmpl	Fri May 28 18:10:24 1993
--- mit/config/Imake.tmpl	Sun Jun  6 11:22:55 1993
***************
*** 77,82 ****
--- 77,89 ----
  #define HPArchitecture
  #endif /* hpux */
  
+ #ifdef hp9000
+ #define MacroIncludeFile <hpbsd.cf>
+ #define MacroFile hpbsd.cf
+ #undef hp9000
+ #define HPBSDArchitecture
+ #endif /* hp9000 */
+ 
  #ifdef att
  #define MacroIncludeFile <att.cf>
  #define MacroFile att.cf
***************
*** 182,187 ****
--- 189,201 ----
  #define RsArchitecture
  #endif
  #endif /* ibm */
+ 
+ #ifdef SOL
+ #undef luna
+ #define MacroIncludeFile <sol.cf>
+ #define MacroFile sol.cf
+ #define Mc68000Architecture
+ #endif
  
  #ifdef luna
  #undef luna
diff -cr ../X11R5.pure/mit/config/imake.c mit/config/imake.c
*** ../X11R5.pure/mit/config/imake.c	Fri Jul 26 09:51:12 1991
--- mit/config/imake.c	Sun Jun  6 11:10:21 1993
***************
*** 107,114 ****
--- 107,120 ----
  #ifdef X_NOT_POSIX
  #include <sys/file.h>
  #else
+ #if defined(hp9000) || defined(luna68k)
+ #undef _POSIX_SOURCE
+ #endif
  #include <unistd.h>
+ #if defined(hp9000) || defined(luna68k)
+ #define _POSIX_SOURCE
  #endif
+ #endif
  #if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
  #include <signal.h>
  #else
***************
*** 211,217 ****
--- 217,227 ----
  char	*ReadLine();
  char	*CleanCppInput();
  char	*Strdup();
+ #if defined(__STDC__) || defined(__GNUC__)
+ char	*Emalloc(int);
+ #else
  char	*Emalloc();
+ #endif
  
  boolean	verbose = FALSE;
  boolean	show = TRUE;
diff -cr ../X11R5.pure/mit/config/imakemdep.h mit/config/imakemdep.h
*** ../X11R5.pure/mit/config/imakemdep.h	Mon Aug 26 07:39:59 1991
--- mit/config/imakemdep.h	Sun Jun  6 11:26:21 1993
***************
*** 126,131 ****
--- 126,134 ----
  #if defined(_IBMR2) && !defined(DEFAULT_CPP)
  #define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
  #endif
+ #if (defined(hp9000) || defined(luna68k)) && !defined(DEFAULT_CPP)
+ #define DEFAULT_CPP "/usr/libexec/cpp"
+ #endif
  
  /*
   * Step 5:  cpp_argv
***************
*** 156,161 ****
--- 159,167 ----
  #ifdef unix
  	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
  #endif
+ #if defined(hp9000) || defined(luna68k)
+ 	"-traditional",
+ #endif
  #ifdef M4330
  	"-DM4330",	/* Tektronix */
  #endif