73 lines
2.1 KiB
Diff
73 lines
2.1 KiB
Diff
|
--- patch-2.6/src/pch.c 2009-11-02 19:09:57.000000000 +0000
|
||
|
|
+++ patch-2.6-4-ge2218ac/src/pch.c 2009-12-22 23:03:27.000000000 +0000
|
||
|
|
@@ -195,23 +195,22 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
static bool
|
||
|
|
-maybe_reverse (char const *name, bool nonexistent, bool empty)
|
||
|
|
+maybe_reverse (char const *name, bool nonexistent, bool is_empty)
|
||
|
|
{
|
||
|
|
- bool is_empty = nonexistent || empty;
|
||
|
|
- bool r;
|
||
|
|
+ bool looks_reversed = (! is_empty) < p_says_nonexistent[reverse ^ is_empty];
|
||
|
|
|
||
|
|
- r = (! is_empty) < p_says_nonexistent[reverse ^ is_empty]
|
||
|
|
- && ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
|
||
|
|
- reverse ? ", when reversed," : "",
|
||
|
|
- (nonexistent ? "delete"
|
||
|
|
- : empty ? "empty out"
|
||
|
|
- : "create"),
|
||
|
|
- quotearg (name),
|
||
|
|
- (nonexistent ? "does not exist"
|
||
|
|
- : empty ? "is already empty"
|
||
|
|
- : "already exists"));
|
||
|
|
- reverse ^= r;
|
||
|
|
- return r;
|
||
|
|
+ if (looks_reversed)
|
||
|
|
+ reverse ^=
|
||
|
|
+ ok_to_reverse ("The next patch%s would %s the file %s,\nwhich %s!",
|
||
|
|
+ reverse ? ", when reversed," : "",
|
||
|
|
+ (nonexistent ? "delete"
|
||
|
|
+ : is_empty ? "empty out"
|
||
|
|
+ : "create"),
|
||
|
|
+ quotearg (name),
|
||
|
|
+ (nonexistent ? "does not exist"
|
||
|
|
+ : is_empty ? "is already empty"
|
||
|
|
+ : "already exists"));
|
||
|
|
+ return looks_reversed;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* True if the remainder of the patch file contains a diff of some sort. */
|
||
|
|
@@ -638,6 +637,7 @@
|
||
|
|
|
||
|
|
if (! posixly_correct)
|
||
|
|
{
|
||
|
|
+ /* The best of all existing files. */
|
||
|
|
i = best_name (p_name, stat_errno);
|
||
|
|
|
||
|
|
if (i == NONE && patch_get)
|
||
|
|
@@ -680,12 +680,10 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (i != NONE && st[i].st_size > 0)
|
||
|
|
- i0 = i;
|
||
|
|
if (i0 != NONE
|
||
|
|
- && ! maybe_reverse (p_name[i0], i == NONE,
|
||
|
|
- i == NONE || st[i].st_size == 0))
|
||
|
|
- i = i0;
|
||
|
|
+ && maybe_reverse (p_name[i0], i == NONE,
|
||
|
|
+ i == NONE || st[i].st_size == 0))
|
||
|
|
+ i = i0;
|
||
|
|
|
||
|
|
if (i == NONE && p_says_nonexistent[reverse])
|
||
|
|
{
|
||
|
|
@@ -706,6 +704,7 @@
|
||
|
|
if (p_name[i])
|
||
|
|
distance_from_minimum[i] = newdirs[i] - newdirs_min;
|
||
|
|
|
||
|
|
+ /* The best of the filenames which create the fewest directories. */
|
||
|
|
i = best_name (p_name, distance_from_minimum);
|
||
|
|
}
|
||
|
|
}
|