jimke@uunet.uu.net (10/12/90)
Submitted-by: microsoft!jimke@uunet.uu.net
Posting-number: Volume 9, Issue 90
Archive-name: sco.patches/part04
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of archive 4 (of 12)."
# Contents: fix-14.sco04
# Wrapped by jimke@kellman on Sat Oct 6 17:13:28 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'fix-14.sco04' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'fix-14.sco04'\"
else
echo shar: Extracting \"'fix-14.sco04'\" \(42291 characters\)
sed "s/^X//" >'fix-14.sco04' <<'END_OF_FILE'
X*** ./mit-orig/lib/X/Xstreams.c Thu Oct 4 16:46:32 1990
X--- ./mit/lib/X/Xstreams.c Mon Sep 17 15:49:44 1990
X***************
X*** 1,7 ****
X--- 1,9 ----
X+ #include "import.h"
X /*
X * $XConsortium: Xstreams.c,v 1.12 89/11/08 17:08:29 converse Exp $
X */
X
X+ #include <stdio.h>
X #ifdef STREAMSCONN
X /*
X * Copyright 1988, 1989 AT&T, Inc.
X***************
X*** 56,67 ****
X #include <sys/utsname.h>
X #include <sys/signal.h>
X
X- #ifdef SHARELIB
X- #undef t_bind
X- #endif
X-
X #include "Xstreams.h"
X
X
X #ifdef DEBUG
X #define PRMSG(x,a,b) fprintf(stderr, x,a,b); fflush(stderr)
X--- 58,69 ----
X #include <sys/utsname.h>
X #include <sys/signal.h>
X
X #include "Xstreams.h"
X
X+ #ifdef sco
X+ #undef EWOULDBLOCK
X+ #define EWOULDBLOCK EAGAIN
X+ #endif
X
X #ifdef DEBUG
X #define PRMSG(x,a,b) fprintf(stderr, x,a,b); fflush(stderr)
X***************
X*** 110,118 ****
X void ConnectTcpClient () {}
X void SetupTcpStream () {}
X
X! #ifdef SHARELIB
X! #define t_bind (*_libX_t_bind)
X! extern int t_bind();
X #undef t_bind
X #endif
X
X--- 112,118 ----
X void ConnectTcpClient () {}
X void SetupTcpStream () {}
X
X! #ifdef ATTSHLIB
X #undef t_bind
X #endif
X
X***************
X*** 222,227 ****
X--- 222,228 ----
X
X
X /* Routines for handling local streams (streams-pipes) */
X+ int nameserver();
X
X SetupLocalStream(display, stype)
X char * display;
X***************
X*** 231,237 ****
X char * slave;
X char buf[64];
X int type = X_LOCAL_STREAM;
X- int nameserver();
X
X PRMSG("Calling SetupLocalStream()\n",0,0);
X
X--- 232,237 ----
X***************
X*** 251,257 ****
X fprintf(stderr, "Only display # 0 can be used on this server\n");
X return(-1);
X }
X!
X sprintf(buf, "%s.%d", LOCAL_LISTENER, munix);
X if(open(buf, O_RDWR) >= 0){
X fprintf(stderr, "Server is already running\n");
X--- 251,257 ----
X fprintf(stderr, "Only display # 0 can be used on this server\n");
X return(-1);
X }
X!
X sprintf(buf, "%s.%d", LOCAL_LISTENER, munix);
X if(open(buf, O_RDWR) >= 0){
X fprintf(stderr, "Server is already running\n");
X***************
X*** 405,411 ****
X return(fd);
X }
X
X! static int
X OpenLocalServer(node)
X char *node;
X {
X--- 405,411 ----
X return(fd);
X }
X
X! int
X OpenLocalServer(node)
X char *node;
X {
X***************
X*** 482,490 ****
X int count;
X int do_buffering;
X {
X-
X if (do_buffering == NO_BUFFERING)
X! return (read(fd, buf, count));
X
X if (_XsInputBuffersize[fd] <= _XsInputBufferptr[fd])
X {
X--- 482,489 ----
X int count;
X int do_buffering;
X {
X if (do_buffering == NO_BUFFERING)
X! return read(fd, buf, count);
X
X if (_XsInputBuffersize[fd] <= _XsInputBufferptr[fd])
X {
X***************
X*** 512,518 ****
X char *buf;
X int count;
X {
X! return (write(fd, buf, count));
X }
X
X CloseLocalStream(fd)
X--- 511,517 ----
X char *buf;
X int count;
X {
X! return write(fd, buf, count);
X }
X
X CloseLocalStream(fd)
X***************
X*** 811,817 ****
X return(fd);
X }
X
X- static
X checkNewEvent(fd)
X int fd;
X {
X--- 810,815 ----
X***************
X*** 986,998 ****
X /* bind the name to the transport endpoint. This operation will */
X /* take some time if the name is not already in the local name */
X /* table or if the name is not a group name */
X! #ifdef SHARELIB
X! #define t_bind (*_libX_t_bind)
X #endif
X i = t_bind (fd, &bind_req, NULL) ;
X }
X else i = t_bind (fd, NULL, NULL);
X! #ifdef SHARELIB
X #undef t_bind
X #endif
X
X--- 984,996 ----
X /* bind the name to the transport endpoint. This operation will */
X /* take some time if the name is not already in the local name */
X /* table or if the name is not a group name */
X! #ifdef ATTSHLIB
X! #define t_bind (*_libX11_t_bind)
X #endif
X i = t_bind (fd, &bind_req, NULL) ;
X }
X else i = t_bind (fd, NULL, NULL);
X! #ifdef ATTSHLIB
X #undef t_bind
X #endif
X
X***************
X*** 1012,1018 ****
X * LookForEvents: handle an asynchronous event
X */
X
X- static
X LookForEvents(FreeHead, PendHead, fd)
X struct listenQue *FreeHead;
X struct listenQue *PendHead;
X--- 1010,1015 ----
X***************
X*** 1090,1096 ****
X * CheckListenQue: try to accept a connection
X */
X
X- static
X CheckListenQue(FreeHead, PendHead, fd, MoreConnections)
X struct listenQue *FreeHead;
X struct listenQue *PendHead;
X--- 1087,1092 ----
X***************
X*** 1204,1210 ****
X * ClearCall: clear out a call structure
X */
X
X- static
X ClearCall(call)
X struct t_call *call;
X {
X--- 1200,1205 ----
X***************
X*** 1222,1228 ****
X * RemoveCall: remove call from pending list
X */
X
X- static
X RemoveCall(freeq, pendq, disc)
X struct listenQue *freeq;
X struct listenQue *pendq;
X--- 1217,1222 ----
X***************
X*** 1286,1292 ****
X }
X
X
X! static char *XNETDB = "/usr/X/lib/Xconnections";
X
X int _XMakeStreamsConnection (name, idisplay, retries,
X familyp, serveraddrlenp, serveraddrp)
X--- 1280,1286 ----
X }
X
X
X! static char *XNETDB = "/usr/lib/X11/Xconnections";
X
X int _XMakeStreamsConnection (name, idisplay, retries,
X familyp, serveraddrlenp, serveraddrp)
X*** ./mit-orig/lib/X/Xstreams.h Thu Oct 4 16:45:40 1990
X--- ./mit/lib/X/Xstreams.h Sat Sep 15 15:13:51 1990
X***************
X*** 153,160 ****
X
X #define LOCAL_LISTENER "/dev/X/server"
X #define NAME_SERVER_NODE "/dev/X/nameserver"
X! #define XNETSPECDIR "/usr/X/lib/net"
X! #define XROOTDIR "/usr/X"
X
X #define MAX_SIMUL_TLI_CALLS 20
X
X--- 153,160 ----
X
X #define LOCAL_LISTENER "/dev/X/server"
X #define NAME_SERVER_NODE "/dev/X/nameserver"
X! #define XNETSPECDIR "/usr/lib/X11/net"
X! #define XROOTDIR "/usr/lib/X11"
X
X #define MAX_SIMUL_TLI_CALLS 20
X
X*** ./mit-orig/lib/X/evtomask.c Thu Oct 4 16:46:32 1990
X--- ./mit/lib/X/evtomask.c Sat Sep 15 14:52:06 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /* $XConsortium: evtomask.c,v 1.3 89/09/19 11:55:31 rws Exp $ */
X #include "X.h"
X /*
X*** ./mit-orig/lib/X/globals.c Thu Oct 4 16:45:50 1990
X--- ./mit/lib/X/globals.c Sat Sep 15 14:52:06 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * $XConsortium: globals.c,v 1.7 89/06/16 16:57:00 jim Exp $
X *
X*** ./mit-orig/lib/X/import.h Thu Oct 4 18:01:21 1990
X--- ./mit/lib/X/import.h Sun Sep 16 23:00:18 1990
X***************
X*** 0 ****
X--- 1,239 ----
X+ /*
X+ * Some hacks for shared libraries -- especially for 386/ix
X+ * Thomas Roell, 16.4.90
X+ */
X+ #ifndef _X11_import
X+ #define _X11_import
X+ #ifdef ATTSHAREDLIB
X+ #include <stdio.h>
X+ #include <sys/types.h>
X+ #include <pwd.h>
X+ #include <time.h>
X+
X+ #define __fltused (* _libX11___fltused)
X+ #define _ctype (* _libX11__ctype)
X+ #define _filbuf (* _libX11__filbuf)
X+ #define _flsbuf (* _libX11__flsbuf)
X+ #define _fltused (* _libX11__fltused)
X+ #define _iob (* _libX11__iob)
X+ #define abs (* _libX11_abs)
X+ #define access (* _libX11_access)
X+ #define alarm (* _libX11_alarm)
X+ #define asctime (* _libX11_asctime)
X+ #define atof (* _libX11_atof)
X+ #define atoi (* _libX11_atoi)
X+ #define calloc (* _libX11_calloc)
X+ #define chmod (* _libX11_chmod)
X+ #define close (* _libX11_close)
X+ #define creat (* _libX11_creat)
X+ #define errno (* _libX11_errno)
X+ #define exit (* _libX11_exit)
X+ #define fclose (* _libX11_fclose)
X+ #define fcntl (* _libX11_fcntl)
X+ #define fgets (* _libX11_fgets)
X+ #define fopen (* _libX11_fopen)
X+ #define fprintf (* _libX11_fprintf)
X+ #define fputs (* _libX11_fputs)
X+ #define fread (* _libX11_fread)
X+ #define free (* _libX11_free)
X+ #define fseek (* _libX11_fseek)
X+ #define ftell (* _libX11_ftell)
X+ #define fwrite (* _libX11_fwrite)
X+ #define getenv (* _libX11_getenv)
X+ #define getlogin (* _libX11_getlogin)
X+ #define getpwnam (* _libX11_getpwnam)
X+ #define getpwuid (* _libX11_getpwuid)
X+ #define getuid (* _libX11_getuid)
X+ #define ioctl (* _libX11_ioctl)
X+ #define link (* _libX11_link)
X+ #define localtime (* _libX11_localtime)
X+ #define malloc (* _libX11_malloc)
X+ #define memcpy (* _libX11_memcpy)
X+ #define memset (* _libX11_memset)
X+ #define open (* _libX11_open)
X+ #define perror (* _libX11_perror)
X+ #define poll (* _libX11_poll)
X+ #define printf (* _libX11_printf)
X+ #define qsort (* _libX11_qsort)
X+ #define rand (* _libX11_rand)
X+ #define read (* _libX11_read)
X+ #define realloc (* _libX11_realloc)
X+ #define signal (* _libX11_signal)
X+ #define sleep (* _libX11_sleep)
X+ #define sprintf (* _libX11_sprintf)
X+ #define srand (* _libX11_srand)
X+ #define sscanf (* _libX11_sscanf)
X+ #define stat (* _libX11_stat)
X+ #define strcat (* _libX11_strcat)
X+ #define strchr (* _libX11_strchr)
X+ #define strcmp (* _libX11_strcmp)
X+ #define strcpy (* _libX11_strcpy)
X+ #define strlen (* _libX11_strlen)
X+ #define strncmp (* _libX11_strncmp)
X+ #define strncpy (* _libX11_strncpy)
X+ #define strrchr (* _libX11_strrchr)
X+ #define sys_errlist (* _libX11_sys_errlist)
X+ #define sys_nerr (* _libX11_sys_nerr)
X+ #define system (* _libX11_system)
X+ #define times (* _libX11_times)
X+ #define tmpnam (* _libX11_tmpnam)
X+ #define toupper (* _libX11_toupper)
X+ #define ulimit (* _libX11_ulimit)
X+ #define uname (* _libX11_uname)
X+ #define unlink (* _libX11_unlink)
X+ #define write (* _libX11_write)
X+
X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE)
X+ #else
X+
X+ extern int __fltused;
X+ extern unsigned char _ctype[];
X+ extern int _filbuf();
X+ extern int _flsbuf();
X+ extern int _fltused;
X+ extern FILE *_iob;
X+ extern int abs();
X+ extern int access();
X+ extern int alarm();
X+ extern int asctime();
X+ extern double atof();
X+ extern int atoi();
X+ extern char *calloc();
X+ extern int chmod();
X+ extern int close();
X+ extern int creat();
X+ extern int errno;
X+ extern void exit();
X+ extern int fclose();
X+ extern int fcntl();
X+ extern char *fgets();
X+ extern FILE *fopen();
X+ extern int fprintf();
X+ extern int fputs();
X+ extern int fread();
X+ extern void free();
X+ extern int fseek();
X+ extern int ftell();
X+ extern int fwrite();
X+ extern char *getenv();
X+ extern int getlogin();
X+ extern struct passwd *getpwnam();
X+ extern struct passwd *getpwuid();
X+ extern int getuid();
X+ extern int ioctl();
X+ extern int link();
X+ extern struct tm *localtime();
X+ extern char *malloc();
X+ extern char *memcpy();
X+ extern char *memset();
X+ extern int open();
X+ extern void perror();
X+ extern int poll();
X+ extern int printf();
X+ extern int qsort();
X+ extern int rand();
X+ extern int read();
X+ extern char *realloc();
X+ extern void (*signal())();
X+ extern int sleep();
X+ extern int sprintf();
X+ extern void srand();
X+ extern int sscanf();
X+ extern int stat();
X+ extern char *strcat();
X+ extern char *strchr();
X+ extern int strcmp();
X+ extern char *strcpy();
X+ extern size_t strlen();
X+ extern int strncmp();
X+ extern char *strncpy();
X+ extern char *strrchr();
X+ extern char *sys_errlist[];
X+ extern int sys_nerr;
X+ extern int system();
X+ extern struct tm *(*_libX11_time)();
X+ extern int times();
X+ extern char *tmpnam();
X+ extern int toupper();
X+ extern int ulimit();
X+ extern int uname();
X+ extern int unlink();
X+ extern int write();
X+
X+ #endif
X+
X+ #define t_accept (* _libX11_t_accept)
X+ #define t_alloc (* _libX11_t_alloc)
X+ #define t_close (* _libX11_t_close)
X+ #define t_connect (* _libX11_t_connect)
X+ #define t_errlist (* _libX11_t_errlist)
X+ #define t_errno (* _libX11_t_errno)
X+ #define t_error (* _libX11_t_error)
X+ #define t_free (* _libX11_t_free)
X+ #define t_getinfo (* _libX11_t_getinfo)
X+ #define t_getstate (* _libX11_t_getstate)
X+ #define t_listen (* _libX11_t_listen)
X+ #define t_look (* _libX11_t_look)
X+ #define t_nerr (* _libX11_t_nerr)
X+ #define t_open (* _libX11_t_open)
X+ #define t_rcv (* _libX11_t_rcv)
X+ #define t_rcvconnect (* _libX11_t_rcvconnect)
X+ #define t_rcvdis (* _libX11_t_rcvdis)
X+ #define t_rcvrel (* _libX11_t_rcvrel)
X+ #define t_rcvudata (* _libX11_t_rcvudata)
X+ #define t_rcvuderr (* _libX11_t_rcvuderr)
X+ #define t_snd (* _libX11_t_snd)
X+ #define t_snddis (* _libX11_t_snddis)
X+ #define t_sndrel (* _libX11_t_sndrel)
X+ #define t_sndudata (* _libX11_t_sndudata)
X+ #define t_sync (* _libX11_t_sync)
X+ #define t_unbind (* _libX11_t_unbind)
X+
X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE)
X+ #else
X+
X+ extern int t_accept();
X+ extern int t_alloc();
X+ extern int (*_libX11_t_bind)();
X+ extern int t_close();
X+ extern int t_connect();
X+ extern char *t_errlist[];
X+ extern int t_errno;
X+ extern int t_error();
X+ extern int t_free();
X+ extern int t_getinfo();
X+ extern int t_getstate();
X+ extern int t_listen();
X+ extern int t_look();
X+ extern int t_nerr;
X+ extern int t_open();
X+ extern int t_rcv();
X+ extern int t_rcvconnect();
X+ extern int t_rcvdis();
X+ extern int t_rcvrel();
X+ extern int t_rcvudata();
X+ extern int t_rcvuderr();
X+ extern int t_snd();
X+ extern int t_snddis();
X+ extern int t_sndrel();
X+ extern int t_sndudata();
X+ extern int t_sync();
X+ extern int t_unbind();
X+
X+ #endif
X+
X+ #define grantpt (* _libX11_grantpt)
X+ #define unlockpt (* _libX11_unlockpt)
X+ #define ptsname (* _libX11_ptsname)
X+
X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE)
X+ #else
X+
X+ extern int grantpt();
X+ extern int unlockpt();
X+ extern int ptsname();
X+
X+ #endif
X+
X+ #endif
X+ #endif
X*** ./mit-orig/lib/X/sharedlib.c Thu Oct 4 18:01:21 1990
X--- ./mit/lib/X/sharedlib.c Sun Sep 16 22:45:20 1990
X***************
X*** 0 ****
X--- 1,116 ----
X+ #include "import.h"
X+ /*
X+ * $XConsortium: sharedlib.c,v 1.7 89/06/16 16:57:00 jim Exp $
X+ *
X+ * Copyright 1989 Massachusetts Institute of Technology
X+ */
X+
X+ #ifdef ATTSHAREDLIB
X+
X+ int __fltused = 0;
X+ unsigned char _ctype[] = 0;
X+ int _filbuf() = 0;
X+ int _flsbuf() = 0;
X+ int _fltused = 0;
X+ FILE *_iob = 0;
X+ int abs() = 0;
X+ int access() = 0;
X+ int alarm() = 0;
X+ int asctime() = 0;
X+ double atof() = 0;
X+ int atoi() = 0;
X+ char *calloc() = 0;
X+ int chmod() = 0;
X+ int close() = 0;
X+ int creat() = 0;
X+ int errno = 0;
X+ void exit() = 0;
X+ int fclose() = 0;
X+ int fcntl() = 0;
X+ char *fgets() = 0;
X+ FILE *fopen() = 0;
X+ int fprintf() = 0;
X+ int fputs() = 0;
X+ int fread() = 0;
X+ void free() = 0;
X+ int fseek() = 0;
X+ int ftell() = 0;
X+ int fwrite() = 0;
X+ char *getenv() = 0;
X+ int getlogin() = 0;
X+ struct passwd *getpwnam() = 0;
X+ struct passwd *getpwuid() = 0;
X+ int getuid() = 0;
X+ int ioctl() = 0;
X+ int link() = 0;
X+ struct tm *localtime() = 0;
X+ char *malloc() = 0;
X+ char *memcpy() = 0;
X+ char *memset() = 0;
X+ int open() = 0;
X+ void perror() = 0;
X+ int poll() = 0;
X+ int printf() = 0;
X+ int qsort() = 0;
X+ int rand() = 0;
X+ int read() = 0;
X+ char *realloc() = 0;
X+ void (*signal())() = 0;
X+ int sleep() = 0;
X+ int sprintf() = 0;
X+ void srand() = 0;
X+ int sscanf() = 0;
X+ int stat() = 0;
X+ char *strcat() = 0;
X+ char *strchr() = 0;
X+ int strcmp() = 0;
X+ char *strcpy() = 0;
X+ size_t strlen() = 0;
X+ int strncmp() = 0;
X+ char *strncpy() = 0;
X+ char *strrchr() = 0;
X+ char *sys_errlist[] = 0;
X+ int sys_nerr = 0;
X+ int system() = 0;
X+ struct tm *(*_libX11_time)() = 0;
X+ int times() = 0;
X+ char *tmpnam() = 0;
X+ int toupper() = 0;
X+ int ulimit() = 0;
X+ int uname() = 0;
X+ int unlink() = 0;
X+ int write() = 0;
X+
X+ int t_accept() = 0;
X+ int t_alloc() = 0;
X+ int (*_libX11_t_bind)() = 0;
X+ int t_close() = 0;
X+ int t_connect() = 0;
X+ char *t_errlist[] = 0;
X+ int t_errno = 0;
X+ int t_error() = 0;
X+ int t_free() = 0;
X+ int t_getinfo() = 0;
X+ int t_getstate() = 0;
X+ int t_listen() = 0;
X+ int t_look() = 0;
X+ int t_nerr = 0;
X+ int t_open() = 0;
X+ int t_rcv() = 0;
X+ int t_rcvconnect() = 0;
X+ int t_rcvdis() = 0;
X+ int t_rcvrel() = 0;
X+ int t_rcvudata() = 0;
X+ int t_rcvuderr() = 0;
X+ int t_snd() = 0;
X+ int t_snddis() = 0;
X+ int t_sndrel() = 0;
X+ int t_sndudata() = 0;
X+ int t_sync() = 0;
X+ int t_unbind() = 0;
X+
X+ int grantpt() = 0;
X+ int unlockpt() = 0;
X+ int ptsname() = 0;
X+
X+ #endif
X*** ./mit-orig/lib/X/sysV/Berklib.c Thu Oct 4 16:45:40 1990
X--- ./mit/lib/X/sysV/Berklib.c Thu Sep 27 23:15:24 1990
X***************
X*** 1,8 ****
X--- 1,10 ----
X+ #include "import.h"
X /*
X * This file is used by System V based systems.
X */
X
X #include <sys/types.h>
X+ #include <sys/times.h>
X
X /*
X * These are routines fould in BDS and not found in HP-UX. They are
X***************
X*** 9,14 ****
X--- 11,20 ----
X * included so that some clients can compile.
X */
X
X+ /*
X+ * HPSOCKETS is for libsocket.a from HPCND for SCO Unix.
X+ */
X+ #ifndef HPSOCKETS
X bcopy (b1, b2, length)
X register unsigned char *b1, *b2;
X register length;
X***************
X*** 45,52 ****
X *b++ = '\0';
X }
X }
X
X-
X /* Find the first set bit
X * i.e. least signifigant 1 bit:
X * 0 => 0
X--- 51,58 ----
X *b++ = '\0';
X }
X }
X+ #endif /* HPSOCKETS */
X
X /* Find the first set bit
X * i.e. least signifigant 1 bit:
X * 0 => 0
X***************
X*** 197,199 ****
X--- 203,396 ----
X }
X
X #endif /* hpux */
X+
X+ #if defined(ix386) || defined(sco)
X+ #ifndef HPSOCKETS
X+ struct iovec {
X+ caddr_t iov_base;
X+ int iov_len;
X+ };
X+
X+ int readv(fd, iov, iovcnt)
X+ int fd;
X+ struct iovec *iov;
X+ int iovcnt;
X+ {
X+ int i,len, total;
X+ char *base;
X+ for (i=0,total=0; i<iovcnt; i++,iov++) {
X+ len = iov->iov_len;
X+ base = iov->iov_base;
X+ while (len > 0) {
X+ register int nbytes;
X+ nbytes = read(fd, base, len);
X+ if (nbytes < 0 && total == 0) {
X+ return(-1);
X+ }
X+ if (nbytes <= 0) {
X+ return(total);
X+ }
X+ len -= nbytes;
X+ total += nbytes;
X+ base += nbytes;
X+ }
X+ }
X+ return(total);
X+ }
X+
X+ int
X+ writev(fd,iov,iovcnt)
X+ int fd;
X+ struct iovec *iov;
X+ int iovcnt;
X+ {
X+ int i,len,total;
X+ char *base;
X+ for (i=0,total=0; i<iovcnt; i++, iov++) {
X+ len = iov->iov_len;
X+ base = iov->iov_base;
X+ while (len > 0) {
X+ register int nbytes;
X+ nbytes = write(fd, base, len);
X+ if (nbytes < 0 && total == 0) {
X+ return(-1);
X+ }
X+ if (nbytes <= 0) {
X+ return(total);
X+ }
X+ len -= nbytes;
X+ total += nbytes;
X+ base += nbytes;
X+ }
X+ }
X+ return(total);
X+ }
X+
X+ #include <sys/time.h>
X+ #ifdef ATTSHAREDLIB
X+ #define time (*_libX11_time)
X+ #endif
X+ extern int gettimeofday (tvp, tzp)
X+ struct timeval *tvp;
X+ struct timezone *tzp;
X+ {
X+ static long offset = 0;
X+ struct tms buffer;
X+ if (!offset) {
X+ time(&offset);
X+ offset -= (times(&buffer) / 100);
X+ }
X+ tvp->tv_sec = offset + times(&buffer) / 100;
X+ tvp->tv_usec = (times(&buffer) % 100) * 10000;
X+ /* ignore tzp for now since this file doesn't use it */
X+ }
X+ #undef time
X+ #endif
X+ #endif /* ix386 or sco */
X+
X+ #ifdef STREAMSCONN
X+ /*
X+ * This function is moved here because it also gets included within
X+ * the server. select() must be redefined for STREAMSCONN because
X+ * SYSV select does not handle STREAMS file descriptors. select()
X+ * is defined in terms of poll() which handles everything. (Kinda
X+ * makes you wonder why they didn't just extend the semantics of
X+ * select() ).
X+ */
X+
X+ #include <sys/param.h>
X+ #include <sys/poll.h>
X+ #include <sys/errno.h>
X+ extern int errno;
X+ /*
X+ * Stolen from Xlibos.h
X+ */
X+ #define MAXSOCKS (NOFILES_MAX)
X+ #define MSKCNT ((MAXSOCKS + 31) / 32)
X+ #if (MSKCNT==1)
X+ #define BITMASK(i) (1 << (i))
X+ #define MASKIDX(i) 0
X+ #endif
X+ #if (MSKCNT>1)
X+ #define BITMASK(i) (1 << ((i) & 31))
X+ #define MASKIDX(i) ((i) >> 5)
X+ #endif
X+ #define MASKWORD(buf, i) buf[MASKIDX(i)]
X+ #define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i)
X+ #define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
X+ #define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
X+
X+ #define POLLERROR (POLLHUP | POLLNVAL | POLLERR)
X+ #define PFD(fds, i, x) \
X+ { \
X+ if (fds) \
X+ if (ev & (x)) \
X+ BITSET (fds, i); \
X+ else \
X+ BITCLEAR (fds, i); \
X+ }
X+ #define ERROR(x) \
X+ { \
X+ errno = x; \
X+ return -1; \
X+ }
X+
X+ extern long ulimit();
X+
X+ int
X+ select (nfds, rfds, wfds, efds, timeout)
X+ int nfds;
X+ unsigned long *rfds;
X+ unsigned long *wfds;
X+ unsigned long *efds;
X+ struct timeval *timeout;
X+ {
X+ int i, rc, ev, timevalue;
X+ struct pollfd pfds[NOFILES_MAX];
X+ static long _NOFILE = 0;
X+
X+ if (_NOFILE == 0)
X+ _NOFILE = ulimit(4, (long)0);
X+
X+ if (nfds > _NOFILE)
X+ nfds = _NOFILE; /* make poll happy */
X+
X+ for (i = 0; i < nfds; i++)
X+ {
X+ ev = 0;
X+
X+ if (rfds && GETBIT (rfds, i)) ev |= POLLIN;
X+ if (wfds && GETBIT (wfds, i)) ev |= POLLOUT;
X+ if (ev || (efds && GETBIT (efds, i)))
X+ pfds[i].fd = i;
X+ else
X+ pfds[i].fd = -1;
X+ pfds[i].events = ev;
X+ }
X+ if (timeout)
X+ timevalue = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
X+ else
X+ timevalue = -1;
X+
X+ if ((rc = poll (pfds, (unsigned long)nfds, timevalue)) > 0)
X+ {
X+ if (!efds)
X+ for (i = 0; i < nfds; ++i)
X+ {
X+ ev = pfds[i].revents;
X+ if (ev & POLLERROR)
X+ ERROR (EBADF);
X+ }
X+
X+ for (i = 0; i < nfds; ++i)
X+ {
X+ ev = pfds[i].revents;
X+ PFD (rfds, i, POLLIN);
X+ PFD (wfds, i, POLLOUT);
X+ PFD (efds, i, POLLERROR);
X+ }
X+ }
X+ return rc;
X+ }
X+
X+ #endif
X*** ./mit-orig/lib/Xau/AuDispose.c Thu Oct 4 16:46:38 1990
X--- ./mit/lib/Xau/AuDispose.c Sat Sep 15 15:21:56 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/AuFileName.c Thu Oct 4 16:46:39 1990
X--- ./mit/lib/Xau/AuFileName.c Sat Sep 15 15:21:57 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/AuGetAddr.c Thu Oct 4 16:46:41 1990
X--- ./mit/lib/Xau/AuGetAddr.c Sat Sep 15 15:21:57 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/AuLock.c Thu Oct 4 16:46:39 1990
X--- ./mit/lib/Xau/AuLock.c Sat Sep 15 15:21:57 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/AuRead.c Thu Oct 4 16:46:41 1990
X--- ./mit/lib/Xau/AuRead.c Sat Sep 15 15:23:43 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X***************
X*** 73,98 ****
X if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
X return 0;
X if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
X! local.address ? free (local.address) : 0;
X return 0;
X }
X if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
X! local.address ? free (local.address) : 0;
X! local.number ? free (local.number) : 0;
X return 0;
X }
X if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
X! local.address ? free (local.address) : 0;
X! local.number ? free (local.number) : 0;
X! local.name ? free (local.name) : 0;
X return 0;
X }
X ret = (Xauth *) malloc (sizeof (Xauth));
X if (!ret) {
X! local.address ? free (local.address) : 0;
X! local.number ? free (local.number) : 0;
X! local.name ? free (local.name) : 0;
X! local.data ? free (local.data) : 0;
X return 0;
X }
X *ret = local;
X--- 74,109 ----
X if (read_counted_string (&local.address_length, &local.address, auth_file) == 0)
X return 0;
X if (read_counted_string (&local.number_length, &local.number, auth_file) == 0) {
X! if (local.address)
X! free (local.address);
X return 0;
X }
X if (read_counted_string (&local.name_length, &local.name, auth_file) == 0) {
X! if (local.address)
X! free (local.address);
X! if (local.number)
X! free (local.number);
X return 0;
X }
X if (read_counted_string (&local.data_length, &local.data, auth_file) == 0) {
X! if (local.address)
X! free (local.address);
X! if (local.number)
X! free (local.number);
X! if (local.name)
X! free (local.name);
X return 0;
X }
X ret = (Xauth *) malloc (sizeof (Xauth));
X if (!ret) {
X! if (local.address)
X! free (local.address);
X! if (local.number)
X! free (local.number);
X! if (local.name)
X! free (local.name);
X! if (local.data)
X! free (local.data);
X return 0;
X }
X *ret = local;
X*** ./mit-orig/lib/Xau/AuUnlock.c Thu Oct 4 16:46:39 1990
X--- ./mit/lib/Xau/AuUnlock.c Sat Sep 15 15:21:58 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/AuWrite.c Thu Oct 4 16:46:39 1990
X--- ./mit/lib/Xau/AuWrite.c Sat Sep 15 15:21:58 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * Xau - X Authorization Database Library
X *
X*** ./mit-orig/lib/Xau/Autest.c Thu Oct 4 16:46:38 1990
X--- ./mit/lib/Xau/Autest.c Sat Sep 15 15:21:59 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X # include "Xauth.h"
X
X main (argc, argv)
X*** ./mit-orig/lib/Xau/Imakefile Thu Oct 4 16:46:41 1990
X--- ./mit/lib/Xau/Imakefile Sun Sep 16 22:42:17 1990
X***************
X*** 12,21 ****
X Xauth.h
X
X SRCS = AuDispose.c AuFileName.c AuGetAddr.c AuLock.c \
X! AuRead.c AuUnlock.c AuWrite.c
X
X OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuLock.o \
X! AuRead.o AuUnlock.o AuWrite.o
X
X all::
X
X--- 12,21 ----
X Xauth.h
X
X SRCS = AuDispose.c AuFileName.c AuGetAddr.c AuLock.c \
X! AuRead.c AuUnlock.c AuWrite.c sharedlib.c
X
X OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuLock.o \
X! AuRead.o AuUnlock.o AuWrite.o sharedlib.o
X
X all::
X
X*** ./mit-orig/lib/Xau/import.h Thu Oct 4 18:01:24 1990
X--- ./mit/lib/Xau/import.h Sun Sep 16 23:00:18 1990
X***************
X*** 0 ****
X--- 1,165 ----
X+ /*
X+ * Some hacks for shared libraries -- especially for 386/ix
X+ * Thomas Roell, 16.4.90
X+ */
X+ #ifndef _Xau_import
X+ #define _Xau_import
X+ #ifdef ATTSHAREDLIB
X+ #include <stdio.h>
X+ #include <sys/types.h>
X+ #include <time.h>
X+ #include <pwd.h>
X+
X+ #define __fltused (* _libXau___fltused)
X+ #define _ctype (* _libXau__ctype)
X+ #define _filbuf (* _libXau__filbuf)
X+ #define _flsbuf (* _libXau__flsbuf)
X+ #define _fltused (* _libXau__fltused)
X+ #define _iob (* _libXau__iob)
X+ #define abs (* _libXau_abs)
X+ #define access (* _libXau_access)
X+ #define alarm (* _libXau_alarm)
X+ #define asctime (* _libXau_asctime)
X+ #define atof (* _libXau_atof)
X+ #define atoi (* _libXau_atoi)
X+ #define calloc (* _libXau_calloc)
X+ #define chmod (* _libXau_chmod)
X+ #define close (* _libXau_close)
X+ #define creat (* _libXau_creat)
X+ #define errno (* _libXau_errno)
X+ #define exit (* _libXau_exit)
X+ #define fclose (* _libXau_fclose)
X+ #define fcntl (* _libXau_fcntl)
X+ #define fgets (* _libXau_fgets)
X+ #define fopen (* _libXau_fopen)
X+ #define fprintf (* _libXau_fprintf)
X+ #define fputs (* _libXau_fputs)
X+ #define fread (* _libXau_fread)
X+ #define free (* _libXau_free)
X+ #define fseek (* _libXau_fseek)
X+ #define ftell (* _libXau_ftell)
X+ #define fwrite (* _libXau_fwrite)
X+ #define getenv (* _libXau_getenv)
X+ #define getlogin (* _libXau_getlogin)
X+ #define getpwnam (* _libXau_getpwnam)
X+ #define getpwuid (* _libXau_getpwuid)
X+ #define getuid (* _libXau_getuid)
X+ #define ioctl (* _libXau_ioctl)
X+ #define link (* _libXau_link)
X+ #define localtime (* _libXau_localtime)
X+ #define malloc (* _libXau_malloc)
X+ #define memcpy (* _libXau_memcpy)
X+ #define memset (* _libXau_memset)
X+ #define open (* _libXau_open)
X+ #define perror (* _libXau_perror)
X+ #define poll (* _libXau_poll)
X+ #define printf (* _libXau_printf)
X+ #define qsort (* _libXau_qsort)
X+ #define rand (* _libXau_rand)
X+ #define read (* _libXau_read)
X+ #define realloc (* _libXau_realloc)
X+ #define signal (* _libXau_signal)
X+ #define sleep (* _libXau_sleep)
X+ #define sprintf (* _libXau_sprintf)
X+ #define srand (* _libXau_srand)
X+ #define sscanf (* _libXau_sscanf)
X+ #define strcat (* _libXau_strcat)
X+ #define strchr (* _libXau_strchr)
X+ #define strcmp (* _libXau_strcmp)
X+ #define strcpy (* _libXau_strcpy)
X+ #define strlen (* _libXau_strlen)
X+ #define strncmp (* _libXau_strncmp)
X+ #define strncpy (* _libXau_strncpy)
X+ #define strrchr (* _libXau_strrchr)
X+ #define sys_errlist (* _libXau_sys_errlist)
X+ #define sys_nerr (* _libXau_sys_nerr)
X+ #define system (* _libXau_system)
X+ #define times (* _libXau_times)
X+ #define tmpnam (* _libXau_tmpnam)
X+ #define toupper (* _libXau_toupper)
X+ #define ulimit (* _libXau_ulimit)
X+ #define uname (* _libXau_uname)
X+ #define unlink (* _libXau_unlink)
X+ #define write (* _libXau_write)
X+
X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE)
X+ #else
X+
X+ extern int __fltused;
X+ extern unsigned char _ctype[];
X+ extern int _filbuf();
X+ extern int _flsbuf();
X+ extern int _fltused;
X+ extern FILE *_iob;
X+ extern int abs();
X+ extern int access();
X+ extern int alarm();
X+ extern int asctime();
X+ extern double atof();
X+ extern int atoi();
X+ extern char *calloc();
X+ extern int chmod();
X+ extern int close();
X+ extern int creat();
X+ extern int errno;
X+ extern void exit();
X+ extern int fclose();
X+ extern int fcntl();
X+ extern char *fgets();
X+ extern FILE *fopen();
X+ extern int fprintf();
X+ extern int fputs();
X+ extern int fread();
X+ extern void free();
X+ extern int fseek();
X+ extern int ftell();
X+ extern int fwrite();
X+ extern char *getenv();
X+ extern int getlogin();
X+ extern struct passwd *getpwnam();
X+ extern struct passwd *getpwuid();
X+ extern int getuid();
X+ extern int ioctl();
X+ extern int link();
X+ extern struct tm *localtime();
X+ extern char *malloc();
X+ extern char *memcpy();
X+ extern char *memset();
X+ extern int open();
X+ extern void perror();
X+ extern int poll();
X+ extern int printf();
X+ extern int qsort();
X+ extern int rand();
X+ extern int read();
X+ extern char *realloc();
X+ extern void (*signal())();
X+ extern int sleep();
X+ extern int sprintf();
X+ extern void srand();
X+ extern int sscanf();
X+ extern int (* _libXau_stat)();
X+ extern char *strcat();
X+ extern char *strchr();
X+ extern int strcmp();
X+ extern char *strcpy();
X+ extern size_t strlen();
X+ extern int strncmp();
X+ extern char *strncpy();
X+ extern char *strrchr();
X+ extern char *sys_errlist[];
X+ extern int sys_nerr;
X+ extern int system();
X+ extern struct tm *(*_libXau_time)();
X+ extern int times();
X+ extern char *tmpnam();
X+ extern int toupper();
X+ extern int ulimit();
X+ extern int uname();
X+ extern int unlink();
X+ extern int write();
X+
X+ #endif
X+
X+ #endif
X+ #endif
X*** ./mit-orig/lib/Xau/sharedlib.c Thu Oct 4 18:01:24 1990
X--- ./mit/lib/Xau/sharedlib.c Sun Sep 16 22:41:18 1990
X***************
X*** 0 ****
X--- 1,90 ----
X+ #include "import.h"
X+ /*
X+ * $XConsortium: sharedlib.c,v 1.3 89/10/09 14:28:56 jim Exp $
X+ *
X+ * Copyright 1989 Massachusetts Institute of Technology
X+ *
X+ * This file is used to force shared libraries to get the right routines.
X+ */
X+
X+ #ifdef ATTSHAREDLIB
X+
X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE)
X+ #else
X+
X+ int __fltused = 0;
X+ unsigned char _ctype[] = 0;
X+ int _filbuf() = 0;
X+ int _flsbuf() = 0;
X+ int _fltused = 0;
X+ FILE *_iob = 0;
X+ int abs() = 0;
X+ int access() = 0;
X+ int alarm() = 0;
X+ int asctime() = 0;
X+ double atof() = 0;
X+ int atoi() = 0;
X+ char *calloc() = 0;
X+ int chmod() = 0;
X+ int close() = 0;
X+ int creat() = 0;
X+ int errno = 0;
X+ void exit() = 0;
X+ int fclose() = 0;
X+ int fcntl() = 0;
X+ char *fgets() = 0;
X+ FILE *fopen() = 0;
X+ int fprintf() = 0;
X+ int fputs() = 0;
X+ int fread() = 0;
X+ void free() = 0;
X+ int fseek() = 0;
X+ int ftell() = 0;
X+ int fwrite() = 0;
X+ char *getenv() = 0;
X+ int getlogin() = 0;
X+ struct passwd *getpwnam() = 0;
X+ struct passwd *getpwuid() = 0;
X+ int getuid() = 0;
X+ int ioctl() = 0;
X+ int link() = 0;
X+ struct tm *localtime() = 0;
X+ char *malloc() = 0;
X+ char *memcpy() = 0;
X+ char *memset() = 0;
X+ int open() = 0;
X+ void perror() = 0;
X+ int poll() = 0;
X+ int printf() = 0;
X+ int qsort() = 0;
X+ int rand() = 0;
X+ int read() = 0;
X+ char *realloc() = 0;
X+ void (*signal())() = 0;
X+ int sleep() = 0;
X+ int sprintf() = 0;
X+ void srand() = 0;
X+ int sscanf() = 0;
X+ int (* _libXau_stat)() = 0;
X+ char *strcat() = 0;
X+ char *strchr() = 0;
X+ int strcmp() = 0;
X+ char *strcpy() = 0;
X+ size_t strlen() = 0;
X+ int strncmp() = 0;
X+ char *strncpy() = 0;
X+ char *strrchr() = 0;
X+ char *sys_errlist[] = 0;
X+ int sys_nerr = 0;
X+ int system() = 0;
X+ struct tm *(*_libXau_time)() = 0;
X+ int times() = 0;
X+ char *tmpnam() = 0;
X+ int toupper() = 0;
X+ int ulimit() = 0;
X+ int uname() = 0;
X+ int unlink() = 0;
X+ int write() = 0;
X+
X+ #endif
X+ #endif
X*** ./mit-orig/lib/Xaw/AsciiSink.c Thu Oct 4 16:43:55 1990
X--- ./mit/lib/Xaw/AsciiSink.c Sun Sep 16 21:32:15 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #if (!defined(lint) && !defined(SABER))
X static char Xrcsid[] = "$XConsortium: AsciiSink.c,v 1.49 89/12/14 19:15:55 converse Exp $";
X #endif /* lint && SABER */
X*** ./mit-orig/lib/Xaw/AsciiSrc.c Thu Oct 4 16:43:39 1990
X--- ./mit/lib/Xaw/AsciiSrc.c Wed Sep 19 12:32:59 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #if ( !defined(lint) && !defined(SABER) )
X static char Xrcsid[] = "$XConsortium: AsciiSrc.c,v 1.28 90/01/10 14:25:21 kit Exp $";
X #endif
X*** ./mit-orig/lib/Xaw/AsciiText.c Thu Oct 4 16:43:34 1990
X--- ./mit/lib/Xaw/AsciiText.c Sun Sep 16 21:31:19 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #if (!defined(lint) && !defined(SABER))
X static char Xrcsid[] = "$XConsortium: AsciiText.c,v 1.36 89/12/11 14:42:56 kit Exp $";
X #endif /* lint && SABER */
X*** ./mit-orig/lib/Xaw/Box.c Thu Oct 4 16:43:57 1990
X--- ./mit/lib/Xaw/Box.c Sun Sep 16 21:28:29 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Box.c,v 1.43 89/12/07 20:14:26 kit Exp $";
X #endif /* lint */
X***************
X*** 75,81 ****
X--- 76,86 ----
X BoxClassRec boxClassRec = {
X {
X /* core_class fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ (WidgetClass) &compositeClassRec,
X+ #endif
X /* class_name */ "Box",
X /* widget_size */ sizeof(BoxRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/Clock.c Thu Oct 4 16:43:49 1990
X--- ./mit/lib/Xaw/Clock.c Sun Sep 16 21:27:45 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Clock.c,v 1.50 89/12/06 15:23:24 kit Exp $";
X #endif /* lint */
X***************
X*** 100,106 ****
X--- 101,111 ----
X
X ClockClassRec clockClassRec = {
X { /* core fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ &widgetClassRec,
X+ #endif
X /* class_name */ "Clock",
X /* widget_size */ sizeof(ClockRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/Command.c Thu Oct 4 16:43:40 1990
X--- ./mit/lib/Xaw/Command.c Sun Sep 16 21:26:40 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Command.c,v 1.70 89/12/12 20:17:23 swick Exp $";
X #endif /* lint */
X*** ./mit-orig/lib/Xaw/Dialog.c Thu Oct 4 16:43:50 1990
X--- ./mit/lib/Xaw/Dialog.c Sun Sep 16 21:25:52 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Dialog.c,v 1.37 89/12/06 15:26:31 kit Exp $";
X #endif /* lint */
X*** ./mit-orig/lib/Xaw/Form.c Thu Oct 4 16:43:50 1990
X--- ./mit/lib/Xaw/Form.c Sun Sep 16 21:24:26 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Form.c,v 1.34 89/12/13 13:51:07 kit Exp $";
X #endif /* lint */
X***************
X*** 79,85 ****
X--- 80,90 ----
X
X FormClassRec formClassRec = {
X { /* core_class fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ (WidgetClass) &constraintClassRec,
X+ #endif
X /* class_name */ "Form",
X /* widget_size */ sizeof(FormRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/FormP.h Thu Oct 4 16:44:03 1990
X--- ./mit/lib/Xaw/FormP.h Sun Sep 16 21:04:41 1990
X***************
X*** 37,43 ****
X--- 37,47 ----
X #define XtREdgeType "EdgeType"
X
X typedef enum {LayoutPending, LayoutInProgress, LayoutDone} LayoutState;
X+ #if defined(ATTSHAREDLIB) && !defined(XAWINIT_C)
X+ #define XtInheritLayout 0
X+ #else
X #define XtInheritLayout ((Boolean (*)())_XtInherit)
X+ #endif
X
X typedef struct {
X Boolean (*layout)(/* FormWidget, Dimension, Dimension */);
X*** ./mit-orig/lib/Xaw/Grip.c Thu Oct 4 16:43:53 1990
X--- ./mit/lib/Xaw/Grip.c Sun Sep 16 21:23:21 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Grip.c,v 1.27 89/12/08 12:35:56 swick Exp $";
X #endif /* lint */
X*** ./mit-orig/lib/Xaw/Imakefile Thu Oct 4 16:43:58 1990
X--- ./mit/lib/Xaw/Imakefile Sun Sep 16 22:49:46 1990
X***************
X*** 103,109 ****
X Toggle.c \
X Vendor.c \
X Viewport.c \
X! XawInit.c
X
X OBJS = \
X AsciiSink.o \
X--- 103,110 ----
X Toggle.c \
X Vendor.c \
X Viewport.c \
X! XawInit.c \
X! sharedlib.c
X
X OBJS = \
X AsciiSink.o \
X***************
X*** 137,143 ****
X Toggle.o \
X Vendor.o \
X Viewport.o \
X! XawInit.o
X
X #if SharedLibXaw
X # if DebugLibXaw
X--- 138,145 ----
X Toggle.o \
X Vendor.o \
X Viewport.o \
X! XawInit.o \
X! sharedlib.o
X
X #if SharedLibXaw
X # if DebugLibXaw
X*** ./mit-orig/lib/Xaw/Label.c Thu Oct 4 16:43:51 1990
X--- ./mit/lib/Xaw/Label.c Wed Sep 19 12:33:00 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Label.c,v 1.77 89/12/08 12:35:36 swick Exp $";
X #endif /* lint */
X***************
X*** 93,99 ****
X--- 94,104 ----
X /* class_inited */ FALSE,
X /* initialize */ Initialize,
X /* initialize_hook */ NULL,
X+ #ifdef ATTSHAREDLIB
X+ /* realize */ 0,
X+ #else
X /* realize */ XtInheritRealize,
X+ #endif
X /* actions */ NULL,
X /* num_actions */ 0,
X /* resources */ resources,
X*** ./mit-orig/lib/Xaw/List.c Thu Oct 4 16:43:48 1990
X--- ./mit/lib/Xaw/List.c Sun Sep 16 21:21:42 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #if ( !defined(lint) && !defined(SABER))
X static char Xrcs_id[] = "$XConsortium: List.c,v 1.26 89/12/11 15:08:31 kit Exp $";
X #endif
X***************
X*** 149,155 ****
X /* version */ XtVersion,
X /* callback_private */ NULL,
X /* tm_table */ defaultTranslations,
X! /* query_geometry */ PreferredGeom,
X },
X /* Simple class fields initialization */
X {
X--- 150,156 ----
X /* version */ XtVersion,
X /* callback_private */ NULL,
X /* tm_table */ defaultTranslations,
X! /* query_geometry */ PreferredGeom,
X },
X /* Simple class fields initialization */
X {
X*** ./mit-orig/lib/Xaw/Logo.c Thu Oct 4 16:44:06 1990
X--- ./mit/lib/Xaw/Logo.c Sun Sep 16 21:21:42 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Logo.c,v 1.11 89/10/09 16:20:39 jim Exp $";
X #endif
X***************
X*** 43,49 ****
X--- 44,54 ----
X
X LogoClassRec logoClassRec = {
X { /* core fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ &widgetClassRec,
X+ #endif
X /* class_name */ "Logo",
X /* widget_size */ sizeof(LogoRec),
X /* class_initialize */ XawInitializeWidgetSet,
X*** ./mit-orig/lib/Xaw/Mailbox.c Thu Oct 4 16:43:57 1990
X--- ./mit/lib/Xaw/Mailbox.c Sun Sep 16 21:20:03 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X /*
X * $XConsortium: Mailbox.c,v 1.35 89/10/09 16:51:44 jim Exp $
X *
X***************
X*** 116,122 ****
X--- 117,127 ----
X
X MailboxClassRec mailboxClassRec = {
X { /* core fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ &widgetClassRec,
X+ #endif
X /* class_name */ "Mailbox",
X /* widget_size */ sizeof(MailboxRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/MenuButton.c Thu Oct 4 16:44:04 1990
X--- ./mit/lib/Xaw/MenuButton.c Sun Sep 16 21:20:03 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: MenuButton.c,v 1.13 89/12/11 14:57:40 kit Exp $";
X #endif /* lint */
X*** ./mit-orig/lib/Xaw/Paned.c Thu Oct 4 16:43:42 1990
X--- ./mit/lib/Xaw/Paned.c Sun Sep 16 20:40:24 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Paned.c,v 1.13 90/03/01 10:48:51 jim Exp $";
X #endif /* lint */
X***************
X*** 185,191 ****
X--- 186,196 ----
X PanedClassRec panedClassRec = {
X {
X /* core class fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ 0,
X+ #else
X /* superclass */ (WidgetClass) SuperClass,
X+ #endif
X /* class name */ "Paned",
X /* size */ sizeof(PanedRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/Scrollbar.c Thu Oct 4 16:44:09 1990
X--- ./mit/lib/Xaw/Scrollbar.c Sun Sep 16 21:34:47 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] =
X "$XConsortium: Scrollbar.c,v 1.58 89/12/15 11:36:58 kit Exp $";
X***************
X*** 119,125 ****
X--- 120,130 ----
X
X ScrollbarClassRec scrollbarClassRec = {
X /* core fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ (WidgetClass) 0,
X+ #else
X /* superclass */ (WidgetClass) &widgetClassRec,
X+ #endif
X /* class_name */ "Scrollbar",
X /* size */ sizeof(ScrollbarRec),
X /* class_initialize */ ClassInitialize,
X*** ./mit-orig/lib/Xaw/Simple.c Thu Oct 4 16:43:47 1990
X--- ./mit/lib/Xaw/Simple.c Sun Sep 16 21:34:47 1990
X***************
X*** 1,3 ****
X--- 1,4 ----
X+ #include "import.h"
X #ifndef lint
X static char Xrcsid[] = "$XConsortium: Simple.c,v 1.26 89/12/18 10:52:32 rws Exp $";
X #endif /* lint */
X***************
X*** 48,54 ****
X--- 49,59 ----
X
X SimpleClassRec simpleClassRec = {
X { /* core fields */
X+ #ifdef ATTSHAREDLIB
X+ /* superclass */ (WidgetClass) 0,
X+ #else
X /* superclass */ (WidgetClass) &widgetClassRec,
X+ #endif
X /* class_name */ "Simple",
X /* widget_size */ sizeof(SimpleRec),
X /* class_initialize */ XawInitializeWidgetSet,
END_OF_FILE
if test 42291 -ne `wc -c <'fix-14.sco04'`; then
echo shar: \"'fix-14.sco04'\" unpacked with wrong size!
fi
# end of 'fix-14.sco04'
fi
echo shar: End of archive 4 \(of 12\).
cp /dev/null ark4isdone
MISSING=""
for I in 1 2 3 4 5 6 7 8 9 10 11 12 ; do
if test ! -f ark${I}isdone ; then
MISSING="${MISSING} ${I}"
fi
done
if test "${MISSING}" = "" ; then
echo You have unpacked all 12 archives.
echo "instructions are in fix-14.sco01"
rm -f ark[1-9]isdone ark[1-9][0-9]isdone
else
echo You still need to unpack the following archives:
echo " " ${MISSING}
fi
## End of shell archive.
exit 0
dan
----------------------------------------------------
O'Reilly && Associates argv@sun.com / argv@ora.com
Opinions expressed reflect those of the author only.