From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13174 invoked by alias); 24 May 2012 16:49:43 -0000 Received: (qmail 13136 invoked by uid 22791); 24 May 2012 16:49:41 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 24 May 2012 16:49:26 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 2C74A29008E; Thu, 24 May 2012 18:49:31 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hlwaztVMadEB; Thu, 24 May 2012 18:49:31 +0200 (CEST) Received: from cognac.eu.adacore.com (cognac.act-europe.fr [10.10.1.38]) by mel.act-europe.fr (Postfix) with ESMTP id 10F51290006; Thu, 24 May 2012 18:49:31 +0200 (CEST) Received: by cognac.eu.adacore.com (Postfix, from userid 560) id 2351E6E028A; Thu, 24 May 2012 18:49:25 +0200 (CEST) From: Jerome Guitton To: gdb-patches@sourceware.org Cc: Jerome Guitton Subject: [mingw32] environment variables are case-insensitive on win32 Date: Thu, 24 May 2012 16:49:00 -0000 Message-Id: <1337878161-20057-1-git-send-email-guitton@adacore.com> Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-05/txt/msg00932.txt.bz2 Yet another idiosyncrasy of this platform. It would have been nice to have a configure test for that, using setenv/getenv to detect the fact that env variables are case-insensitive. Unfortunately we don't have setenv on win32. So I ended up using _WIN32 just like we do to handle the .exe extension. Any other idea? gdb/ChangeLog: * environ.c (env_var_name_ncmp): New macro. (get_in_environ, set_in_environ, unset_in_environ): Use env_var_name_ncmp instead of strncmp. --- gdb/environ.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/environ.c b/gdb/environ.c index 33426eb..9992782 100644 --- a/gdb/environ.c +++ b/gdb/environ.c @@ -96,6 +96,13 @@ environ_vector (struct gdb_environ *e) return e->vector; } + +#if defined(_WIN32) || !defined(__CYGWIN__) +#define env_var_name_ncmp(a, b, length) strnicmp (a, b, length) +#else +#define env_var_name_ncmp(a, b, length) strncmp(a, b, length) +#endif + /* Return the value in environment E of variable VAR. */ char * @@ -106,7 +113,7 @@ get_in_environ (const struct gdb_environ *e, const char *var) char *s; for (; (s = *vector) != NULL; vector++) - if (strncmp (s, var, len) == 0 && s[len] == '=') + if (env_var_name_ncmp (s, var, len) == 0 && s[len] == '=') return &s[len + 1]; return 0; @@ -123,7 +130,7 @@ set_in_environ (struct gdb_environ *e, const char *var, const char *value) char *s; for (i = 0; (s = vector[i]) != NULL; i++) - if (strncmp (s, var, len) == 0 && s[len] == '=') + if (env_var_name_ncmp (s, var, len) == 0 && s[len] == '=') break; if (s == 0) @@ -170,7 +177,7 @@ unset_in_environ (struct gdb_environ *e, char *var) for (; (s = *vector) != NULL; vector++) { - if (strncmp (s, var, len) == 0 && s[len] == '=') + if (env_var_name_ncmp (s, var, len) == 0 && s[len] == '=') { xfree (s); /* Walk through the vector, shuffling args down by one, including -- 1.7.0.2