From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by sourceware.org (Postfix) with ESMTPS id F3E613858C78 for ; Fri, 14 Jul 2023 08:06:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F3E613858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-51e344efd75so3255917a12.1 for ; Fri, 14 Jul 2023 01:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689321967; x=1691913967; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=+nn88tuCG25QCYs1YWzce1PPJ8k4Chgo4VTxa66MZtw=; b=GIdMPrgLGsiKFEvzBRRGTq0mtGPEc1va0i7+col9HJhVBCVLcdemHcBqWMBD0Gq8X7 W9eTLWtxQ6pomOcaq3AjJIS/q9VYHK/iJpD6lo6cs6Z/6A8nNWmWG1D45boC1sHhHHL3 7OnF0s0UfML/PSaIoGD4IWbHq4JWa8Lwui1QUfo2zTICehEkf7j/hBGaKFTy7CW741WO vkG63HAdvmQCHwzCZUf7RxiN31R7yJumcs1V4ogrkAscsJY5nLCeGV4/+8RK902YnfxK EjIJgmy1Ya0yU3WoDDareepWAqBtUherl0O5o4Oi8vDfaHGvv16jDezqsmZDb3w7uQHn 6EOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689321967; x=1691913967; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+nn88tuCG25QCYs1YWzce1PPJ8k4Chgo4VTxa66MZtw=; b=VU+zurKZdi675FiS9jq2P8OTU9wfGarDmt+fFJ0TUQuFeKT3gJF+kTEq6LTiHvFf8M JxjTfYHZ7lu3fSoQY0IXMTgvrDR69S6N2NgcrGPTgMlQxT07q95QO6G5W8xUwM72cFQj 7vbbEX/wC8PPELT2NiqJchBvy/CFYLEgNMe5W7WYUxwuIiIrj+p11OTkkbnVbeZcyXCH KpYnSCER8SXA/XlgRaXpK+P4P4/HSDHKiOmf7DoClWhtts22jOutdzO+z2GzGQbk3mxw vmIU9C5BRdxfudH4mDtlgYNZrCNJy5Vb714HFyiRcbRPxl7du3Ycup16chH4HdXnChWN rPNA== X-Gm-Message-State: ABy/qLa3rcOPWfiIbcttZICxLxLQHoJyP7T9kPYOepSEtSDfxq25oIMy y/f4Xipp6syvj0cpoZXmtw8imSpCUr3MYzh746v8G5FjDp7iTQ== X-Google-Smtp-Source: APBJJlHO95GsU05FtOBBZoRVmWfCwE7HjUBJiAk4KVgiHv7QDnXwX74im33Q6dOEJSJI6pqwcKbQO+4WnsuncV0usis= X-Received: by 2002:a05:6402:2695:b0:51e:5bd5:fe7e with SMTP id w21-20020a056402269500b0051e5bd5fe7emr2532794edd.17.1689321967156; Fri, 14 Jul 2023 01:06:07 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Costas Argyris Date: Fri, 14 Jul 2023 09:05:56 +0100 Message-ID: Subject: Re: [PATCH] gcc-ar: Handle response files properly [PR77576] To: gcc-patches@gcc.gnu.org Content-Type: multipart/alternative; boundary="000000000000c3816e06006deb1c" X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000c3816e06006deb1c Content-Type: text/plain; charset="UTF-8" Pinging to try and get this bug in gcc-ar fixed. Note that the patch posted as an attachment in https://gcc.gnu.org/pipermail/gcc-patches/2023-July/623400.html is exactly the same as the patch embedded in https://gcc.gnu.org/pipermail/gcc-patches/2023-July/623855.html and the one posted in the PR itself https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77576 On Fri, 7 Jul 2023 at 13:00, Costas Argyris wrote: > Bootstrapped successfully on x86_64-pc-linux-gnu > > On Fri, 7 Jul 2023 at 11:33, Costas Argyris > wrote: > >> Problem: gcc-ar fails when a @file is passed to it: >> >> $ cat rsp >> --version >> $ gcc-ar @rsp >> /usr/bin/ar: invalid option -- '@' >> >> This is because a dash '-' is prepended to the first >> argument if it doesn't start with one, resulting in >> the wrong call 'ar -@rsp'. >> >> Fix: Expand argv to get rid of any @files and if any >> expansions were made, pass everything through a >> temporary response file. >> >> $ gcc-ar @rsp >> GNU ar (GNU Binutils for Debian) 2.35.2 >> ... >> >> >> PR gcc-ar/77576 >> * gcc/gcc-ar.cc (main): Expand argv and use >> temporary response file to call ar if any >> expansions were made. >> --- >> gcc/gcc-ar.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 47 insertions(+) >> >> diff --git a/gcc/gcc-ar.cc b/gcc/gcc-ar.cc >> index 4e4c525927d..417c4913793 100644 >> --- a/gcc/gcc-ar.cc >> +++ b/gcc/gcc-ar.cc >> @@ -135,6 +135,10 @@ main (int ac, char **av) >> int k, status, err; >> const char *err_msg; >> const char **nargv; >> + char **old_argv; >> + const char *rsp_file = NULL; >> + const char *rsp_arg = NULL; >> + const char *rsp_argv[3]; >> bool is_ar = !strcmp (PERSONALITY, "ar"); >> int exit_code = FATAL_EXIT_CODE; >> int i; >> @@ -209,6 +213,13 @@ main (int ac, char **av) >> } >> } >> >> + /* Expand any @files before modifying the command line >> + and use a temporary response file if there were any. */ >> + old_argv = av; >> + expandargv (&ac, &av); >> + if (av != old_argv) >> + rsp_file = make_temp_file (""); >> + >> /* Prepend - if necessary. */ >> if (is_ar && av[1] && av[1][0] != '-') >> av[1] = concat ("-", av[1], NULL); >> @@ -225,6 +236,39 @@ main (int ac, char **av) >> nargv[j + k] = av[k]; >> nargv[j + k] = NULL; >> >> + /* If @file was passed, put nargv into the temporary response >> + file and then change it to a single @FILE argument, where >> + FILE is the temporary filename. */ >> + if (rsp_file) >> + { >> + FILE *f; >> + int status; >> + f = fopen (rsp_file, "w"); >> + if (f == NULL) >> + { >> + fprintf (stderr, "Cannot open temporary file %s\n", rsp_file); >> + exit (1); >> + } >> + status = writeargv ( >> + CONST_CAST2 (char * const *, const char **, nargv) + 1, f); >> + if (status) >> + { >> + fprintf (stderr, "Cannot write to temporary file %s\n", >> rsp_file); >> + exit (1); >> + } >> + status = fclose (f); >> + if (EOF == status) >> + { >> + fprintf (stderr, "Cannot close temporary file %s\n", rsp_file); >> + exit (1); >> + } >> + rsp_arg = concat ("@", rsp_file, NULL); >> + rsp_argv[0] = nargv[0]; >> + rsp_argv[1] = rsp_arg; >> + rsp_argv[2] = NULL; >> + nargv = rsp_argv; >> + } >> + >> /* Run utility */ >> /* ??? the const is misplaced in pex_one's argv? */ >> err_msg = pex_one (PEX_LAST|PEX_SEARCH, >> @@ -249,5 +293,8 @@ main (int ac, char **av) >> else >> exit_code = SUCCESS_EXIT_CODE; >> >> + if (rsp_file) >> + unlink (rsp_file); >> + >> return exit_code; >> } >> -- >> 2.30.2 >> > --000000000000c3816e06006deb1c--