Get rid of C getline in code

Author: wengxt

src/lib/fcitx-config/iniparser.cpp

@@ -8,8 +8,10 @@
 #include <fcntl.h>
 #include <cstdio>
 #include <functional>
+#include <istream>
 #include <string>
 #include <string_view>
+#include "fcitx-utils/fdstreambuf.h"
 #include "fcitx-utils/fs.h"
 #include "fcitx-utils/macros.h"
 #include "fcitx-utils/misc.h"
@@ -21,17 +23,11 @@
 
 namespace fcitx {
 
-void readFromIni(RawConfig &config, int fd) {
-    if (fd < 0) {
-        return;
-    }
-    // dup it
-    UnixFD unixFD(fd);
-    UniqueFilePtr fp = fs::openFD(unixFD, "rb");
+void readFromIni(RawConfig &config, FILE *fp) {
     if (!fp) {
         return;
     }
-    readFromIni(config, fp.get());
+    readFromIni(config, fileno(fp));
 }
 
 bool writeAsIni(const RawConfig &config, int fd) {
@@ -47,25 +43,27 @@ bool writeAsIni(const RawConfig &config, int fd) {
     return writeAsIni(config, fp.get());
 }
 
-void readFromIni(RawConfig &config, FILE *fin) {
+void readFromIni(RawConfig &config, int fd) {
     std::string currentGroup;
 
-    UniqueCPtr<char> clineBuf;
-    size_t bufSize = 0;
-    unsigned int line = 0;
-    while (getline(clineBuf, &bufSize, fin) >= 0) {
-        line++;
-        std::string_view lineBuf = stringutils::trimView(clineBuf.get());
+    IFDStreamBuf buf(fd);
+    std::istream in(&buf);
+    std::string line;
+
+    unsigned int lineNumber = 0;
+    while (std::getline(in, line)) {
+        lineNumber++;
+        std::string_view lineBuf = stringutils::trimView(line);
         if (lineBuf.empty() || lineBuf.front() == '#') {
             continue;
         }
 
         if (lineBuf.front() == '[' && lineBuf.back() == ']') {
             currentGroup = lineBuf.substr(1, lineBuf.size() - 2);
             config.visitItemsOnPath(
-                [line](RawConfig &config, const std::string &) {
+                [lineNumber](RawConfig &config, const std::string &) {
                     if (!config.lineNumber()) {
-                        config.setLineNumber(line);
+                        config.setLineNumber(lineNumber);
                     }
                 },
                 currentGroup);
@@ -90,7 +88,7 @@ void readFromIni(RawConfig &config, FILE *fin) {
                 subConfig = config.get(std::string(name), true);
             }
             subConfig->setValue(*value);
-            subConfig->setLineNumber(line);
+            subConfig->setLineNumber(lineNumber);
         }
     }
 }

src/modules/quickphrase/quickphraseprovider.cpp

@@ -7,9 +7,11 @@
 #include "quickphraseprovider.h"
 #include <fcntl.h>
 #include <cstddef>
+#include <istream>
 #include <string>
 #include <string_view>
 #include <utility>
+#include "fcitx-utils/fdstreambuf.h"
 #include "fcitx-utils/fs.h"
 #include "fcitx-utils/macros.h"
 #include "fcitx-utils/misc.h"
@@ -45,7 +47,7 @@ void BuiltInQuickPhraseProvider::reloadConfig() {
     if (auto file = StandardPath::global().open(
             StandardPath::Type::PkgData, "data/QuickPhrase.mb", O_RDONLY);
         file.fd() >= 0) {
-        load(fs::openFD(file, "rb"));
+        load(file.fd());
     }
 
     auto files = StandardPath::global().locate(StandardPath::Type::PkgData,
@@ -59,19 +61,18 @@ void BuiltInQuickPhraseProvider::reloadConfig() {
             continue;
         }
         UnixFD fd = UnixFD::own(open(p.second.c_str(), O_RDONLY));
-        load(fs::openFD(fd, "rb"));
+        if (fd.isValid()) {
+            load(fd.fd());
+        }
     }
 }
 
-void BuiltInQuickPhraseProvider::load(UniqueFilePtr fp) {
-    if (!fp) {
-        return;
-    }
-
-    UniqueCPtr<char> buf;
-    size_t len = 0;
-    while (getline(buf, &len, fp.get()) != -1) {
-        std::string_view text = stringutils::trimView(buf.get());
+void BuiltInQuickPhraseProvider::load(int fd) {
+    IFDStreamBuf buf(fd);
+    std::istream in(&buf);
+    std::string line;
+    while (std::getline(in, line)) {
+        std::string_view text = stringutils::trimView(line);
         if (text.empty()) {
             continue;
         }

src/modules/quickphrase/quickphraseprovider.h

@@ -39,7 +39,7 @@ class BuiltInQuickPhraseProvider : public QuickPhraseProvider {
     void reloadConfig();
 
 private:
-    void load(UniqueFilePtr fp);
+    void load(int fd);
     std::multimap<std::string, std::string> map_;
 };