From patchwork Mon Jan 13 14:33:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104695 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ACD933857706 for ; Mon, 13 Jan 2025 14:34:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ACD933857706 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=VeiK86Ok X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by sourceware.org (Postfix) with ESMTPS id 355A93858D21 for ; Mon, 13 Jan 2025 14:33:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 355A93858D21 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 355A93858D21 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736778838; cv=none; b=raNXMhSJuL3yEeWB0rv7z6ygqwmLOAAnsrumq8hW/pktUC00YzBSaSLWAQZ3DGS6rDLftfJ53dnt/Rwit5Gt0vi3OWV9tzj3UF4mo6HnHQ8bgCmriZ9IsnY14IzisqbHonX977WI8uJSF1dQmjSn9c5P/GkW2SNGVou7bNSeNWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736778838; c=relaxed/simple; bh=XrJ8lMhVh4o9l+aQbFC0wOBCUk22Sp4zpe5Yv61zNog=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=hEt9UImSUDoEr7Ek17HoLt0l/37RRaGKIOnIeW00eHqW1QJz4k80WRyRDWeMN2sR9o0rFScGPewq5IzkOzFvQ/w+1itjVRD8mC3ubxGCxRMVOR/YQV5tsYrx2147ikyHzUdNV+jMe52lXu7e42GaXGC7mFFbma57VIakDmomPpc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 355A93858D21 Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-84f1ea04c64so308435239f.3 for ; Mon, 13 Jan 2025 06:33:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1736778837; x=1737383637; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=weQOeGRHT0T7klygO94bzihoT1iyzXZFp8zzkiq1Neg=; b=VeiK86OkZYnoP2npxErijLdIifQmFdwC/USMo9R9XfIvpGf6E4P/pbIsnqaoRMDqY6 8737ySlNy2+42asP38uvis41/XSo4ETm8pXs463iyeoX9KO8xnvfVigB79h8Xl6p7cUe oKbSUAaRqUW6fhpU/0eC8yXBHxXo5AWPEZRfUZ/C+d9hXFznsB2PUN9cVSdimKzXz/nL o+UDs8ZUTz5S+gsXy0M6GK5K6BVpvZvmW/HBBlz/h0zWTLCfALAqfdftSjdhJpw4Ldl+ t0XKm/QVrDse6ydmyPsE335lov5QbV3owZBTfbQt8W+AapZUFpj+mmaV6pL3ooPmGnoG dhfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736778837; x=1737383637; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=weQOeGRHT0T7klygO94bzihoT1iyzXZFp8zzkiq1Neg=; b=WHp+FiQOi6l65z6NTip79GEDlWCZxSihUmBnj0vd/2pYhFHcxuy/YGpH4gzJPr6gis kNTrrQjqAVFIzNDqGjmzd81+YOt56o61c3zHKFUw0fzNw8AHhPBTG/dtSOOjt74G7FHn itLbrri8x9uBdLORluvUox27GD+l0FSvdrfIsRoaLOtzhkJjbWlyIqp3zhg8O/9LNYlW cJoISQrYmMXkUad+CBVRUJpiCr1N/Y6ExGIANe6YxNqyg2oaUm/DX935nNV1ltgbozkz woD1HnsXnpEW+JRiPtkKLHVvTwX0hLRwpC505ITB2ZlUt+nrDwv4xbRe17yHRNTt8McY nqqQ== X-Gm-Message-State: AOJu0YynkuItjljahm41Ej/BkrS75ty29hm3BQNd0bAY+VBb6wK8paiD o1dGN0A8Q/wc2yV5mfKN4//yRAkpdQ2wwRywW9/1B/id010KQ8rQGCBbGMJ4wVQ+v2nORkPz7nk = X-Gm-Gg: ASbGncuejE/XUCWKR2eDnyf1DI+Nhxerc1zAFSuCLB3E3/VHIhzk5EO0yaPeF6pf7Sw o26MpsRedXIlRCJkDQ3NnAHcMJ/GYcLHkpYPne3NOgk/UDehTMtPKO8n6jakCcwPBUyNt6l9q3k YEAtEJxI6KmhHItcOp2S6g6Ogv4o+45CJt29yJCyrsip9ktQi7dkgbl+Y8Lj2ZpaM4MmtmxVXjr w+tlNpKwl09p8LSG0CytyAPNiV2VHj7dCID8TmdyxYr4ZMIgooKxg5QmKRxKaWg3pT1/q8ANjOa 6829G2yXPrWby3axUCq2 X-Google-Smtp-Source: AGHT+IFL1925UmL9S/BPHZ5xCCfF4EiWBm3FIy2tdVyrdnQY5Uavdhhfo+vGjq59z/2E5ZSaEkyS7A== X-Received: by 2002:a05:6602:3809:b0:84a:7963:7043 with SMTP id ca18e2360f4ac-84ce0033588mr1827833839f.1.1736778837434; Mon, 13 Jan 2025 06:33:57 -0800 (PST) Received: from localhost.localdomain (97-118-36-154.hlrn.qwest.net. [97.118.36.154]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ea1b718428sm2746646173.89.2025.01.13.06.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2025 06:33:57 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Fix help formatting for string and filename options Date: Mon, 13 Jan 2025 07:33:49 -0700 Message-ID: <20250113143349.198028-1-tromey@adacore.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 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 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I happened to notice that "help add-inferior" said: -execFILENAME FILENAME is the file name of the executable to use as the main program. This is missing a space after "-exec". This patch fixes the bug. If ok'd on time I plan to check this in to the gdb-16 branch as well. --- gdb/cli/cli-option.c | 4 ++-- gdb/testsuite/gdb.base/options.exp | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/cli/cli-option.c b/gdb/cli/cli-option.c index 10a59449f7c..34ac1642b84 100644 --- a/gdb/cli/cli-option.c +++ b/gdb/cli/cli-option.c @@ -832,10 +832,10 @@ append_val_type_str (std::string &help, const option_def &opt, help += "NUMBER|#RRGGBB"; break; case var_string: - help += "STRING"; + help += " STRING"; break; case var_filename: - help += "FILENAME"; + help += " FILENAME"; break; default: break; diff --git a/gdb/testsuite/gdb.base/options.exp b/gdb/testsuite/gdb.base/options.exp index e1ad61e6470..a1ca39eab11 100644 --- a/gdb/testsuite/gdb.base/options.exp +++ b/gdb/testsuite/gdb.base/options.exp @@ -1162,3 +1162,9 @@ test-thread-apply # Basic "info threads" integration tests. test-info-threads + +# There was a bug where the "metasyntactic variable" was glued to the +# option. +gdb_test "help maintenance test-options unknown-is-operand" \ + "-string STRING.*-filename FILENAME.*" \ + "option help has spaces"