From patchwork Mon Dec 28 13:59:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1420879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=vmPmJC9i; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D4K1p3sSPzB3tX for ; Tue, 29 Dec 2020 01:00:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B305F3870905; Mon, 28 Dec 2020 13:59:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B305F3870905 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1609163998; bh=MhYux0mFjOVWrrC/XqAaF4aF5bg3rny5qdfZpnJw44E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=vmPmJC9iWPaVGS8oggaVa0f0OUjlqF9aooz2duOVfYGSe1buzRn4m6L06S2QYHxd7 lRxlfLMsEvgw7KXcC5SlRu0S1P6SASgdhWGoyPuofy1wBf+Ns/SRm3xbcD0BbqB+sN 3iSRHr0h77UC1WT39pMd/0TzdWh//thagZz/9kys= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by sourceware.org (Postfix) with ESMTPS id 4F7263840C34 for ; Mon, 28 Dec 2020 13:59:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4F7263840C34 Received: by mail-qk1-x735.google.com with SMTP id 22so8784607qkf.9 for ; Mon, 28 Dec 2020 05:59:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MhYux0mFjOVWrrC/XqAaF4aF5bg3rny5qdfZpnJw44E=; b=ogU/ZVCXFyo8V9+eF2kTj5sXqDk9tvuHdDO/9rl+2eTMu1/goqpPi4LWaNMgdmPpyq HjbpArTO0gyEfNXd/4Qudsgxwk+fO+7jYIVx/xgLEaK2rWa3eKUuQ10lAxwWY4Dcd59g Bh5n250bEXNjJ08OhkvKhEjd/llGWovyrNafyCbi5FjLzKWgiajOyTy4VOQCUNz49eT1 AEXZsw87e9dkgYTEYByLlMEzpkMjXWuYf/KfoL9e2K4AfLYXZBGiPWG1xOX8umbi7z7C 6/IcMROxRbD4d8KaP+BTU1QsUTrcouLpYEWoUsGzvbf3RPPyOWDS3eALhH3Gx8n5zs6a AHdg== X-Gm-Message-State: AOAM533qwka8hPceuR/m282jGDQKfmg7tnKHEZLGwJt4d6M6uYLcUnIt WeExZWo0gX8vaEJKn7KfRiVZTSuLxUBxrA== X-Google-Smtp-Source: ABdhPJz9IhoSZH5qK5YW8Rm7LD+EmMAFplrj9PB28RFvcBb4N/oYRpuVaCSd4s04yMT9B1PgXewpZQ== X-Received: by 2002:a37:4e50:: with SMTP id c77mr43719000qkb.252.1609163996755; Mon, 28 Dec 2020 05:59:56 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id i17sm24243744qtg.77.2020.12.28.05.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 05:59:56 -0800 (PST) To: libc-alpha@sourceware.org, Paul Eggert Subject: [PATCH v2 5/6] stdlibc: Simplify realpath via scratch_buffer_dupfree Date: Mon, 28 Dec 2020 10:59:43 -0300 Message-Id: <20201228135944.1018303-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201228135944.1018303-1-adhemerval.zanella@linaro.org> References: <20201228135944.1018303-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: bug-gnulib@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Paul Eggert Checked on x86_64-linux-gnu. --- stdlib/canonicalize.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 24a027b83f..69f978da78 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -414,24 +414,14 @@ error: error_nomem: scratch_buffer_free (&extra_buffer); scratch_buffer_free (&link_buffer); - if (failed || rname == resolved) - scratch_buffer_free (rname_buf); - - if (failed) - return NULL; - if (rname == resolved) - return rname; - idx_t rname_size = dest - rname; - if (rname == rname_on_stack) + if (failed || rname == resolved) { - rname = malloc (rname_size); - if (rname == NULL) - return NULL; - return memcpy (rname, rname_on_stack, rname_size); + scratch_buffer_free (rname_buf); + return failed ? NULL : resolved; } - char *result = realloc (rname, rname_size); - return result != NULL ? result : rname; + + return scratch_buffer_dupfree (rname_buf, dest - rname); } /* Return the canonical absolute name of file NAME. A canonical name