From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id F02013982427 for ; Fri, 7 Jul 2023 10:33:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F02013982427 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-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4f122ff663eso2718875e87.2 for ; Fri, 07 Jul 2023 03:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688726003; x=1691318003; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=7dkC1jwSX5f4TW41OxcDXkcCOTQhIoDc9JrGA2RQ8vg=; b=iu7wT7HXqIXD5lJjZnqxUvWdNli7u01fuiiFR5vma3Q7HRqa3st2ncGRkbsNDXR1+a r1Ys2kitjFpmqhCB/gWPG5g4yGaYrb92Vo8NiDdFGhMpihn50bHIKehzaQ1ZXF1sIG11 5w9IEsuddyabP8MtMnbv+C/uVM0uoTf3ga2q8ZvpD6yfkOzQfVirJu/Og6AKaWY3lWcC TYfzmY2m2PWaVPpgI6f0g4Fw+QT3DJVCe40FUivvTvuDU4Znzx4kTjSC/uXpGYmILTUi sskDNIKFCDUx+e1Szs32HWpv1hAu+6HO7KH3uF0+Op0PVY3CDVTzFqfKJR6EltBut9+T mMDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688726003; x=1691318003; 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=7dkC1jwSX5f4TW41OxcDXkcCOTQhIoDc9JrGA2RQ8vg=; b=XD7RlOe781g2gs8Ihd3I7g/kIreZknb2woGltfvoJnEzBfh9krb9C7TNr8K05QN+AB /rhhSx4UjgTIbu/tITk3brWGKH4vIwpHVB5DGOOB3E39d6qlq3+R9m6tEz52th/cwlIk U3BEtO79QheYHtwqFksz7KSfmRK6mF/sgMwC3fqrH9TJI//y3PgP8vPaXTxZo6cVWErt BX5ERIC0rB+iCESAgEx94L+1prRgIzkPKTSs8rELHwU/hY6LKvEddGf0b9n5SdPSIk31 5JqmmHktOUiVCv9O1v89H1pOxLUWs2KbF5oCGVs/Um7V0TRCADgGjhW4tlw+ZFgL3KCa BIPg== X-Gm-Message-State: ABy/qLYpcBDhbktxIBYvRuf23SXeS7i3f3gKU59cy/Co4MMsmRX8nMCU G/mRCh+GfXyGIYcr3yOmz5I/ZjewMg/uc7c9txnRYEtCjbfHbA== X-Google-Smtp-Source: APBJJlFToE/+ZB7URCRgzLuMmBIFIcJf3lkNmlAGgC5Ir1smsuIW4Dr2xPcQaY0xN1GQ3MzRfUGplp7drzas7X1ulWc= X-Received: by 2002:ac2:4f0a:0:b0:4fb:7be5:7404 with SMTP id k10-20020ac24f0a000000b004fb7be57404mr4095587lfr.63.1688726002929; Fri, 07 Jul 2023 03:33:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Costas Argyris Date: Fri, 7 Jul 2023 11:33:11 +0100 Message-ID: Subject: Re: [PATCH] gcc-ar: Handle response files properly [PR77576] To: gcc-patches@gcc.gnu.org Content-Type: multipart/alternative; boundary="00000000000087156e05ffe3298d" X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,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: --00000000000087156e05ffe3298d Content-Type: text/plain; charset="UTF-8" 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 --00000000000087156e05ffe3298d--