From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2139.outbound.protection.outlook.com [40.107.105.139]) by sourceware.org (Postfix) with ESMTPS id 237173858D3C for ; Wed, 29 Nov 2023 15:15:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 237173858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=xmos.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=xmos.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 237173858D3C Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.105.139 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1701270912; cv=pass; b=SjYMMnGZskEO2Tt7KHMjufYdW4/fL7Gl0taqeULJqlYPiBMV+vmf726ZnOZ50DP48zOzbLs05nFlNQUHmq1RxUGNoGSRjP1SunfVXDReooD1A1Jjiqs7KPxWz79opSB0dr3rFCMkbXIqYtjf6UwbA9MqyHA0m1Sg00srImN+2Y0= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1701270912; c=relaxed/simple; bh=szs9ATRzUjSpVTiz9vE7rrLoRp+G/2E8L/zUn32HpDw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=bjWPPQb05CyN0SEkof+fhtSnCFsx3IR6Sd20VzRkRH/oUn4P2zX3QbWWyfsQz01GpmHD+fc5uoLqi15dgLVqt40AO5cqS4MnBJvVId9gYeM6DEFwB63aRNG2pu7z9vwURWa3UcjMmVGYxnQfV1CCXip4S5SQXcVcS6S/wuYnmok= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OwhDWSVgdVefkm90G1QFPUld/Mu+6d70ptNx6KNRp4p+Z7mlnN4UTylUJa1JswAQe7qvt6IlDnCWVTOZwfFyK78Qt4U6mVnLSeLUJhppBaPR4TyDngg+P1veIiG5UEK/bUnjviIZBXl3h3x0g/2zsMPdt457hE47nP/SG+jM0+b60hJvvEr8J5AjEN1QZGeTLnpumWPSNSQ+RRLS+QF4RdggAR8ne7x0aMZVzib7gLEuCH9AiPrMX5guKUTn1eKGJVbsJRqY9Xpi6y5s771d2250Z7HYMlYF+EcEXUgKXNLRDOyiMQclzMGJcioAgA4MCqMphDFm85kNHDeqVjSUTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qW+USEoUZFTq1vrQH6Fkw1Rzaot/GVMfR0Ey1m8KD8E=; b=aOn6Pc0kT3sHzjtndcerrhA26SKg9YroTjqXGfsiod0yRI3k3JAgja+aJ3cxHLp9cUF7rTkMfH4vjDAxN+HBGaMIcmBfM057J3Ub7GtP0jkbZExglgJzeL3Cx4NEpyiKqCVQX1ipCSp3CuCBK6r0lIYaDN5m68YKUCwSjXQl0NDb6TGvloxFCDbbbYk9prhPxKlzhEO7jpVBOwbulMmaOuZyFNzp4ib22dezQHRR2bkjB6E4nnXMrzLDzuaKWC0D+GjjUYjgOEcJMa1adhgizylvfmCr9Xc2iyfEl2QdQQbyqkGGg3Se6xLKu7SpSE7kibFgbbbGyPTa0fDNF+maJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=xmos.com; dmarc=pass action=none header.from=xmos.com; dkim=pass header.d=xmos.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xmos1.onmicrosoft.com; s=selector2-xmos1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qW+USEoUZFTq1vrQH6Fkw1Rzaot/GVMfR0Ey1m8KD8E=; b=i8+vEub4ht7xWVWpsoMFO3JgoTCxNgZIkzhrAeJOuxL1J9Mz0zjGwfQhuKK4RBuZmnM1CVXl/KgUTK6BFPxl63yrEuAEvVehvIQNhVAiIrzAi1WmktNstD9MHbnyWb/pABCohhqjuJBD1Y7mkPe72jKJrCWw0iHTzIIKSLhyMnM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=xmos.com; Received: from PAXPR09MB5583.eurprd09.prod.outlook.com (2603:10a6:102:280::6) by DB9PR09MB6057.eurprd09.prod.outlook.com (2603:10a6:10:3da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.27; Wed, 29 Nov 2023 15:15:08 +0000 Received: from PAXPR09MB5583.eurprd09.prod.outlook.com ([fe80::7bb1:2b0b:2733:2340]) by PAXPR09MB5583.eurprd09.prod.outlook.com ([fe80::7bb1:2b0b:2733:2340%5]) with mapi id 15.20.7025.022; Wed, 29 Nov 2023 15:15:08 +0000 From: Ciaran Woodward To: gdb-patches@sourceware.org Cc: Ciaran Woodward Subject: [PATCH] [gdb/doc] Escape the '@' symbols in generated texinfo files. Date: Wed, 29 Nov 2023 15:14:59 +0000 Message-Id: <20231129151459.14738-1-ciaranwoodward@xmos.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0129.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:193::8) To PAXPR09MB5583.eurprd09.prod.outlook.com (2603:10a6:102:280::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR09MB5583:EE_|DB9PR09MB6057:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a529d15-a06f-4825-1361-08dbf0edf8f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G+kQ8xO5kSkvw4Wo2sdDEZz9/D3Nk04gaQT9/CNKLusAfrSeJLJZq+29Pu02H3p/qzeYBdd+Y5OW+nIqDaXEAn8+Fhp5WmfQ25s/1eiiSfdLtl18+yyZghuK3Cskgj1GoOMVwx15tKRmUGeuUtJ8aY5WKvk02LPOx5Eyfi3D/sKcTIAQ6gwqsWtbFb+aunvvOo1cOK1fYaAYEoBRUUPKytSx5E4yawU6Yq2C38vDEpcV2gjxW41By1ghtvPR0bah7/OpGZYF03cYg5TEmv9j4dDC73TYKGu44cFx1W8VL+JvTY8jsX+hp+sBwiNWVWpiGAU5YUyHxJ77OVXsFAEqDbtumpo4f3sONRZ4HCmYNinI028+YJ1rQ1qcEzlGTnyXIi5hd5o/IZ7OEjZfnd2gl48OHGW56L9PFuj0QhubpUqX9ytj6kFd3agfY4tZkBE4kHKNrWb8AZ7xCvQxWofTXXi+FaLEN08bmjAubf8Bbtr2eVYT2KZIuTCEsqfTUnF6uHrkNpZnKSSp5Z0oV0mtROgT+SFZBEZdPacziGVXWadUtpqCwnj4HssngJPIIllsox6Hxy1NBXBLNcjv4N/t8EjX+sllK9m8HADHFhIiA3yLVZZ/pc1Qah0zsKhX7+8z X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR09MB5583.eurprd09.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(396003)(39840400004)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(83380400001)(478600001)(38100700002)(52116002)(6666004)(6506007)(4326008)(5660300002)(8936002)(66946007)(316002)(6916009)(8676002)(66476007)(66556008)(6486002)(86362001)(6512007)(2906002)(38350700005)(36756003)(41300700001)(26005)(2616005)(1076003)(107886003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jrqVZHTLhC5QIBnrLl1eyU9kuuUuVfERbYc7UFSCxl9K9I0WdVchKHSwNDHL?= =?us-ascii?Q?WCwf8ZEwxDAgOUdo94VLHTzZKaBrtE85f/Ke8HrguoBrrkketMc7elP94zYA?= =?us-ascii?Q?BdJqT4jkhr6uRqiQptR5NxQ11lKqllE3/FShzOTRoRtZzFqQywrpe9jPglfZ?= =?us-ascii?Q?mCA+UCJkKxOykVUX9xUycRPL4USBgsBifXF0bnOU0ZzcD6sbxWvmOfhfOIWF?= =?us-ascii?Q?PzU1hCUweGgNPPz5nrmobhNy62HoRbU45Ht8IYQ2H3WWvGHwphXqDNCi7Wgn?= =?us-ascii?Q?NmrtvWjzM/BJpkZli76i10ixAF7uHODqaNjyZM/CIVIqA4AHmpqkOPdECQNG?= =?us-ascii?Q?upkBSbIb/iCopGALuZWF4B0Sw4yUaoL0+Kc9nL7jXyH1Vr/bA9BekZp6yMlK?= =?us-ascii?Q?b8RFApnWCqFwmY0SMno0kKRxas99irX1Og0RHm8GfC06r37HeL1mBLG4AGRM?= =?us-ascii?Q?2pu7ZMm1ppki/DRxYXPeSMNa0wWpxTQ44ENmr7FgYhynqpEYGGDl+suDo4Ot?= =?us-ascii?Q?C9oKNraA9UXhZnJTv7jfpfCRxC1AEcvKl0oubBkTnUyw66OFKOzu47r/4TkV?= =?us-ascii?Q?97ncl53GYwA40K321GkxHJ/V3blxq+wTvCEPdZeAMy5U7pFkgEK0oRyB9Cb3?= =?us-ascii?Q?G/78SBJxF71hWdPt7jyjEIPv+cqPoBeBVN/G2xJiufvN6uUIA5Nf8dmmeCP9?= =?us-ascii?Q?D3AX7sCaoG2aPxx+4FDLYcyLt7wAQJcZXRAJ3qCgJR6EVKWrqDhcMJTkF31Z?= =?us-ascii?Q?WPXgePzPapClPKL1j1k4f08mzCqsY8dcEHYuuQmyC7mpSMxQzOF07baZy4Gn?= =?us-ascii?Q?4G9pF4YDG5/9Yb6pJCnmjM6GgKImaaQ5QQVeBP8qIjVQvYyY4npahu9lSR+C?= =?us-ascii?Q?6CRVe8i9dGNCJiMZ1vkA8L4qRrc/jlelXHiWUXnYeo5NhfiyJ1z2ysWcx6O1?= =?us-ascii?Q?uNw0lAGZ5gDSdckxTf0wJQ8zd0LYD/7GooCFzn4yjSG44Yq4y4CjjXgZJAu3?= =?us-ascii?Q?MVVr5vAJA1oBt9JhLZsJ8vYD4zLX6G6WnYXJpT5++dyI1HKmmVh+Xjd1xFPw?= =?us-ascii?Q?Gwzvy2K7VENadbWX/6lAlbqxQJ87X7l6oo2EilwbJtupSXI+R1e7c7uSQOLZ?= =?us-ascii?Q?oEbCtcEOYeh3GpfSp1FGG8y6f7grcdYQjiLVo9JjWt6hJ2uoOrlOE3vK7Xyb?= =?us-ascii?Q?YbJetJw9ICqKziJWyvPkOcDUO+3PnyptvrQFNiJXWMLANkuHnSTv77LzH8jA?= =?us-ascii?Q?UuzUvLx94VCaie7GDl9V76Smiglcp3RIlpsFh88pr4tt1+1Q2y1KnnWU3eWi?= =?us-ascii?Q?yxYCQuE000Nxvu+R/Z7JgNA5gFGrdvj7vI9ZNoVP3F/k1T2BfJ0LI4Y3U1Ic?= =?us-ascii?Q?M4K4jvEieehQBqeVgBb2D17FS6F3RC+saAx3s54I/GOckJmBvb7LGNq8bZVR?= =?us-ascii?Q?aUkOfX/0czB9ZnTqXg4DGX8Wm2Vs8TtHEdxvbf/xrdekW1lBrrbWQ3qKltC5?= =?us-ascii?Q?zp5QO5H2Lz7QwvDAnuvJ75lw8hqdouuFzQq1lfqTiFoqNCc5xxTd9QoenGQp?= =?us-ascii?Q?U1doOpNYAai0LdSA38OvV3YUbQZcCnwIiMiSyKU4o+wX/ZV61rwDlC1UbVCz?= =?us-ascii?Q?dg=3D=3D?= X-OriginatorOrg: xmos.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a529d15-a06f-4825-1361-08dbf0edf8f3 X-MS-Exchange-CrossTenant-AuthSource: PAXPR09MB5583.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 15:15:07.9534 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 975ecfb1-4080-42d2-a01d-4a4d0707a539 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vH+FJW1bf+oWifCmetKnkfbCewPT3zr9piNfKhzm/8/qMEs0X71TUCkk5G9wRLttWEU/auL+Tj1ta3Sr2xUwEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR09MB6057 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: '@' is a special symbol meaning 'command' in GNU texinfo. If the GDBINIT or GDBINIT_DIR path during configuration included an '@' character, the makeinfo command would fail, as it interpreted the '@' in the path as a start of a command when expanding the path in the docs. This patch simply escapes any '@' characters in the path, by replacing them with '@@'. This was already done for the bugurl variable. This was detected because the 'Jenkins' tool sometimes puts an '@' in the workspace path. --- Note that the generated information is still a little deficient if you're building a 'relocatable' installation (since the paths are absolute) but that is not a regression on before. gdb/doc/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 110b6088905..70ee9a8b9cb 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -429,10 +429,12 @@ GDBvn.texi : version.subst echo "@set SYSTEM_READLINE" >> ./GDBvn.new; \ fi if [ -n "$(SYSTEM_GDBINIT)" ]; then \ - echo "@set SYSTEM_GDBINIT $(SYSTEM_GDBINIT)" >> ./GDBvn.new; \ + escaped_system_gdbinit=`echo $(SYSTEM_GDBINIT) | sed 's/@/@@/g'`; \ + echo "@set SYSTEM_GDBINIT $$escaped_system_gdbinit" >> ./GDBvn.new; \ fi if [ -n "$(SYSTEM_GDBINIT_DIR)" ]; then \ - echo "@set SYSTEM_GDBINIT_DIR $(SYSTEM_GDBINIT_DIR)" >> ./GDBvn.new; \ + escaped_system_gdbinit_dir=`echo $(SYSTEM_GDBINIT_DIR) | sed 's/@/@@/g'`; \ + echo "@set SYSTEM_GDBINIT_DIR $$escaped_system_gdbinit_dir" >> ./GDBvn.new; \ fi mv GDBvn.new GDBvn.texi -- 2.25.1