diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2013-05-23 20:57:20 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2013-05-23 20:57:20 +0000 |
| commit | 6b239879f8618cbe72ce0487d65eb231c35c2fd1 (patch) | |
| tree | 712b2d1d3d7fe2956f3c85a07bce8dec224e5986 /usr.bin/patch/pch.c | |
| parent | 08ad1a7ac6406722ab06c14e81ae4317a6e3c35f (diff) | |
Notes
Diffstat (limited to 'usr.bin/patch/pch.c')
| -rw-r--r-- | usr.bin/patch/pch.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index 4c06bbffd442..411dcac0c931 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1537,10 +1537,16 @@ best_name(const struct file_name *names, bool assume_exists) continue; if ((tmp = num_components(names[i].path)) > min_components) continue; - min_components = tmp; + if (tmp < min_components) { + min_components = tmp; + best = names[i].path; + } if ((tmp = strlen(basename(names[i].path))) > min_baselen) continue; - min_baselen = tmp; + if (tmp < min_baselen) { + min_baselen = tmp; + best = names[i].path; + } if ((tmp = strlen(names[i].path)) > min_len) continue; min_len = tmp; |