From owner-cvs-gnu Thu Feb 13 13:10:53 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id NAA08681 for cvs-gnu-outgoing; Thu, 13 Feb 1997 13:10:53 -0800 (PST) Received: (from jmg@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id NAA08670; Thu, 13 Feb 1997 13:10:51 -0800 (PST) Date: Thu, 13 Feb 1997 13:10:51 -0800 (PST) From: John-Mark Gurney Message-Id: <199702132110.NAA08670@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/patch Makefile inp.c patch.c pch.c util.c util.h Sender: owner-cvs-gnu@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jmg 97/02/13 13:10:49 Modified: gnu/usr.bin/patch Makefile inp.c patch.c pch.c util.c util.h Log: Fix a problem with patch in that is will always default, even when the controlling terminal is closed. Now the function ask() will return 1 when th input is known to come from a file or terminal, or it will return 0 when ther was a read error. Modified the question "Skip patch?" so that on an error from ask it will skip the patch instead of looping. Closes PR#777 2.2 candidate Revision Changes Path 1.3 +1 -1 src/gnu/usr.bin/patch/Makefile 1.4 +6 -3 src/gnu/usr.bin/patch/inp.c 1.7 +6 -3 src/gnu/usr.bin/patch/patch.c 1.9 +10 -5 src/gnu/usr.bin/patch/pch.c 1.3 +9 -2 src/gnu/usr.bin/patch/util.c 1.3 +5 -2 src/gnu/usr.bin/patch/util.h