d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve bsdpatch usability:

Browse Source 
- 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)
This commit is contained in:
Xin LI 2013-09-26 18:00:45 +00:00
parent e4dedeefae
commit e11cd3bc59
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=255894
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/patch/patch.c
View File

@ -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;
}

2
usr.bin/patch/util.c
View File

@ -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);
}