Newsgroups: news.software.b
Path: utzoo!henry
From: henry@utzoo.uucp (Henry Spencer)
Subject: patch (!) to 14-Sep-1989 C News patch
Message-ID: <1989Sep16.225749.23376@utzoo.uucp>
Organization: U of Toronto Zoology
Date: Sat, 16 Sep 89 22:57:49 GMT

Sigh.  Sometimes life would be a whole lot simpler if patch didn't try
to be "smart", or at least if there were a way to tell it to stop thinking
and follow orders because we know what we're doing dammit...  The part of
the 14-Sep-1989 patch that meant to turn the empty relay/regress/out/stderr
into a one-line file ends up creating cnpatch/tmp.file instead.  Here is
a patch to the patch (!) to fix this.  A corrected complete patch will be
next.  The only adverse effects of applying the original 14-Sep-1989 patch
are the creation of a useless directory cnpatch and a useless file in it,
and the fact that the relaynews regression test will fail unnecessarily.
If you want a fix that doesn't involve re-applying patches, just do this:

	cp cnpatch/tmp.file relay/regress/out/stderr
	rm -rf cnpatch

*** 14-Sep-1989.orig	Sat Sep 16 18:49:35 1989
--- 14-Sep-1989	Sat Sep 16 18:49:38 1989
***************
*** 1566,1572 ****
    	    (readcnt=fread(block, 1, (int)min(art->a_unread, COPYSIZE), in)) > 0;
    	    art->a_unread -= readcnt, art->a_charswritten += readcnt)
  
! *** cnpatch/tmp.file	Thu Sep 14 15:54:41 1989
  --- relay/regress/out/stderr	Wed Sep 13 20:35:17 1989
  ***************
  *** 0 ****
--- 1566,1572 ----
    	    (readcnt=fread(block, 1, (int)min(art->a_unread, COPYSIZE), in)) > 0;
    	    art->a_unread -= readcnt, art->a_charswritten += readcnt)
  
! *** cnpatch/tmp.nonexistent.file.with.very.long.name.for.stupid.patch	Thu Sep 14 15:54:41 1989
  --- relay/regress/out/stderr	Wed Sep 13 20:35:17 1989
  ***************
  *** 0 ****
-- 
V7 /bin/mail source: 554 lines.|     Henry Spencer at U of Toronto Zoology
1989 X.400 specs: 2200+ pages. | uunet!attcan!utzoo!henry henry@zoo.toronto.edu