git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 06/10] promisor-remote: refactor has_control_char()

From
Christian Couder <christian.couder@gmail.com>
Date
Apr 7, 2026, 11:52 UTC
Message-ID
<20260407115243.358642-7-christian.couder@gmail.com>
In-Reply-To
<20260407115243.358642-1-christian.couder@gmail.com>

In a future commit we are going to check if some strings contain control characters, so let's refactor the logic to do that in a new has_control_char() helper function.

It cleans up the code a bit anyway.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 promisor-remote.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index 5860a3d3f3..d60518f19c 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -642,6 +642,14 @@ static int all_fields_match(struct promisor_info *advertised,
 	return 1;
 }
 
+static bool has_control_char(const char *s)
+{
+	for (const char *c = s; *c; c++)
+		if (iscntrl(*c))
+			return true;
+	return false;
+}
+
 static int should_accept_remote(enum accept_promisor accept,
 				struct promisor_info *advertised,
 				struct string_list *config_info)
@@ -772,18 +780,14 @@ static bool valid_filter(const char *filter, const char *remote_name)
 	return !res;
 }
 
-/* Check that a token doesn't contain any control character */
 static bool valid_token(const char *token, const char *remote_name)
 {
-	const char *c = token;
-
-	for (; *c; c++)
-		if (iscntrl(*c)) {
-			warning(_("invalid token '%s' for remote '%s' "
-				  "will not be stored"),
-				token, remote_name);
-			return false;
-		}
+	if (has_control_char(token)) {
+		warning(_("invalid token '%s' for remote '%s' "
+			  "will not be stored"),
+			token, remote_name);
+		return false;
+	}
 
 	return true;
 }
-- 
2.54.0.rc0.114.g05d466edb8
Previous: Christian CouderNext: Christian Couder
Message 31 of 35 in “Prepare for advertised remotes auto-configure via URL allowlist”
  1. 00/10 Prepare for advertised remotes auto-configure via URL allowlistChristian Couder, Apr 2, 2026
  2. 01/10 promisor-remote: try accepted remotes before others in get_direct()Christian Couder, Apr 2, 2026
  3. Patrick SteinhardtApr 2, 2026
  4. Christian CouderApr 7, 2026
  5. Junio C HamanoApr 7, 2026
  6. 02/10 promisor-remote: pass config entry to all_fields_match() directlyChristian Couder, Apr 2, 2026
  7. 03/10 promisor-remote: clarify that a remote is ignoredChristian Couder, Apr 2, 2026
  8. 04/10 promisor-remote: reject empty name or URL in advertised remoteChristian Couder, Apr 2, 2026
  9. Patrick SteinhardtApr 2, 2026
  10. 05/10 promisor-remote: refactor should_accept_remote() control flowChristian Couder, Apr 2, 2026
  11. 06/10 promisor-remote: refactor has_control_char()Christian Couder, Apr 2, 2026
  12. 07/10 promisor-remote: refactor accept_from_server()Christian Couder, Apr 2, 2026
  13. 08/10 promisor-remote: keep accepted promisor_info structs aliveChristian Couder, Apr 2, 2026
  14. 09/10 promisor-remote: remove the 'accepted' strvecChristian Couder, Apr 2, 2026
  15. 10/10 t5710: use proper file:// URIs for absolute pathsChristian Couder, Apr 2, 2026
  16. Junio C HamanoApr 2, 2026
  17. Christian CouderApr 3, 2026
  18. Christian CouderApr 7, 2026
  19. Patrick SteinhardtApr 2, 2026
  20. Junio C HamanoApr 2, 2026
  21. Christian CouderApr 7, 2026
  22. 00/10 Prepare for advertised remotes auto-configure via URL allowlistChristian Couder, Apr 7, 2026
  23. 01/10 promisor-remote: try accepted remotes before others in get_direct()Christian Couder, Apr 7, 2026
  24. 02/10 promisor-remote: pass config entry to all_fields_match() directlyChristian Couder, Apr 7, 2026
  25. Junio C HamanoApr 7, 2026
  26. 03/10 promisor-remote: clarify that a remote is ignoredChristian Couder, Apr 7, 2026
  27. Junio C HamanoApr 7, 2026
  28. 04/10 promisor-remote: reject empty name or URL in advertised remoteChristian Couder, Apr 7, 2026
  29. Junio C HamanoApr 7, 2026
  30. 05/10 promisor-remote: refactor should_accept_remote() control flowChristian Couder, Apr 7, 2026
  31. 06/10 promisor-remote: refactor has_control_char()Christian Couder, Apr 7, 2026
  32. 07/10 promisor-remote: refactor accept_from_server()Christian Couder, Apr 7, 2026
  33. 08/10 promisor-remote: keep accepted promisor_info structs aliveChristian Couder, Apr 7, 2026
  34. 09/10 promisor-remote: remove the 'accepted' strvecChristian Couder, Apr 7, 2026
  35. 10/10 t5710: use proper file:// URIs for absolute pathsChristian Couder, Apr 7, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.