*BSD News Article 14472


Return to BSD News archive

Newsgroups: comp.os.386bsd.apps
Path: sserve!csadfa.cs.adfa.oz.au!wkt
From: wkt@csadfa.cs.adfa.oz.au (Warren Toomey)
Subject: Patch for Tcx1.1 for 386bsd-0.1
Message-ID: <1993Apr15.023703.18884@sserve.cc.adfa.oz.au>
Sender: news@sserve.cc.adfa.oz.au
Organization: Australian Defence Force Academy, Canberra, Australia
Date: Thu, 15 Apr 1993 02:37:03 GMT

Below is the small number of patches I added to make the executable
compression program Tcx1.1 work for 386bsd-0.1. I've submitted the
patches to the author, so hopefully they will be worked into the next
release. You can get Tcx from turiel.cs.mu.oz.au using anon ftp from the
/pub directory.

P.S It sure made an impact on the X386 binary directory :-)

	Warren


# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	Makefile.diff
#	config.h.diff
#	tcx.c.diff
#	untcx.c.diff
#
echo x - Makefile.diff
sed 's/^X//' >Makefile.diff << 'END-of-Makefile.diff'
X*** Old/Makefile	Mon Apr  5 18:33:19 1993
X--- Makefile	Wed Apr 14 12:30:43 1993
X***************
X*** 15,22 ****
X  
X  
X  # Any libraries
X! LIBS = -lmalloc -lc_s	# IRIX
X! #LIBS =			# SUNOS, ULTRIX, AIX
X  
X  
X  all:	tcx untcx
X--- 15,22 ----
X  
X  
X  # Any libraries
X! #LIBS = -lmalloc -lc_s	# IRIX
X! LIBS =			# SUNOS, ULTRIX, AIX, JOLIX
X  
X  
X  all:	tcx untcx
END-of-Makefile.diff
echo x - config.h.diff
sed 's/^X//' >config.h.diff << 'END-of-config.h.diff'
X*** Old/config.h	Mon Apr  5 18:36:51 1993
X--- config.h	Wed Apr 14 12:29:16 1993
X***************
X*** 24,33 ****
X  /************************************************************************/
X  
X  /* #define	SUNOS		/* */
X! #define	IRIX		/* */
X  /* #define	AIX		/* */
X  /* #define	ULTRIX		/* */
X  /* #define	LINUX		/* */
X  
X  /************************************************************************/
X  /* SUNOS requires the pstat command to be available.  This is part of 	*/
X--- 24,34 ----
X  /************************************************************************/
X  
X  /* #define	SUNOS		/* */
X! /* #define	IRIX		/* */
X  /* #define	AIX		/* */
X  /* #define	ULTRIX		/* */
X  /* #define	LINUX		/* */
X+ #define	JOLIX		/* */
X  
X  /************************************************************************/
X  /* SUNOS requires the pstat command to be available.  This is part of 	*/
X***************
X*** 64,70 ****
X  /************************************************************************/
X  
X  #define	PATHPACKER	"/usr/local/bin/gzip"
X! /*#define	PACKEROPTS	"-7"			/* Optional */
X  
X  /************************************************************************/
X  /* PATHUNPACK and the optional UNPACKOPTS serve a similar purpose to	*/
X--- 65,71 ----
X  /************************************************************************/
X  
X  #define	PATHPACKER	"/usr/local/bin/gzip"
X! #define	PACKEROPTS	"-9"			/* Optional */
X  
X  /************************************************************************/
X  /* PATHUNPACK and the optional UNPACKOPTS serve a similar purpose to	*/
X***************
X*** 96,102 ****
X  /* problem with fcntl locks on SUNOS tmpfs.				*/
X  /************************************************************************/
X  
X! #define	ENFSDIR		"/tmp/exec"
X  
X  /************************************************************************/
X  /* SCANRATE is the interval in seconds which the tcx daemon waits before*/
X--- 97,103 ----
X  /* problem with fcntl locks on SUNOS tmpfs.				*/
X  /************************************************************************/
X  
X! #define	ENFSDIR		"/usr/tmp"
X  
X  /************************************************************************/
X  /* SCANRATE is the interval in seconds which the tcx daemon waits before*/
X***************
X*** 144,149 ****
X--- 145,151 ----
X  
X  #if defined(LINUX)
X  #define	__USE_BSD_SIGNAL
X+ #undef	SIGTYPE
X  #define	SIGTYPE	void
X  #endif
X  
X***************
X*** 152,158 ****
X  #define	PUSLEEP(x)	(sginap((long)((x)/10000)))
X  #endif
X  
X! #if defined(ULTRIX) || defined(SUNOS) || defined(AIX) || defined(LINUX)
X  #define	PUSLEEP(x)	(usleep(x))	/* usleep code in untcx.c for ULTRIX */
X  #endif
X  
X--- 154,160 ----
X  #define	PUSLEEP(x)	(sginap((long)((x)/10000)))
X  #endif
X  
X! #if defined(ULTRIX) || defined(SUNOS) || defined(AIX) || defined(LINUX) || defined(JOLIX)
X  #define	PUSLEEP(x)	(usleep(x))	/* usleep code in untcx.c for ULTRIX */
X  #endif
X  
X***************
X*** 169,175 ****
X  
X  #include        <sys/types.h>
X  
X! #if defined(ULTRIX) || defined(LINUX)
X  #include	<sys/param.h>
X  #include	<sys/mount.h>
X  #endif
X--- 171,177 ----
X  
X  #include        <sys/types.h>
X  
X! #if defined(ULTRIX) || defined(LINUX) || defined(JOLIX)
X  #include	<sys/param.h>
X  #include	<sys/mount.h>
X  #endif
END-of-config.h.diff
echo x - tcx.c.diff
sed 's/^X//' >tcx.c.diff << 'END-of-tcx.c.diff'
X*** Old/tcx.c	Mon Apr  5 18:32:12 1993
X--- tcx.c	Tue Apr 13 16:22:20 1993
X***************
X*** 354,360 ****
X  doencode(int infd, int outfd)
X  {
X  int	pid;
X! #if defined(AIX) || defined(IRIX)
X  int	status;
X  #else
X  union wait status;
X--- 354,360 ----
X  doencode(int infd, int outfd)
X  {
X  int	pid;
X! #if defined(AIX) || defined(IRIX) || defined(JOLIX)
X  int	status;
X  #else
X  union wait status;
END-of-tcx.c.diff
echo x - untcx.c.diff
sed 's/^X//' >untcx.c.diff << 'END-of-untcx.c.diff'
X*** Old/untcx.c	Mon Apr  5 18:34:34 1993
X--- untcx.c	Tue Apr 13 16:25:12 1993
X***************
X*** 630,636 ****
X  SIGTYPE
X  tcxd_reaper()
X  {
X! #if defined(AIX)
X  int	state;
X  #else
X  union wait state;
X--- 630,636 ----
X  SIGTYPE
X  tcxd_reaper()
X  {
X! #if defined(AIX) || defined(JOLIX)
X  int	state;
X  #else
X  union wait state;
X***************
X*** 1313,1319 ****
X  dodecode(int infd, int outfd)
X  {
X  int	pid;
X! #if defined(IRIX) || defined(AIX)
X  int	status;
X  #else
X  union wait status;
X--- 1313,1319 ----
X  dodecode(int infd, int outfd)
X  {
X  int	pid;
X! #if defined(IRIX) || defined(AIX) || defined(JOLIX)
X  int	status;
X  #else
X  union wait status;
END-of-untcx.c.diff
exit