From 03ee450eef369809d3e0bc5bcaaef287db4dd67a Mon Sep 17 00:00:00 2001
From: Francis <455954986@qq.com>
Date: Sun, 10 Apr 2022 17:35:59 +0800
Subject: [PATCH] Update c++_example1.cpp

---
 codingStyleIdioms/3_RAII/c++_example1.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/codingStyleIdioms/3_RAII/c++_example1.cpp b/codingStyleIdioms/3_RAII/c++_example1.cpp
index da28c10..ccb655c 100644
--- a/codingStyleIdioms/3_RAII/c++_example1.cpp
+++ b/codingStyleIdioms/3_RAII/c++_example1.cpp
@@ -12,7 +12,8 @@ vector<string> read_lines_from_file(string &file_name) {
     string line;
 
     ifstream file_handle (file_name.c_str());
-    while (file_handle.good() && !file_handle.eof()) {
+    //  file_handle.peek()!=EOF 解决多读一行问题
+    while (file_handle.good() && !file_handle.eof() && file_handle.peek()!=EOF) {
         getline(file_handle, line);
         lines.push_back(line);
     }
@@ -26,7 +27,8 @@ vector<string> * read_lines_from_file1(string &file_name) {
     string line;
 
     ifstream file_handle (file_name.c_str());
-    while (file_handle.good() && !file_handle.eof()) {
+    //  file_handle.peek()!=EOF
+    while (file_handle.good() && !file_handle.eof() && file_handle.peek()!=EOF) {
         getline(file_handle, line);
         lines->push_back(line);
     }
@@ -40,7 +42,7 @@ vector<string> * read_lines_from_file1_1(string &file_name) {
     string line;
 
     ifstream file_handle (file_name.c_str());
-    while (file_handle.good() && !file_handle.eof()) {
+    while (file_handle.good() && !file_handle.eof() &&  file_handle.peek()!=EOF) {
         getline(file_handle, line);
         lines->push_back(line);
     }
@@ -63,4 +65,4 @@ int main() {
     int count1 = read_lines_from_file1_1(file_name1)->size();
     cout << "File " << file_name << " contains " << count1 << " lines.";
     return 0;
-}
\ No newline at end of file
+}