From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by sourceware.org (Postfix) with ESMTPS id B98403857C49 for ; Fri, 16 Feb 2024 18:37:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B98403857C49 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 B98403857C49 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708108674; cv=none; b=mmnQPLwWMf1O7flBOceu2TbIPIFHkdl7Pv3K7xaHNupwubOfD/9uih1FPgMyNZh+7Lps1crs/ub+TjZXaNhNdpyJrgxmwe60HZfjyQKd/SJQaZKKZAMUdji60fvZsPm/KNVQbIYud6H/nBKSz9BCMnbET9u+SNtDYNxbi5EdPeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708108674; c=relaxed/simple; bh=t09SdwRudMbVBcndZindSU6SS1IXjjRdXw9ES4u7iUE=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=tSE7hSTxQWX6SuNMXS4K8eh5ZqrwD4d+VfI3hRozLJn7QBJeDN8wM82vBwBoFHRpQbHLY4b3wU+noh1NEGuy8wrOqNSMXrouk4XjbJceHlImX3wgoXRwgb1L22BnJ8lSi7Rz+nRibJ8ErfudTSu7hB7SWTwiswtWYG7cV3osi9Y= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-7c490498729so105513739f.1 for ; Fri, 16 Feb 2024 10:37:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1708108672; x=1708713472; 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=4x5aHKAslof5IK0Al5CTnhGXkIKjgTXhoVLuKlZ+O88=; b=fAClUGGuweh371Nz/tZBe3Q1hJAEuN/oQqjmt50qStocZLMHmc48qjarGriZfmk7wc 4stVHRXXT8+0ZVtglOsZ1z/dMV8jUTIWt26/T6wz2VYijSy5AJy9PCTkxmqrxd9ec1Q2 1+Shclqsc18vw4/RB39xQhdiixuGU69K5QFrQnfOBqYdA95T41gxVOpH/lB8OR7Y29YP IP/k8IINr7TThLfPnkdV/hbCaL7DwBRoTl0qvVQT7XcomCGW4+x+7KjIgtTvgHwkUCB0 G6gckNvtXmrLEr1ZzjP4HuxOlkFAGVOR7ev7GXSpEOoEvFI4ihAeai6/QvgU3aMziUw4 CF0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708108672; x=1708713472; 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=4x5aHKAslof5IK0Al5CTnhGXkIKjgTXhoVLuKlZ+O88=; b=BXpc7lGQeOmhQlKkoxcyNQtkbNkSBnbaUeWy/oSY9xLB58gvyiQxU21twW9Z8QLMm1 YSPMJY6X83B9P3hG3hSI4RDzRv6BEJCpk0mP11Jdb9DHQPRxPcwmc8SkTDe5fuC6oDtm OuF2aW3E++sasU47cmBxxdmeew0jW0jqnJZ5ieywgVAUfgUve2q1taLUYQ7bXZELshBN SZOFZJtNK470iBPy2UnsCK8rxkOdKF1oHN4fMfAJuwTZkv7EnFMmbchUl2RAGTQASUdN WOKyTFj3Rw1MDtiyM/2bCQs4RUzVx2UIP8A3E/WRQjl5yv7L4XMSCTaIxcK/PegOdWm8 mGBQ== X-Gm-Message-State: AOJu0Yw4I1SeqnwZAWSzcL0+Xe1ICXNHzI6zjP8V6G17GLJRKWddMWbb HcuLECsPJX6MpcXNg2HPuwjMgOAOto8ZK5AYLX3h8v0rWpyVkF8ArygC47rJkPYjyT5wI4UTEaE = X-Google-Smtp-Source: AGHT+IG7AiOL0BYRFKw5WsKhPFuGspqmjtpXF1vn5MumV2CAQUfgH6BLlWm28mufYfkN+zylTuiexQ== X-Received: by 2002:a6b:6b08:0:b0:7c4:9047:b9b8 with SMTP id g8-20020a6b6b08000000b007c49047b9b8mr5641286ioc.3.1708108671455; Fri, 16 Feb 2024 10:37:51 -0800 (PST) Received: from localhost.localdomain (71-211-170-195.hlrn.qwest.net. [71.211.170.195]) by smtp.gmail.com with ESMTPSA id g20-20020a0566380bd400b00473eb9f9afcsm104724jad.61.2024.02.16.10.37.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 10:37:51 -0800 (PST) From: Tom Tromey Date: Fri, 16 Feb 2024 11:37:49 -0700 Subject: [PATCH 1/5] Introduce new overload of read_text_file_to_string MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240216-py-simple-exc-v1-1-c275bcfb5e4a@adacore.com> References: <20240216-py-simple-exc-v1-0-c275bcfb5e4a@adacore.com> In-Reply-To: <20240216-py-simple-exc-v1-0-c275bcfb5e4a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.4 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 List-Id: This patch adds a new overload of read_text_file_to_string. This one 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..70bcc3faf60 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_text_file_to_string (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_text_file_to_string (file.get ()); +} diff --git a/gdbsupport/filestuff.h b/gdbsupport/filestuff.h index 1c43b7de0ca..4a90b08c5f3 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 entire content of FILE into an std::string. */ + +extern std::string read_text_file_to_string (FILE *file); + #endif /* COMMON_FILESTUFF_H */ -- 2.43.0