REPOST: Deliver 1.00 patch #3

[Chip Salzenberg]

This is an offical patch for deliver 1.00.  Please apply it.

Patch number:   3
Date:           21 Nov 1988
Priority:       HIGH for System V, LOW otherwise
Changes:
	Call setvbuf() correctly for non-Xenix systems.
	(Why does Xenix always have to be different?)

	Fix Makefile for GNU Make.

	Remove hard-coded reference to shell pathname.


Index: patchlevel.h
Prereq: 2
***************
*** 1 ****
! #define PATCHLEVEL 2
--- 1 ----
! #define PATCHLEVEL 3

Index: Makefile
***************
*** 1,4 ****
! # $Header: Makefile,v 1.7 88/09/14 19:59:53 network Exp $
  #
  # Makefile for deliver
  #
--- 1,4 ----
! # $Header: Makefile,v 1.8 88/11/21 13:11:27 network Exp $
  #
  # Makefile for deliver
  #
***************
*** 73,78 ****
--- 73,88 ----
  
  OBJS =  context.o copymsg.o debug.o dest.o dfile.o lock.o \
  	main.o mbox.o procs.o subs.o sysdep.o uucp.o
+ 
+ #
+ # For GNU Make.  Sorry about the ugliness.
+ #
+ 
+ .PHONY: all install lint shar clean clobber
+ 
+ #
+ # How to compile and link the program.
+ #
  
  all: deliver
  deliver: $(OBJS)

Index: config.h
***************
*** 1,8 ****
! /* $Header: config.h,v 1.4 88/11/18 12:16:39 network Exp $
   *
   * Deliver configuration.
   *
   * $Log:	config.h,v $
   * Revision 1.4  88/11/18  12:16:39  network
   * patch2: Improved signal handling.
   * patch2: Make sure all environment variables are always provided.
--- 1,13 ----
! /* $Header: config.h,v 1.5 88/11/21 13:12:11 network Exp $
   *
   * Deliver configuration.
   *
   * $Log:	config.h,v $
+  * Revision 1.5  88/11/21  13:12:11  network
+  * patch3: Fix Makefile for GNU Make.
+  * patch3: Remove hard-coded shell name.
+  * patch3: Fix call to setvbuf() for System V.
+  * 
   * Revision 1.4  88/11/18  12:16:39  network
   * patch2: Improved signal handling.
   * patch2: Make sure all environment variables are always provided.
***************
*** 104,109 ****
--- 109,122 ----
  #ifndef BSD
  #define HAS_VPRINTF
  #define HAS_PUTENV
+ #endif
+ 
+ /*----------------------------------------------------------------------
+  * Is setvbuf() backwards?  (Blech!)
+  */
+ 
+ #ifdef M_XENIX
+ #define XENIX_SETVBUF
  #endif
  
  /*----------------------------------------------------------------------

Index: dfile.c
***************
*** 1,8 ****
! /* $Header: dfile.c,v 1.3 88/10/13 12:19:22 network Exp $
   *
   * Filter destination(s) through delivery file(s).
   *
   * $Log:	dfile.c,v $
   * Revision 1.3  88/10/13  12:19:22  network
   * patch1: add "-n" option, and general bug fixes.
   * 
--- 1,13 ----
! /* $Header: dfile.c,v 1.4 88/11/21 13:12:19 network Exp $
   *
   * Filter destination(s) through delivery file(s).
   *
   * $Log:	dfile.c,v $
+  * Revision 1.4  88/11/21  13:12:19  network
+  * patch3: Fix Makefile for GNU Make.
+  * patch3: Remove hard-coded shell name.
+  * patch3: Fix call to setvbuf() for System V.
+  * 
   * Revision 1.3  88/10/13  12:19:22  network
   * patch1: add "-n" option, and general bug fixes.
   * 
***************
*** 216,222 ****
  
  	d->state = ST_HOLD;
  
! 	fav[0] = "sh";
  	fav[1] = udel_path;
  	fav[2] = d->name;
  	fav[3] = NULL;
--- 221,227 ----
  
  	d->state = ST_HOLD;
  
! 	fav[0] = shell;
  	fav[1] = udel_path;
  	fav[2] = d->name;
  	fav[3] = NULL;
***************
*** 261,267 ****
  	if (verbose)
  		message("Processing delivery file as %s\n", ct->name);
  
! 	if ((fp = ct_popenv(ct, "/bin/sh", av, "r")) == NULL)
  	{
  		error("can't execute delivery file as %s\n", ct->name);
  		leave(1);
--- 266,272 ----
  	if (verbose)
  		message("Processing delivery file as %s\n", ct->name);
  
! 	if ((fp = ct_popenv(ct, shell, av, "r")) == NULL)
  	{
  		error("can't execute delivery file as %s\n", ct->name);
  		leave(1);

Index: misc.h
***************
*** 1,8 ****
! /* $Header: misc.h,v 1.2 88/09/14 19:42:20 network Exp $
   *
   * Miscellaneous definitions.
   *
   * $Log:	misc.h,v $
   * Revision 1.2  88/09/14  19:42:20  network
   * Portability to System V and BSD.
   * General fixup.
--- 1,13 ----
! /* $Header: misc.h,v 1.3 88/11/21 13:12:29 network Exp $
   *
   * Miscellaneous definitions.
   *
   * $Log:	misc.h,v $
+  * Revision 1.3  88/11/21  13:12:29  network
+  * patch3: Fix Makefile for GNU Make.
+  * patch3: Remove hard-coded shell name.
+  * patch3: Fix call to setvbuf() for System V.
+  * 
   * Revision 1.2  88/09/14  19:42:20  network
   * Portability to System V and BSD.
   * General fixup.
***************
*** 82,87 ****
--- 87,97 ----
  extern  int     setvbuf();
  
  #define Zero(d,n)       memset(d,0,(int)(n))
+ 
+ #ifdef XENIX_SETVBUF
  #define Linebuf(f)      setvbuf(f, _IOLBF, (char *)NULL, BUFSIZ)
+ #else
+ #define Linebuf(f)      setvbuf(f, (char *)NULL, _IOLBF, BUFSIZ)
+ #endif
  
  #endif  /* not BSD */
-- 
Chip Salzenberg             <chip at ateng.com> or <uunet!ateng!chip>
A T Engineering             Me?  Speak for my company?  Surely you jest!
	   Beware of programmers carrying screwdrivers.