From patchwork Wed Jun 14 20:28:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yaakov Selkowitz X-Patchwork-Id: 105577 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp471035qgd; Wed, 14 Jun 2017 13:28:41 -0700 (PDT) X-Received: by 10.98.61.141 with SMTP id x13mr1686769pfj.103.1497472121365; Wed, 14 Jun 2017 13:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497472121; cv=none; d=google.com; s=arc-20160816; b=JMi5PwB3mOEdLQ2M08FCRNRclLbwYWTqPxioTW8N5FGbvtlL72JhAaVDt3K2WcwneW oWCUcr8pb9FgZCEhsuFJirovfX7l9FFwUZC8+zUZqNJrowwDlp3CR9nznB1/Oo6YvhLP +A2GVxvZcDKBbkrKnDkvUY4Triz7h0LYivrzFVCqQan53wOza5ZGXOWYNe4z2toDJemF qKdpU68Fjmog6HNzcmD6uUNG3hV+g6K4sk4R7hKRP/hYFKgvZ6fxIcAMnOpwxAyYRrIO Jvf/zo3imW7wEHBPTaCz0b61dTxk+084Q74PvQFF6P9AoUYvKRCucT0m6AkvBpqGNy/t fnDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:dkim-filter:dmarc-filter:delivered-to:sender:list-help :list-post:list-archive:list-subscribe:list-unsubscribe:list-id :precedence:mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=YO18xNXJVyAQH974nTpYg8pUfH2jKkKIdKYMwev57po=; b=qRXS+DpjzgrrbpblIO05wr6NWRQYHQcoXM6cwhTRpDSjRRm+P6MoScQT5nY/57cWX7 Uvlcsx70mfP5Yg2ZD8d1cXLZmUCQgXj/QdNZBxP0r9BulaPJmTl556rgFbjBRH7DxJHS Un3zGl5FZle5vmgMwtv2voL2pPifURzUEu2mFdWrTHyQ/oT+FDyv1+/1EEwbrxcJUtXu TB11R8gQghq+WomTobUZNVGUa1u526jWpfO+IhFKIu4Wdpo09ux7j3Z+3wP5HxwLf9Aw yRH3p9c/rfpEq/6rzEKhjGJ2QhxxJeOHK0cjk5U6sQfK1i8TXXuq4ZnXkrxpMq3XjQGu iI1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.b=Lnbv+UDV; spf=pass (google.com: domain of newlib-return-14665-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-14665-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id z9si679581pgz.134.2017.06.14.13.28.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 13:28:41 -0700 (PDT) Received-SPF: pass (google.com: domain of newlib-return-14665-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.b=Lnbv+UDV; spf=pass (google.com: domain of newlib-return-14665-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-14665-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=Ix7 V3UWyV6iR6RinZrk44/q/scLeQVCuJh90LjLjB7gKFwuxMKKrSb+6Rfe+T0BfbSx rkk7LyTtiqHw3g80Di+TSBupEwM8PcL9sGRHPdbAX4hL6xZKqxxYAZliPGdnkdhS dZvpw/ta1Na2vZ+DJr5ZtwOYfeeQFCXbWvfk7tVQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=oPk6oj/o5 gn0U8hPe95Dxw4Ar8g=; b=Lnbv+UDV7dZ05OAABmCS9Bq6pOYLewynmyQSHUSzi eYXc/i3Q6wkkQv8HhRha4d3Dks63aDxFmb1YbfIYCRrbwhqM0evjpu7hrUJY07NH dtg0yKNw7yK0uRAAe+rUGpkTtW0rLZYTChgq/e4M+lG/DNR1YtMeljJcg1kuoojQ LE= Received: (qmail 34709 invoked by alias); 14 Jun 2017 20:28:27 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Delivered-To: mailing list newlib@sourceware.org Received: (qmail 34700 invoked by uid 89); 14 Jun 2017 20:28:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=dealings, DESCRIPTION X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Jun 2017 20:28:24 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C3BA961D24 for ; Wed, 14 Jun 2017 20:28:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C3BA961D24 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=yselkowi@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C3BA961D24 Received: from localhost.localdomain (ovpn-120-133.rdu2.redhat.com [10.10.120.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 41FFC8E529 for ; Wed, 14 Jun 2017 20:28:27 +0000 (UTC) From: Yaakov Selkowitz To: newlib@sourceware.org Subject: [PATCH] string: add strverscmp Date: Wed, 14 Jun 2017 15:28:06 -0500 Message-Id: <20170614202806.10484-1-yselkowi@redhat.com> MIME-Version: 1.0 The actual implementation is from musl (MIT license). Signed-off-by: Yaakov Selkowitz --- newlib/libc/include/string.h | 4 ++ newlib/libc/string/Makefile.am | 4 +- newlib/libc/string/Makefile.in | 12 ++++- newlib/libc/string/strings.tex | 1 + newlib/libc/string/strverscmp.c | 99 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 newlib/libc/string/strverscmp.c -- 2.12.3 diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 4e0e15162..75de50351 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -159,6 +159,10 @@ char *_EXFUN(strsignal, (int __signo)); int _EXFUN(strtosigno, (const char *__name)); #endif +#if __GNU_VISIBLE +int _EXFUN(strverscmp,(const char *, const char *)); +#endif + #if __GNU_VISIBLE && defined(__GNUC__) #define strdupa(__s) \ (__extension__ ({const char *__in = (__s); \ diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am index e1f7f3bb8..bb5a78fe6 100644 --- a/newlib/libc/string/Makefile.am +++ b/newlib/libc/string/Makefile.am @@ -112,6 +112,7 @@ ELIX_4_SOURCES = \ strcasecmp_l.c \ strcoll_l.c \ strncasecmp_l.c \ + strverscmp.c \ strxfrm_l.c \ wcscasecmp.c \ wcscasecmp_l.c \ @@ -156,6 +157,7 @@ wcswidth.def wcsxfrm.def wcwidth.def wmemchr.def \ wmemcmp.def wmemcpy.def wmemmove.def wmemset.def \ memmem.def memrchr.def rawmemchr.def strchrnul.def \ strcasecmp_l.def strcoll_l.def strncasecmp_l.def strxfrm_l.def \ -wcscasecmp_l.def wcscoll_l.def wcsncasecmp_l.def wcsxfrm_l.def +wcscasecmp_l.def wcscoll_l.def wcsncasecmp_l.def wcsxfrm_l.def \ +strverscmp.def CHAPTERS = strings.tex wcstrings.tex diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in index 2c995d264..bd330e481 100644 --- a/newlib/libc/string/Makefile.in +++ b/newlib/libc/string/Makefile.in @@ -127,6 +127,7 @@ am__objects_1 = lib_a-bcopy.$(OBJEXT) lib_a-bzero.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-strcasecmp_l.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-strcoll_l.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-strncasecmp_l.$(OBJEXT) \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-strverscmp.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-strxfrm_l.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-wcscasecmp.$(OBJEXT) \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ lib_a-wcscasecmp_l.$(OBJEXT) \ @@ -164,6 +165,7 @@ am__objects_4 = bcopy.lo bzero.lo explicit_bzero.lo index.lo memchr.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strcasecmp_l.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strcoll_l.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strncasecmp_l.lo \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strverscmp.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strxfrm_l.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp.lo \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp_l.lo \ @@ -441,6 +443,7 @@ GENERAL_SOURCES = \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strcasecmp_l.c \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strcoll_l.c \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strncasecmp_l.c \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strverscmp.c \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ strxfrm_l.c \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp.c \ @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@ wcscasecmp_l.c \ @@ -488,7 +491,8 @@ wcswidth.def wcsxfrm.def wcwidth.def wmemchr.def \ wmemcmp.def wmemcpy.def wmemmove.def wmemset.def \ memmem.def memrchr.def rawmemchr.def strchrnul.def \ strcasecmp_l.def strcoll_l.def strncasecmp_l.def strxfrm_l.def \ -wcscasecmp_l.def wcscoll_l.def wcsncasecmp_l.def wcsxfrm_l.def +wcscasecmp_l.def wcscoll_l.def wcsncasecmp_l.def wcsxfrm_l.def \ +strverscmp.def CHAPTERS = strings.tex wcstrings.tex all: all-am @@ -1100,6 +1104,12 @@ lib_a-strncasecmp_l.o: strncasecmp_l.c lib_a-strncasecmp_l.obj: strncasecmp_l.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strncasecmp_l.obj `if test -f 'strncasecmp_l.c'; then $(CYGPATH_W) 'strncasecmp_l.c'; else $(CYGPATH_W) '$(srcdir)/strncasecmp_l.c'; fi` +lib_a-strverscmp.o: strverscmp.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strverscmp.o `test -f 'strverscmp.c' || echo '$(srcdir)/'`strverscmp.c + +lib_a-strverscmp.obj: strverscmp.c + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strverscmp.obj `if test -f 'strverscmp.c'; then $(CYGPATH_W) 'strverscmp.c'; else $(CYGPATH_W) '$(srcdir)/strverscmp.c'; fi` + lib_a-strxfrm_l.o: strxfrm_l.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-strxfrm_l.o `test -f 'strxfrm_l.c' || echo '$(srcdir)/'`strxfrm_l.c diff --git a/newlib/libc/string/strings.tex b/newlib/libc/string/strings.tex index 2df5faf58..96fdefc81 100644 --- a/newlib/libc/string/strings.tex +++ b/newlib/libc/string/strings.tex @@ -48,6 +48,7 @@ managing areas of memory. The corresponding declarations are in * strstr:: Find string segment * strtok:: Get next token from a string * strupr:: Convert string to upper case +* strverscmp:: Compare version strings * strxfrm:: Transform string * swab:: Swap adjacent bytes * wcscasecmp:: Compare wide character strings ignoring case diff --git a/newlib/libc/string/strverscmp.c b/newlib/libc/string/strverscmp.c new file mode 100644 index 000000000..83f053222 --- /dev/null +++ b/newlib/libc/string/strverscmp.c @@ -0,0 +1,99 @@ +/* +FUNCTION + <>---version string compare + +INDEX + strverscmp + +ANSI_SYNOPSIS + #define _GNU_SOURCE + #include + int strverscmp(const char *<[a]>, const char *<[b]>); + +TRAD_SYNOPSIS + #define _GNU_SOURCE + #include + int strverscmp(<[a]>, <[b]>) + char *<[a]>; + char *<[b]>; + +DESCRIPTION + <> compares the string at <[a]> to + the string at <[b]> in a version-logical order. + +RETURNS + + If <<*<[a]>>> version-sorts after <<*<[b]>>>, <> returns + a number greater than zero. If the two strings match, <> + returns zero. If <<*<[a]>>> version-sorts before <<*<[b]>>>, + <> returns a number less than zero. + +PORTABILITY +<> is a GNU extension. + +<> requires no supporting OS subroutines. It uses +isdigit() from elsewhere in this library. + +QUICKREF + strverscmp +*/ + +/* +From musl src/string/strverscmp.c + +Copyright © 2005-2014 Rich Felker, et al. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#define _GNU_SOURCE +#include +#include + +int strverscmp(const char *l0, const char *r0) +{ + const unsigned char *l = (const void *)l0; + const unsigned char *r = (const void *)r0; + size_t i, dp, j; + int z = 1; + + /* Find maximal matching prefix and track its maximal digit + * suffix and whether those digits are all zeros. */ + for (dp=i=0; l[i]==r[i]; i++) { + int c = l[i]; + if (!c) return 0; + if (!isdigit(c)) dp=i+1, z=1; + 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. */ + for (j=i; isdigit(l[j]); j++) + if (!isdigit(r[j])) return 1; + if (isdigit(r[j])) return -1; + } else if (z && dp