From patchwork Tue Feb 27 14:45:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 86451 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 6509C3858296 for ; Tue, 27 Feb 2024 14:46:29 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by sourceware.org (Postfix) with ESMTPS id 8A04F3858C35 for ; Tue, 27 Feb 2024 14:45:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A04F3858C35 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 8A04F3858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709045156; cv=none; b=tHHNygvnXdIYJhBnSd0aVTggHfFjl05s6DrVUQjSFmMt/1an51wLNJ4UO4DwrrMNa1fVPVG5GmCmjEAqzgIAchYKRZMy/hmh09sNGYtLVasMBf0Ebk5bxDwwcftdtP4qExjv14wA17IGHuiVovPP9JE7sE3IQISOJvEiZQbeQyQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709045156; c=relaxed/simple; bh=+D5bwPd34X+XcNoSnf/DojcTs8nqIHjkvgR4NiC4tzQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=av625jatpDpojY2TiN0n74Vl89W5BeyZSEvol/Z2aqcGASpuz9Xz8jrEgPm8KNK9qOA6JdCH8cCdEgmaz4KAZ2BRnjR9fYoJEQ/NLDSRyVhCle6gx3EV29voQcwIfG9csHzHYUiEJ+TFZt+0yiK3d9O8bD/nrLJjYe4gcMoX6IM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-7c784e45887so193439139f.3 for ; Tue, 27 Feb 2024 06:45:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1709045154; x=1709649954; darn=sourceware.org; h=cc: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=b/0QikAG9/TmqJjW9Q9we+mc4yHxz9YshFpZFP45L+A=; b=SPtLm5wQMPq4jBcNR1uFNB9pnLZ4zFl+MINLQdLx/7QFT50mxPRcs2WjiUobDjWzkd ogKCI+yHnZunp6QMi/kRJHBWjNTwDfpah17Sf+ESojdkf5aZB0kcfnZPn7OdKuhTMO6A sH+i2teW3Nh4XoK34agq3oK3KwmdUTJYZPKM3Dc53tZVj8FVxONaG9MjxnpBqyVrhXnB bMn3qw1Vi4ha+SzGr0E1TVr5ewPpwmDhkhO1qfwUpa8phQ7/u4hAXJJ7SJPRJu6Fh37U CoLYa6ZKEYXAKK6+yl4g7+C8K1Bl31s2lwpdt0N49Ka+izNteFetCsxdO+9ebtPm6E6Z +aqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709045154; x=1709649954; h=cc: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=b/0QikAG9/TmqJjW9Q9we+mc4yHxz9YshFpZFP45L+A=; b=Q3cWUxPwuLl/M99N+GuGFTgqu9IYEifZMLbk3/IhHhGOPhdoF+h8/InSGsQO1wOdWE 64vXPnWEfYQMKawiuRFhKftPAriZSK5rj6HIk+6QysHjF0IycKzldrImQMZ5o/UPICAs 2pp+MzEF/qo+OdPF8ERr+5gD1qeeFZ8bdcrCqjNX0355/VPasn5r0rpGTBmugJuD9UcE yrFMfqpZWRY3cx5WCZ76fF4yYGn7Ytf667CssXPp3rjvBnJXCFI/huC2/w4NzBoV+lga zWRE1XUughNwJZF7hdBqwwd74NN/e+/B6MI+WO3onpTMG+zvA+cW+1DeUJ4KJgzbVnVR VSQw== X-Gm-Message-State: AOJu0YwQ1qFd6Y5KnB8qL3EGGOvDg6tb2Nss0kDhm1/Onfg6hzvpViH2 1A4U/wMxoqeEkpZc0KuwVtgGyX+CwECzp259PVKm7aGvDtw3St2l73YG2dyvGccC3u4f+8+xyWQ = X-Google-Smtp-Source: AGHT+IE+eQGUbfDLO0DqtwC2zGsb0f9yyQoN2wY1uguVYGoPSg0fcvivk+LxANowYjhaKbY3wvrE/Q== X-Received: by 2002:a05:6e02:1b07:b0:365:267:8cc8 with SMTP id i7-20020a056e021b0700b0036502678cc8mr12466178ilv.19.1709045153745; Tue, 27 Feb 2024 06:45:53 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id bm9-20020a056e02330900b00365374d2143sm2212686ilb.5.2024.02.27.06.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 06:45:53 -0800 (PST) From: Tom Tromey Date: Tue, 27 Feb 2024 07:45:49 -0700 Subject: [PATCH v4 1/4] Introduce read_remainder_of_file MIME-Version: 1.0 Message-Id: <20240227-py-simple-exc-v4-1-3341d342c126@adacore.com> References: <20240227-py-simple-exc-v4-0-3341d342c126@adacore.com> In-Reply-To: <20240227-py-simple-exc-v4-0-3341d342c126@adacore.com> To: gdb-patches@sourceware.org Cc: Tom de Vries X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.5 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. Reviewed-By: Tom de Vries --- 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 */