From owner-svn-src-head@FreeBSD.ORG Thu Sep 26 18:00:45 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F0296F87; Thu, 26 Sep 2013 18:00:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C37872E30; Thu, 26 Sep 2013 18:00:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QI0jWg077602; Thu, 26 Sep 2013 18:00:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QI0jVS077595; Thu, 26 Sep 2013 18:00:45 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201309261800.r8QI0jVS077595@svn.freebsd.org> From: Xin LI Date: Thu, 26 Sep 2013 18:00:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255894 - head/usr.bin/patch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2013 18:00:46 -0000 Author: delphij Date: Thu Sep 26 18:00:45 2013 New Revision: 255894 URL: http://svnweb.freebsd.org/changeset/base/255894 Log: Improve bsdpatch usability: - Ask only once for "Apply anyway". [1] - Tell user what file have failed patch rather than just how many hunks failed. Reported by: jmg via pfg [1] Tested by: pfg [1] Approved by: re (gjb) Modified: head/usr.bin/patch/patch.c head/usr.bin/patch/util.c Modified: head/usr.bin/patch/patch.c ============================================================================== --- head/usr.bin/patch/patch.c Thu Sep 26 17:55:36 2013 (r255893) +++ head/usr.bin/patch/patch.c Thu Sep 26 18:00:45 2013 (r255894) @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) { int error = 0, hunk, failed, i, fd; - bool patch_seen; + bool patch_seen, reverse_seen; LINENUM where = 0, newwhere, fuzz, mymaxfuzz; const char *tmpdir; char *v; @@ -247,6 +247,7 @@ main(int argc, char *argv[]) /* apply each hunk of patch */ hunk = 0; failed = 0; + reverse_seen = false; out_of_mem = false; while (another_hunk()) { hunk++; @@ -257,7 +258,7 @@ main(int argc, char *argv[]) if (!skip_rest_of_patch) { do { where = locate_hunk(fuzz); - if (hunk == 1 && where == 0 && !force) { + if (hunk == 1 && where == 0 && !force && !reverse_seen) { /* dwim for reversed patch? */ if (!pch_swap()) { if (fuzz == 0) @@ -293,6 +294,8 @@ main(int argc, char *argv[]) ask("Apply anyway? [n] "); if (*buf != 'y') skip_rest_of_patch = true; + else + reverse_seen = true; where = 0; reverse = !reverse; if (!pch_swap()) @@ -406,8 +409,8 @@ main(int argc, char *argv[]) say("%d out of %d hunks %s--saving rejects to %s\n", failed, hunk, skip_rest_of_patch ? "ignored" : "failed", rejname); else - say("%d out of %d hunks %s\n", - failed, hunk, skip_rest_of_patch ? "ignored" : "failed"); + say("%d out of %d hunks %s while patching %s\n", + failed, hunk, skip_rest_of_patch ? "ignored" : "failed", filearg[0]); if (!check_only && move_file(TMPREJNAME, rejname) < 0) trejkeep = true; } Modified: head/usr.bin/patch/util.c ============================================================================== --- head/usr.bin/patch/util.c Thu Sep 26 17:55:36 2013 (r255893) +++ head/usr.bin/patch/util.c Thu Sep 26 18:00:45 2013 (r255894) @@ -412,7 +412,7 @@ checked_in(char *file) void version(void) { - fprintf(stderr, "patch 2.0-12u9 FreeBSD\n"); + fprintf(stderr, "patch 2.0-12u10 FreeBSD\n"); my_exit(EXIT_SUCCESS); }