Forráskód Böngészése

* Update for String::chomp() and Stream::writeFile()

Bryan Drewery 17 éve
szülő
commit
f2b1897097
3 módosított fájl, 3 hozzáadás és 4 törlés
  1. 1 1
      lib/bdlib
  2. 1 1
      src/userrec.c
  3. 1 2
      src/users.c

+ 1 - 1
lib/bdlib

@@ -1 +1 @@
-Subproject commit 4fae68ae9d6003fdb6b7dbfc16fa8427e28692cc
+Subproject commit 438b69f4101675b5cfe0e633def83a69600b673d

+ 1 - 1
src/userrec.c

@@ -538,7 +538,7 @@ int real_writeuserfile(int idx, const struct userrec *bu, FILE *f) {
   const char salt1[] = SALT1;
   EncryptedStream stream(salt1);
   stream_writeuserfile(stream, bu, idx, old);
-  if ((fwrite(bd::String(stream).data(), 1, stream.length(), f) != stream.length()) || (fflush(f)))
+  if (stream.writeFile(fileno(f)))
     return 1;
   return 0;
 }

+ 1 - 2
src/users.c

@@ -625,9 +625,8 @@ int stream_readuserfile(bd::Stream& stream, struct userrec **ret)
   }
   while (stream.tell() < stream.length()) {
     s = buf;
-    str = stream.getline(sizeof(buf));
+    str = stream.getline(sizeof(buf)).chomp();
     strlcpy(s, str.c_str(), std::min(str.length(), sizeof(buf)));
-    remove_crlf(s);
     if (1) {
       line++;
       if (s[0] != '#' && s[0] != ';' && s[0]) {