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 X-Patchwork-Id: 947870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-94576-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Iz3sXCBp"; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Dtp/V2hN"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Z6rx0NyMz9s0R for ; Tue, 24 Jul 2018 02:49:04 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :content-type; q=dns; s=default; b=q96hqpp2il9q5a1iaAwA/8rY/0nEy zo6jqT/jEMa0k7u4/mHVH8tTc/QntQrwSVasIfnCwXGiQPgGJZpEtRs8F68R7nK4 3UDlZ/O8lhFJRp9DdGnDSwORyl0gNpt4qVd67TUayM8OGHlZneCvS4WA8EmaJ1Xu g2uo7lpiPRcXIs= 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:mime-version:from:date:message-id:subject:to :content-type; s=default; bh=I8xesgUBf4yEbtf9R9Q+S95qtXg=; b=Iz3 sXCBpwrg8Xiv1TtGmaSlzrhf0QkmNK3nlNZ8qLlfSyRsxQ3bNv1Vs15Mk0cKbNUm OtzdeXOw5S3rU98S1lk1F/miXJ+JSpIP0bQ0nB/KaIVOPJXsXqTlQ5P99e6lM1Je sEJWuCpSx+xrINB3ekKMFRAUIrEnZsxxBn+KriMY= 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: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , 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 Date: Mon, 23 Jul 2018 09:48:27 -0700 Message-ID: Subject: [patch] Fix BZ 23400 -- stdlib/test-bz22786.c creates temporary files in glibc source tree To: GLIBC Devel Greetings, Attached patch fixes BZ 23400, by using standard support for creating temporary directories. 2018-07-23 Paul Pluzhnikov [BZ #23400] * stdlib/test-bz22786.c (do_test): Use support_create_temp_directory. Reviewed-by: Carlos O'Donell 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 #include #include +#include +#include #include #include 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; }