From patchwork Mon Jul 23 16:48:27 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paul Pluzhnikov <ppluzhnikov@google.com>
X-Patchwork-Id: 28577
Received: (qmail 87020 invoked by alias); 23 Jul 2018 16:48:58 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 87008 invoked by uid 89); 23 Jul 2018 16:48:58 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-32.4 required=5.0 tests=AWL, BAYES_00,
	ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2,
	GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS,
	USER_IN_DEF_SPF_WL autolearn=ham version=3.3.2 spammy=0755,
	sk:support, Hx-languages-length:2034
X-HELO: mail-yw0-f177.google.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=google.com; s=20161025;
	h=mime-version:from:date:message-id:subject:to;
	bh=wImQyUhdnKjV0RltqXttygDf+RILv6OiSni7zUvZe5A=;
	b=Dtp/V2hNY+TnTPAexaCiJ5Uz1JgHttKcVMMNrDa3H/U/zmuYQYhb64psaQdzbXdyWZ
	/6EmddVFBx3JxeT1Ra15svTq1m7i+DFr7sZh7g7EMuL61BH0M2edTRiB2qigxoftWiHS
	bpjZL+vRLu8RQCJet45224PRie0nzb8QFxBhXGu8GvIUGIrLGJZfy0GmBSZOz72ZuXyQ
	GFqiieZzSs+BviWJ3ffVpQ1Qnx9vMdjYzG17hb0mKrK4TfC8fLYXgiaz8m5v/NSCbEo3
	SB3cx7RIlEr2eLJOSbZOWdvMVVFAUt3FzskhD9PVVnc5vEHRd3zwd9RRFM+IHiZYiMne
	RFjg==
MIME-Version: 1.0
From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Mon, 23 Jul 2018 09:48:27 -0700
Message-ID: 
 <CALoOobOOo0z5FtsAE4s2rdM_0DwtJ50XoPEDrL=qUgasKzNp8Q@mail.gmail.com>
Subject: [patch] Fix BZ 23400 -- stdlib/test-bz22786.c creates temporary
	files in glibc source tree
To: GLIBC Devel <libc-alpha@sourceware.org>

Greetings,

Attached patch fixes BZ 23400, by using standard support for creating
temporary directories.

2018-07-23  Paul Pluzhnikov  <ppluzhnikov@google.com>

        [BZ #23400]
        * stdlib/test-bz22786.c (do_test): Use support_create_temp_directory.

diff --git a/stdlib/test-bz22786.c b/stdlib/test-bz22786.c
index e7837f98c1..f7635c785f 100644
--- a/stdlib/test-bz22786.c
+++ b/stdlib/test-bz22786.c
@@ -26,22 +26,21 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <support/support.h>
+#include <support/temp_file.h>
 #include <support/test-driver.h>
 #include <libc-diag.h>
 
 static int
 do_test (void)
 {
-  const char dir[] = "bz22786";
-  const char lnk[] = "bz22786/symlink";
+  const char *dir = support_create_temp_directory ("bz22786.");
+  char *lnk = xmalloc (strlen (dir) + strlen ("/symlink") + 1);
 
-  rmdir (dir);
-  if (mkdir (dir, 0755) != 0 && errno != EEXIST)
-    {
-      printf ("mkdir %s: %m\n", dir);
-      return EXIT_FAILURE;
-    }
-  if (symlink (".", lnk) != 0 && errno != EEXIST)
+  strcpy (lnk, dir);
+  strcat (lnk, "/symlink");
+
+  if (symlink (".", lnk) != 0)
     {
       printf ("symlink (%s, %s): %m\n", dir, lnk);
       return EXIT_FAILURE;
@@ -55,17 +54,11 @@ do_test (void)
      allocation to succeed for the test to work.  */
   DIAG_IGNORE_NEEDS_COMMENT (7, "-Walloc-size-larger-than=");
 #endif
-  char *path = malloc (path_len);
+  char *path = xmalloc (path_len);
   DIAG_POP_NEEDS_COMMENT;
 
-  if (path == NULL)
-    {
-      printf ("malloc (%zu): %m\n", path_len);
-      return EXIT_UNSUPPORTED;
-    }
-
-  /* Construct very long path = "bz22786/symlink/aaaa....."  */
-  char *p = mempcpy (path, lnk, sizeof (lnk) - 1);
+  /* Construct very long path = "/tmp/bz22786.XXXX/symlink/aaaa....."  */
+  char *p = mempcpy (path, lnk, strlen (lnk));
   *(p++) = '/';
   memset (p, 'a', path_len - (path - p) - 2);
   p[path_len - (path - p) - 1] = '\0';
@@ -81,7 +74,6 @@ do_test (void)
 
   /* Cleanup.  */
   unlink (lnk);
-  rmdir (dir);
 
   return 0;
 }