Attachment 3331 Details for Bug 2966 – 0001-scp-show-filename-match-patterns-in-verbose-mode.patch

[patch] 0001-scp-show-filename-match-patterns-in-verbose-mode.patch

0001-scp-show-filename-match-patterns-in-verbose-mode.patch (text/plain), 1.05 KB, created by Josef Cejka on 2019-09-26 19:56:01 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Cejka

Created: 2019-09-26 19:56:01 AEST

Size: 1.05 KB

patch

obsolete

>From 6e0c87029ecafffa5c8badd8337770de08597692 Mon Sep 17 00:00:00 2001
>From: Josef Cejka <jcejka@suse.com>
>Date: Tue, 24 Sep 2019 11:35:04 +0200
>Subject: [PATCH] scp: show filename match patterns in verbose mode
>
>If scp fails to match filename sent from remote server
>to list of expected patterns the filename and all
>the patterns are printed out in verbose mode.
>---
> scp.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/scp.c b/scp.c
>index fc681cd3..875f3976 100644
>--- a/scp.c
>+++ b/scp.c
>@@ -1482,8 +1482,16 @@ sink(int argc, char **argv, const char *src)
> 				if (fnmatch(patterns[n], cp, 0) == 0)
> 					break;
> 			}
>-			if (n >= npatterns)
>+			if (n >= npatterns) {
>+				if (verbose_mode) {
>+					fprintf(stderr, "expected filenames:\n");
>+					for (n = 0; n < npatterns; n++)
>+						fprintf(stderr, "  \"%s\"\n", patterns[n]);
>+					fprintf(stderr, "incoming filename:\n");
>+					fprintf(stderr, "  \"%s\"\n", cp);
>+				}
> 				SCREWUP("filename does not match request");
>+			}
> 		}
> 		if (targisdir) {
> 			static char *namebuf;
>-- 
>2.16.4
>

Actions: View | Diff

Attachments on bug 2966: 3331