From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6647 invoked by alias); 23 Jul 2009 00:39:09 -0000 Received: (qmail 6563 invoked by uid 22791); 23 Jul 2009 00:39:08 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_71,SPF_PASS X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Jul 2009 00:39:00 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 94D4E2BAB4B; Wed, 22 Jul 2009 20:38:58 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id AiRHN1-yN-Dx; Wed, 22 Jul 2009 20:38:58 -0400 (EDT) Received: from [192.168.1.104] (dpc6682073249.direcpc.com [66.82.73.249]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 157BB2BAB41; Wed, 22 Jul 2009 20:38:53 -0400 (EDT) Message-ID: <4A67B113.7010903@gnat.com> Date: Thu, 23 Jul 2009 00:54:00 -0000 From: Douglas B Rupp User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: dj@redhat.com, ian@airs.com CC: gcc-patches@gcc.gnu.org Subject: [PATCH] Libiberty for VMS - mkstemps.c don't mix case Content-Type: multipart/mixed; boundary="------------070509090207070302050706" X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2009-07/txt/msg01248.txt.bz2 This is a multi-part message in MIME format. --------------070509090207070302050706 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 96 VMS temp files must be case insensitive. Tested on x86-64-linux-gnu --Douglas B Rupp AdaCore --------------070509090207070302050706 Content-Type: text/plain; name="12.2libiberty.dif.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="12.2libiberty.dif.txt" Content-length: 1996 2009-07-22 Douglas B Rupp * mkstemps.c (mkstemps): Don't use mixed case on VMS. diff -rupN libiberty/mkstemps.c libiberty/mkstemps.c --- libiberty/mkstemps.c 2008-07-31 14:22:09.000000000 -0700 +++ libiberty/mkstemps.c 2009-01-21 14:40:34.000000000 -0800 @@ -77,8 +77,8 @@ reading and writing. int mkstemps (char *pattern, int suffix_len) { - static const char letters[] - = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + char *letters; + int nletters = 0; static gcc_uint64_t value; #ifdef HAVE_GETTIMEOFDAY struct timeval tv; @@ -87,6 +87,21 @@ mkstemps (char *pattern, int suffix_len) size_t len; int count; + if (nletters == 0) + { + char *gletters = getenv ("GNU_MKSTEMPS_LETTERS"); + if (gletters) + letters = strdup (gletters); + else + letters = strdup +#ifdef VMS + ("abcdefghijklmnopqrstuvwxyz0123456789"); +#else + ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"); +#endif + nletters = (sizeof letters) - 1; + } + len = strlen (pattern); if ((int) len < 6 + suffix_len @@ -111,17 +126,17 @@ mkstemps (char *pattern, int suffix_len) int fd; /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; + XXXXXX[0] = letters[v % nletters]; + v /= nletters; + XXXXXX[1] = letters[v % nletters]; + v /= nletters; + XXXXXX[2] = letters[v % nletters]; + v /= nletters; + XXXXXX[3] = letters[v % nletters]; + v /= nletters; + XXXXXX[4] = letters[v % nletters]; + v /= nletters; + XXXXXX[5] = letters[v % nletters]; fd = open (pattern, O_BINARY|O_RDWR|O_CREAT|O_EXCL, 0600); if (fd >= 0) --------------070509090207070302050706--