[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  6884ccbd Mention openssl-crypto in -VV list.
      from  bad97961 Elide -g from CXXFLAGS before the c++ test.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6884ccbd2f4f1cf9d350969e51bb6aca58a35da7
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 20 21:43:20 2020 -0700

    Mention openssl-crypto in -VV list.

-----------------------------------------------------------------------

Summary of changes:
 options.c | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/options.c b/options.c
index 3fee6691..a5f20452 100644
--- a/options.c
+++ b/options.c
@@ -583,18 +583,6 @@ static void print_capabilities(enum logcode f)
 		istring("%d-bit timestamps", (int)(sizeof (time_t) * 8)),
 		istring("%d-bit long ints", (int)(sizeof (int64) * 8)),
 
-	"*"
-#ifndef HAVE_SIMD
-		"no "
-#endif
-			"SIMD",
-
-	"*"
-#ifndef HAVE_ASM
-		"no "
-#endif
-			"ASM",
-
 #ifndef HAVE_SOCKETPAIR
 		"no "
 #endif
@@ -652,19 +640,44 @@ static void print_capabilities(enum logcode f)
 #endif
 			"prealloc",
 
+	"*"
+#ifndef HAVE_SIMD
+		"no "
+#endif
+			"SIMD",
+
+	"*"
+#ifndef HAVE_ASM
+		"no "
+#endif
+			"ASM",
+
+	"*"
+#ifndef USE_OPENSSL
+		"no "
+#endif
+			"openssl-crypto",
+
 		NULL
 	};
 
+	for (line_len = 0, j = 0; ; j++) {
+		char *cap = capabilities[j];
+		if (!cap)
+			break;
+		if (*cap == '*') {
+			if (version_opt_cnt < 2) {
+				capabilities[j] = NULL;
+				break;
+			}
+			capabilities[j]++;
+		}
+	}
+
 	for (line_len = 0, j = 0; ; j++) {
 		char *cap = capabilities[j];
 		int cap_len = cap ? strlen(cap) : 1000;
 		int need_comma = cap && capabilities[j+1] != NULL ? 1 : 0;
-		if (cap && *cap == '*') {
-			if (version_opt_cnt < 2)
-				continue;
-			cap++;
-			cap_len--;
-		}
 		if (line_len + 1 + cap_len + need_comma >= (int)sizeof line_buf) {
 			rprintf(f, "   %s\n", line_buf);
 			line_len = 0;


-- 
The rsync repository.