public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/main] fix strverscmp comparison of digit sequence with non-digits
@ 2024-01-08 16:01 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2024-01-08 16:01 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9a863f713af24a3b18c165c640c936a4c0b707ea
commit 9a863f713af24a3b18c165c640c936a4c0b707ea
Author: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca>
AuthorDate: Mon Jan 8 06:56:21 2024 -0700
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Mon Jan 8 17:01:25 2024 +0100
fix strverscmp comparison of digit sequence with non-digits
From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 7 Nov 2022 22:17:55 -0500
the rule that longest digit sequence not beginning with a zero is
greater only applies when both sequences being compared are
non-degenerate. this is spelled out explicitly in the man page, which
may be deemed authoritative for this nonstandard function: "If one or
both of these is empty, then return what strcmp(3) would have
returned..."
we were wrongly treating any sequence of digits not beginning with a
zero as greater than a non-digit in the other string.
Signed-off-by: Brian Inglis <Brian.Inglis@SystematicSW.ab.ca>
Diff:
---
newlib/libc/string/strverscmp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/newlib/libc/string/strverscmp.c b/newlib/libc/string/strverscmp.c
index 04aa7213ad98..0117421c9e93 100644
--- a/newlib/libc/string/strverscmp.c
+++ b/newlib/libc/string/strverscmp.c
@@ -76,9 +76,9 @@ int strverscmp(const char *l0, const char *r0)
else if (c!='0') z=0;
}
- if (l[dp]!='0' && r[dp]!='0') {
- /* If we're not looking at a digit sequence that began
- * with a zero, longest digit string is greater. */
+ if (l[dp]-'1'<9U && r[dp]-'1'<9U) {
+ /* If we're looking at non-degenerate digit sequences starting
+ * with nonzero digits, longest digit string is greater. */
for (j=i; isdigit(l[j]); j++)
if (!isdigit(r[j])) return 1;
if (isdigit(r[j])) return -1;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-08 16:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-08 16:01 [newlib-cygwin/main] fix strverscmp comparison of digit sequence with non-digits Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).