[PATCH 03/16] scp: pass `-v' only when DEBUG_TRACE is set

Michael Witten mfwitten at gmail.com
Tue Dec 8 06:52:29 AWST 2015


Date: Wed, 4 Nov 2015 06:30:28 -0000
The program `dbclient' understands the option `-v' only when
it is built with the macro DEBUG_TRACE defined; ergo, the
program `scp' should pass `-v' to `dbclient' only when the
macro DEBUG_TRACE is defined.
---
 scp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scp.c b/scp.c
index b9aad3f..53789bf 100644
--- a/scp.c
+++ b/scp.c
@@ -362,7 +362,9 @@ main(int argc, char **argv)
 			ssh_program = xstrdup(optarg);
 			break;
 		case 'v':
+#ifdef DEBUG_TRACE
 			addargs(&args, "-v");
+#endif
 			verbose_mode = 1;
 			break;
 		case 'q':
@@ -491,8 +493,10 @@ toremote(char *targ, int argc, char **argv)
 		if (src) {	/* remote to remote */
 			freeargs(&alist);
 			addargs(&alist, "%s", ssh_program);
+#ifdef DEBUG_TRACE
 			if (verbose_mode)
 				addargs(&alist, "-v");
+#endif
 #if 0
 			/* Disabled since dbclient won't understand them
 			   and scp works fine without them. */
-- 
2.4.3



More information about the Dropbear mailing list