From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 061873854178; Fri, 17 Feb 2023 19:05:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 061873854178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676660729; bh=AGVjfcuLtZgphUPjlEYnYVoH1guD+izZ2nhGIAy75UQ=; h=From:To:Subject:Date:From; b=BtwaMt2bEwvmJqNmG2p6LdGoFAadUr9RbC1Fun1loCPm/ngWIqcC8qZbcbaa2OyJq s6ngioL/R2UERMHozpb12NlF/gRo0VsfiQl6lyMbRTr0Etz96ro61WrczENp5Kp1TL 950GIMg6nKS9h+JGLwZtVGPl2N2U0Lot7A8DJcxU= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] stdlib: Simplify getenv X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 11053fd4245c5cc0dbd885122e0ef28d11b2db7e X-Git-Newrev: a6ccce23afc2a09a17ac2a86a2b726b58df609df Message-Id: <20230217190529.061873854178@sourceware.org> Date: Fri, 17 Feb 2023 19:05:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a6ccce23afc2a09a17ac2a86a2b726b58df609df commit a6ccce23afc2a09a17ac2a86a2b726b58df609df Author: Adhemerval Zanella Date: Thu Feb 9 10:36:57 2023 -0300 stdlib: Simplify getenv And remove _STRING_ARCH_unaligned usage. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Wilco Dijkstra Diff: --- stdlib/getenv.c | 64 +++++---------------------------------------------------- 1 file changed, 5 insertions(+), 59 deletions(-) diff --git a/stdlib/getenv.c b/stdlib/getenv.c index e3157ce2f3..8408e641a6 100644 --- a/stdlib/getenv.c +++ b/stdlib/getenv.c @@ -15,76 +15,22 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include #include #include #include - -/* Return the value of the environment variable NAME. This implementation - is tuned a bit in that it assumes no environment variable has an empty - name which of course should always be true. We have a special case for - one character names so that for the general case we can assume at least - two characters which we can access. By doing this we can avoid using the - `strncmp' most of the time. */ char * getenv (const char *name) { - char **ep; - uint16_t name_start; - if (__environ == NULL || name[0] == '\0') return NULL; - if (name[1] == '\0') - { - /* The name of the variable consists of only one character. Therefore - the first two characters of the environment entry are this character - and a '=' character. */ -#if __BYTE_ORDER == __LITTLE_ENDIAN || !_STRING_ARCH_unaligned - name_start = ('=' << 8) | *(const unsigned char *) name; -#else - name_start = '=' | ((*(const unsigned char *) name) << 8); -#endif - for (ep = __environ; *ep != NULL; ++ep) - { -#if _STRING_ARCH_unaligned - uint16_t ep_start = *(uint16_t *) *ep; -#else - uint16_t ep_start = (((unsigned char *) *ep)[0] - | (((unsigned char *) *ep)[1] << 8)); -#endif - if (name_start == ep_start) - return &(*ep)[2]; - } - } - else + size_t len = strlen (name); + for (char **ep = __environ; *ep != NULL; ++ep) { - size_t len = strlen (name); -#if _STRING_ARCH_unaligned - name_start = *(const uint16_t *) name; -#else - name_start = (((const unsigned char *) name)[0] - | (((const unsigned char *) name)[1] << 8)); -#endif - len -= 2; - name += 2; - - for (ep = __environ; *ep != NULL; ++ep) - { -#if _STRING_ARCH_unaligned - uint16_t ep_start = *(uint16_t *) *ep; -#else - uint16_t ep_start = (((unsigned char *) *ep)[0] - | (((unsigned char *) *ep)[1] << 8)); -#endif - - if (name_start == ep_start && !strncmp (*ep + 2, name, len) - && (*ep)[len + 2] == '=') - return &(*ep)[len + 3]; - } + if (name[0] == (*ep)[0] + && strncmp (name, *ep, len) == 0 && (*ep)[len] == '=') + return *ep + len + 1; } return NULL;