From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id ED4E81F934 for ; Mon, 28 Dec 2020 14:01:25 +0000 (UTC) Received: from localhost ([::1]:49438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktt5R-0002F9-41 for normalperson@yhbt.net; Mon, 28 Dec 2020 09:01:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktt43-0001lX-9K for bug-gnulib@gnu.org; Mon, 28 Dec 2020 09:00:00 -0500 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]:33454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktt41-0003Cz-Ky for bug-gnulib@gnu.org; Mon, 28 Dec 2020 08:59:59 -0500 Received: by mail-qk1-x730.google.com with SMTP id f26so8861681qka.0 for ; Mon, 28 Dec 2020 05:59:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MhYux0mFjOVWrrC/XqAaF4aF5bg3rny5qdfZpnJw44E=; b=HeUFhLjZWIrzL5frSGiM7Dn7aZlTuYVs0bZvIFW5xIDqi5jFxsle33mshF65ka6tKa ABz0OEEWFhw17j7pyn9hwMc8PCB34j6lKJz9WO6PnOqdyKTXAb528v1qmWnb693s5gRD jBRUVKpGhHi8MIWGWw155h0ZuCYiVxqUk13Ta/pHmx3O5o+fC3Zfrd7DN3mfxYoorxLx zZ6qPblYgfOucZF1NE1RZqPQj91XNykWxR3DzmzSjmQ7xaagfAouPwqXfjODNgx3GJsu sCZaD+Soi0vNhJA+NX+UrfvqvH48gRMKCvKLpR0xjjB3OaTaSlZ4iq+RH/NrcNDJsDGn aUqw== 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=FnU/AUQAEVhlh+m2PnuSgoiiwA+q5IqNtLogNd2KFxB0nfynfyBYbdF+mUDaaLy+Pk RT2+FvOrW2f+l9GdclhiG8Md8hLsyuEVSPKHyYZg92ANUsIFnLmG7UlHVOI3fMFL5m55 TkOPWGqmT1/e7Xz0ew0BBXnUcWfAk460kdnsKE7l9eE8dN7UkZrEv6y7nyIqs03y/LiY U21B05PlA7NzgDqyp9Pufw/IP+iarpvn6u2JO6PftNHdp0ShAMJvDblNvCvwas2ZVTF9 HjEK0MvlvKN1PsDlcmAGn7muELotJ05uxYCnkjPBZbCi1CsuV/zFUBsz0tvLs7aQpcqL xeSA== X-Gm-Message-State: AOAM531Iv5EBD9cX+M8vDb3gW4zS5XmSqPjdHzjtT0FEdbO1ZZ16rNhh OmTEmBwhPvECNlUI93M+3yJ0X7SYg6AETw== 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) From: Adhemerval Zanella 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 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::730; envelope-from=adhemerval.zanella@linaro.org; helo=mail-qk1-x730.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bug-gnulib@gnu.org Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" 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 -- 2.25.1