From patchwork Tue Feb 20 15:21:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 86033 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 E1CF93858C74 for ; Tue, 20 Feb 2024 15:22:03 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by sourceware.org (Postfix) with ESMTPS id 51FE83858D33 for ; Tue, 20 Feb 2024 15:21:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 51FE83858D33 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 51FE83858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708442488; cv=none; b=q2BKI/+I879ES1zYFfrQucfUtrLPg0F7qwRkbBv9vZEoO1TjkH4KOaERoeQ0j9PJAbTfs6PlLp8DH0+6lm+9zqLTA7ldPRMN9s6dGzs9UQbybfR3qMQElHggJSR8CVe2kCYw2ylMHfZDPJBLA+TotP1+6IAbTnD10svwJ6fKBB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708442488; c=relaxed/simple; bh=288PPjDq8MyQ5VpXDiC00p9XiotRt0mCpUo8+oG9A3Q=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=HJYc5EjtqWxsOJeRPviMjLpRD6ObZvrWVz5V5DufYgaVWTNwsP+elaerk5pYo8dyBnYO9E0wKL0JBJU04guCYZbIuyL8xrQlzs5EG7mISUl+IuwboazSZP01Yt3F6NM2m6df8Td8M4+VEb7OS1g0rTo6whvNIHzWjzT+UlYiPwU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7c7674446c0so22823139f.0 for ; Tue, 20 Feb 2024 07:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1708442486; x=1709047286; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/VkWtmVn6mxT1Itq8Qby4I6dWMtHK9cTxgw8NSx9Qds=; b=gJjRee+BupJSbueRJJsvrcaiYYhWWRtE7Gkbajv7+vxaRptW+9QVm0mCHJM2Zr89VL DKEUHL/v65dNoO85cofffLG3R9LwXRdEfWkwx53AlC1sV7uTBtGBqyfS/fcsOVprTUnO o7b6A2X6pTDIfHZpKowUxJoJoEGF3ry0x6J0KMUVkA+0M+pMr0Wm8wfK1sVMaDmBFj1A NA4vEk+qL6/MNTtygt6zLtFUMd6ou8SdyzuI8M5kcl5WOuVsmVeJJJDs1DeflV+hvbsU Q856Ih2iAO1XbXSsdhFz/q/6/Gj3W5ePo6WeQ6OWFRRiqdSQ/dRi7V/X7/v2Kn2BZcLV B/3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708442486; x=1709047286; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/VkWtmVn6mxT1Itq8Qby4I6dWMtHK9cTxgw8NSx9Qds=; b=FR8OMDNYdorGW77HuPZL9awgt20PKCl/Ng3R2WmSYtt38d3eiZRBskwhsX/FewbC4H FfL3OD3M+bneLDUS6qsbYkPL+OApsyICMetsbo+7mnAJeF+v5Mu10JDosDnMrWRBWnWX 8FKDGcyPOrtKJciUranBC8QwR9cMj1RyNWZ4lq++ej1pYYvPaCYhlc2+IpeZmlhqLaWK qXgfwsFy/n40smrna0sog7EvmiYmy+bXi0WYBaA9D1I7gsrvEH5ZgaJomc1bFO2uACQD 5eY7NWjBYBToZaJAaXNpIoWBsUfiDx5cy363uaAf984XbtSF7wCtGEDsDA1r/YMUfBfu x2tA== X-Gm-Message-State: AOJu0YzP12JI6WittCXIOS9B8SbABmdafOyZ2+wOgqrQqMtsum3XSmuf GSuRXVDvfePT6sdkDWgx07QwnhNWBxCviD2yHFqu7oM3ZlKSq63GxDu9We2Bp5IIWcVCEjrAL2E = X-Google-Smtp-Source: AGHT+IERCajiXeXVI/L+ILz/ei89kXyo1ccQCC9I+EimrQ/HtGTQJ5V7Ug5Lm1uaFqX7tF7niltnpA== X-Received: by 2002:a5e:a501:0:b0:7c4:9768:aef9 with SMTP id 1-20020a5ea501000000b007c49768aef9mr19287243iog.13.1708442486545; Tue, 20 Feb 2024 07:21:26 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id k24-20020a023358000000b004743a0b8b8csm314914jak.153.2024.02.20.07.21.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 07:21:26 -0800 (PST) From: Tom Tromey Date: Tue, 20 Feb 2024 08:21:24 -0700 Subject: [PATCH v2 1/5] Introduce read_remainder_of_file MIME-Version: 1.0 Message-Id: <20240220-py-simple-exc-v2-1-c672f1984b4d@adacore.com> References: <20240220-py-simple-exc-v2-0-c672f1984b4d@adacore.com> In-Reply-To: <20240220-py-simple-exc-v2-0-c672f1984b4d@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.7 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: 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 This patch adds a new function, read_remainder_of_file. This is like read_text_file_to_string, but reads from an existing 'FILE *'. This will be used in a subsequent patch. --- gdbsupport/filestuff.cc | 24 ++++++++++++++++-------- gdbsupport/filestuff.h | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gdbsupport/filestuff.cc b/gdbsupport/filestuff.cc index c67e650c1a6..9d3b417359b 100644 --- a/gdbsupport/filestuff.cc +++ b/gdbsupport/filestuff.cc @@ -504,13 +504,9 @@ mkdir_recursive (const char *dir) /* See gdbsupport/filestuff.h. */ -std::optional -read_text_file_to_string (const char *path) +std::string +read_remainder_of_file (FILE *file) { - gdb_file_up file = gdb_fopen_cloexec (path, "r"); - if (file == nullptr) - return {}; - std::string res; for (;;) { @@ -520,7 +516,7 @@ read_text_file_to_string (const char *path) /* Resize to accommodate CHUNK_SIZE bytes. */ res.resize (start_size + chunk_size); - int n = fread (&res[start_size], 1, chunk_size, file.get ()); + int n = fread (&res[start_size], 1, chunk_size, file); if (n == chunk_size) continue; @@ -528,7 +524,7 @@ read_text_file_to_string (const char *path) /* Less than CHUNK means EOF or error. If it's an error, return no value. */ - if (ferror (file.get ())) + if (ferror (file)) return {}; /* Resize the string according to the data we read. */ @@ -538,3 +534,15 @@ read_text_file_to_string (const char *path) return res; } + +/* See gdbsupport/filestuff.h. */ + +std::optional +read_text_file_to_string (const char *path) +{ + gdb_file_up file = gdb_fopen_cloexec (path, "r"); + if (file == nullptr) + return {}; + + return read_remainder_of_file (file.get ()); +} diff --git a/gdbsupport/filestuff.h b/gdbsupport/filestuff.h index 1c43b7de0ca..e2ee141d46f 100644 --- a/gdbsupport/filestuff.h +++ b/gdbsupport/filestuff.h @@ -133,4 +133,8 @@ extern bool mkdir_recursive (const char *dir); extern std::optional read_text_file_to_string (const char *path); +/* Read the remaining content from FILE into an std::string. */ + +extern std::string read_remainder_of_file (FILE *file); + #endif /* COMMON_FILESTUFF_H */