You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.7 KiB
50 lines
1.7 KiB
From 3d7015afa223494e3318495c2f5de9cb49229da9 Mon Sep 17 00:00:00 2001
|
|
From: Wayne Davison <wayne@opencoder.net>
|
|
Date: Mon, 1 Aug 2022 07:29:44 -0700
|
|
Subject: [PATCH] A few more minor changes.
|
|
|
|
---
|
|
exclude.c | 21 +++++++++++----------
|
|
1 file changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
--- a/exclude.c
|
|
+++ b/exclude.c
|
|
@@ -313,13 +313,10 @@ void add_implied_include(const char *arg
|
|
if (am_server || old_style_args || list_only || filesfrom_host != NULL)
|
|
return;
|
|
if (relative_paths) {
|
|
- cp = strstr(arg, "/./");
|
|
- if (cp)
|
|
- arg = cp+3;
|
|
- } else {
|
|
- if ((cp = strrchr(arg, '/')) != NULL)
|
|
- arg = cp + 1;
|
|
- }
|
|
+ if ((cp = strstr(arg, "/./")) != NULL)
|
|
+ arg = cp + 3;
|
|
+ } else if ((cp = strrchr(arg, '/')) != NULL)
|
|
+ arg = cp + 1;
|
|
arg_len = strlen(arg);
|
|
if (arg_len) {
|
|
if (strpbrk(arg, "*[?")) {
|
|
@@ -359,13 +356,17 @@ void add_implied_include(const char *arg
|
|
int found = 0;
|
|
*p = '\0';
|
|
for (ent = implied_filter_list.head; ent; ent = ent->next) {
|
|
- if (ent != rule && strcmp(ent->pattern, rule->pattern) == 0)
|
|
+ if (ent != rule && strcmp(ent->pattern, rule->pattern) == 0) {
|
|
found = 1;
|
|
+ break;
|
|
+ }
|
|
}
|
|
if (!found) {
|
|
filter_rule *R_rule = new0(filter_rule);
|
|
- R_rule->rflags = FILTRULE_INCLUDE | FILTRULE_DIRECTORY
|
|
- | (saw_wild ? FILTRULE_WILD : 0);
|
|
+ R_rule->rflags = FILTRULE_INCLUDE | FILTRULE_DIRECTORY;
|
|
+ /* Check if our sub-path has wildcards or escaped backslashes */
|
|
+ if (saw_wild && strpbrk(rule->pattern, "*[?\\"))
|
|
+ R_rule->rflags |= FILTRULE_WILD;
|
|
R_rule->pattern = strdup(rule->pattern);
|
|
R_rule->u.slash_cnt = slash_cnt;
|
|
R_rule->next = implied_filter_list.head;
|