From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by sourceware.org (Postfix) with ESMTPS id EA9633858C2F for ; Tue, 28 Jun 2022 07:36:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EA9633858C2F Received: by mail-qk1-x72c.google.com with SMTP id c137so9019695qkg.5 for ; Tue, 28 Jun 2022 00:36:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Rq0TVz1URvBAIO/ZGiqoWftuX2n3hb7n8dIQyjQ7zHc=; b=gXCCZb8/SXV3a7RhhxbrhfCWA2ebVAofNpudlBiJb97AEYlqQI/8Xnb/k/xikBcf2s pDtygU+P/yrn0ngNheubp0sK6EfSy6YLEhgdKpYR8NV9HeNZc3Nu1eWIK0UZSXblisdJ nmpg/KcbPCytr2vzX3OzCjgS+vw4QVtLDxf5CsE/HiS1nT3bI7F+/9nYd6ooCT9NOsz/ G8/OgmkJy4pYHypnwPEikWaZSA5M9L9x/Osz3OCUUy0PXK+icAJ+0XZPeyjEGLFy48Mj plaBbn6TCKf7XN7keAkFXR1KXmDA+muEuSeEmCTdhQn0UpnuFHXeZsVKmaundomjKmHI za8A== X-Gm-Message-State: AJIora822RHeIa53YRqm5LkF2i+Slfq05eNeSmRAfW+LhKUci/R9j5u6 GIbuNzMmLuEBhkcFHTlW8X4iC1+Z0i96Wg9qVoZKh4nejhUpFg== X-Google-Smtp-Source: AGRyM1v1M65BhRrOJ0FmMJd1DtjT4iGTTUqxPUt/plByPDKmUmnjnW3ogis5s6hhYmtatnbhkfppIDialNb+ZnNFwqs= X-Received: by 2002:a05:620a:c43:b0:6a9:77ef:e000 with SMTP id u3-20020a05620a0c4300b006a977efe000mr10610150qki.396.1656401762158; Tue, 28 Jun 2022 00:36:02 -0700 (PDT) MIME-Version: 1.0 From: =?UTF-8?Q?Cl=C3=A9ment_Chigot?= Date: Tue, 28 Jun 2022 09:35:52 +0200 Message-ID: Subject: [PATCH] windres: add quotes around preprocessor cmd if needed To: binutils@sourceware.org Content-Type: multipart/mixed; boundary="000000000000a3da7005e27d16e9" X-Spam-Status: No, score=-9.6 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, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jun 2022 07:36:05 -0000 --000000000000a3da7005e27d16e9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This patch ensures that the gcc binary called by windres is quoted if needed. Otherwise, errors can occur if the gcc is under a folder having a name containing a space (eg "Program Files"). binutils/ * resrc.c (DEFAULT_PREPROCESSOR): Split into... (DEFAULT_PREPROCESSOR_CMD): that... (DEFAULT_PREPROCESSOR_ARGS): and that. (look_for_default): Add quotes around the command if needed. (read_rc_file): Adapt to new defines. Thanks, Cl=C3=A9ment --000000000000a3da7005e27d16e9 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-windres-add-quotes-around-preprocessor-cmd-if-needed.patch" Content-Disposition: attachment; filename="0001-windres-add-quotes-around-preprocessor-cmd-if-needed.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l4xuqw7p0 RnJvbSAzYzZhZmNkMzNlZWQ2ODA2ZGYwZTYzMmIxZDUyZTk0NmQyNzdjYzg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Q2w9QzM9QTltZW50PTIwQ2hpZ290Pz0gPGNo aWdvdEBhZGFjb3JlLmNvbT4KRGF0ZTogVGh1LCAxNiBKdW4gMjAyMiAxMzo0MzoyNiArMDIwMApT dWJqZWN0OiBbUEFUQ0hdIHdpbmRyZXM6IGFkZCBxdW90ZXMgYXJvdW5kIHByZXByb2Nlc3NvciBj bWQgaWYgbmVlZGVkCgpUaGlzIHBhdGNoIGVuc3VyZXMgdGhhdCB0aGUgZ2NjIGJpbmFyeSBjYWxs ZWQgYnkgd2luZHJlcyBpcyBxdW90ZWQgaWYKbmVlZGVkLiBPdGhlcndpc2UsIGVycm9ycyBjYW4g b2NjdXIgaWYgdGhlIGdjYyBpcyB1bmRlciBhIGZvbGRlciBoYXZpbmcKYSBuYW1lIGNvbnRhaW5p bmcgYSBzcGFjZSAoZWcgIlByb2dyYW0gRmlsZXMiKS4KCmJpbnV0aWxzLwoJKiByZXNyYy5jIChE RUZBVUxUX1BSRVBST0NFU1NPUik6IFNwbGl0IGludG8uLi4KCShERUZBVUxUX1BSRVBST0NFU1NP Ul9DTUQpOiB0aGF0Li4uCgkoREVGQVVMVF9QUkVQUk9DRVNTT1JfQVJHUyk6IGFuZCB0aGF0LgoJ KGxvb2tfZm9yX2RlZmF1bHQpOiBBZGQgcXVvdGVzIGFyb3VuZCB0aGUgY29tbWFuZCBpZiBuZWVk ZWQuCgkocmVhZF9yY19maWxlKTogQWRhcHQgdG8gbmV3IGRlZmluZXMuCgotLS0KIGJpbnV0aWxz L3Jlc3JjLmMgfCAyNiArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDE0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2JpbnV0aWxz L3Jlc3JjLmMgYi9iaW51dGlscy9yZXNyYy5jCmluZGV4IDI0OWViOWE4N2VkLi5kZTM5ZTEzM2Ew YSAxMDA2NDQKLS0tIGEvYmludXRpbHMvcmVzcmMuYworKysgYi9iaW51dGlscy9yZXNyYy5jCkBA IC03NSw3ICs3NSw4IEBACiAKIC8qIFRoZSBkZWZhdWx0IHByZXByb2Nlc3Nvci4gICovCiAKLSNk ZWZpbmUgREVGQVVMVF9QUkVQUk9DRVNTT1IgImdjYyAtRSAteGMgLURSQ19JTlZPS0VEIgorI2Rl ZmluZSBERUZBVUxUX1BSRVBST0NFU1NPUl9DTUQgImdjYyIKKyNkZWZpbmUgREVGQVVMVF9QUkVQ Uk9DRVNTT1JfQVJHUyAiLUUgLXhjIC1EUkNfSU5WT0tFRCIKIAogLyogV2UgcmVhZCB0aGUgZGly ZWN0b3J5IGVudHJpZXMgaW4gYSBjdXJzb3Igb3IgaWNvbiBmaWxlIGludG8KICAgIGluc3RhbmNl cyBvZiB0aGlzIHN0cnVjdHVyZS4gICovCkBAIC0zNzgsMTcgKzM3OSwxMyBAQCBzdGF0aWMgRklM RSAqCiBsb29rX2Zvcl9kZWZhdWx0IChjaGFyICpjbWQsIGNvbnN0IGNoYXIgKnByZWZpeCwgaW50 IGVuZF9wcmVmaXgsCiAJCSAgY29uc3QgY2hhciAqcHJlcHJvY2FyZ3MsIGNvbnN0IGNoYXIgKmZp bGVuYW1lKQogewotICBjaGFyICpzcGFjZTsKICAgaW50IGZvdW5kOwogICBzdHJ1Y3Qgc3RhdCBz OwogICBjb25zdCBjaGFyICpmbnF1b3RlcyA9IChmaWxlbmFtZV9uZWVkX3F1b3RlcyAoZmlsZW5h bWUpID8gIlwiIiA6ICIiKTsKIAogICBzdHJjcHkgKGNtZCwgcHJlZml4KTsKIAotICBzcHJpbnRm IChjbWQgKyBlbmRfcHJlZml4LCAiJXMiLCBERUZBVUxUX1BSRVBST0NFU1NPUik7Ci0gIHNwYWNl ID0gc3RyY2hyIChjbWQgKyBlbmRfcHJlZml4LCAnICcpOwotICBpZiAoc3BhY2UpCi0gICAgKnNw YWNlID0gMDsKKyAgc3ByaW50ZiAoY21kICsgZW5kX3ByZWZpeCwgIiVzIiwgREVGQVVMVF9QUkVQ Uk9DRVNTT1JfQ01EKTsKIAogICBpZiAoCiAjaWYgZGVmaW5lZCAoX19ESkdQUF9fKSB8fCBkZWZp bmVkIChfX0NZR1dJTl9fKSB8fCBkZWZpbmVkIChfV0lOMzIpCkBAIC00MTAsMTAgKzQwNywxNiBA QCBsb29rX2Zvcl9kZWZhdWx0IChjaGFyICpjbWQsIGNvbnN0IGNoYXIgKnByZWZpeCwgaW50IGVu ZF9wcmVmaXgsCiAJfQogICAgIH0KIAotICBzdHJjcHkgKGNtZCwgcHJlZml4KTsKKyAgaWYgKGZp bGVuYW1lX25lZWRfcXVvdGVzIChjbWQpKQorICAgIHsKKyAgICAgIGNoYXIgKmNtZF9jb3B5ID0g eG1hbGxvYyAoc3RybGVuIChjbWQpKTsKKyAgICAgIHN0cmNweSAoY21kX2NvcHksIGNtZCk7Cisg ICAgICBzcHJpbnRmIChjbWQsICJcIiVzXCIiLCBjbWRfY29weSk7CisgICAgICBmcmVlIChjbWRf Y29weSk7CisgICAgfQogCi0gIHNwcmludGYgKGNtZCArIGVuZF9wcmVmaXgsICIlcyAlcyAlcyVz JXMiLAotCSAgIERFRkFVTFRfUFJFUFJPQ0VTU09SLCBwcmVwcm9jYXJncywgZm5xdW90ZXMsIGZp bGVuYW1lLCBmbnF1b3Rlcyk7CisgIHNwcmludGYgKGNtZCArIHN0cmxlbiAoY21kKSwgIiAlcyAl cyAlcyVzJXMiLAorCSAgIERFRkFVTFRfUFJFUFJPQ0VTU09SX0FSR1MsIHByZXByb2NhcmdzLCBm bnF1b3RlcywgZmlsZW5hbWUsIGZucXVvdGVzKTsKIAogICBpZiAodmVyYm9zZSkKICAgICBmcHJp bnRmIChzdGRlcnIsIF8oIlVzaW5nIGAlcydcbiIpLCBjbWQpOwpAQCAtNDkwLDEwICs0OTMsOSBA QCByZWFkX3JjX2ZpbGUgKGNvbnN0IGNoYXIgKmZpbGVuYW1lLCBjb25zdCBjaGFyICpwcmVwcm9j ZXNzb3IsCiAgICAgewogICAgICAgY2hhciAqZGFzaCwgKnNsYXNoLCAqY3A7CiAKLSAgICAgIHBy ZXByb2Nlc3NvciA9IERFRkFVTFRfUFJFUFJPQ0VTU09SOwotCiAgICAgICBjbWQgPSB4bWFsbG9j IChzdHJsZW4gKHByb2dyYW1fbmFtZSkKLQkJICAgICArIHN0cmxlbiAocHJlcHJvY2Vzc29yKQor CQkgICAgICsgc3RybGVuIChERUZBVUxUX1BSRVBST0NFU1NPUl9DTUQpCisJCSAgICAgKyBzdHJs ZW4gKERFRkFVTFRfUFJFUFJPQ0VTU09SX0FSR1MpCiAJCSAgICAgKyBzdHJsZW4gKHByZXByb2Nh cmdzKQogCQkgICAgICsgc3RybGVuIChmaWxlbmFtZSkKIAkJICAgICArIHN0cmxlbiAoZm5xdW90 ZXMpICogMgotLSAKMi4yNS4xCgo= --000000000000a3da7005e27d16e9--