fix #3839

swoole · Nov 17, 2020 · a71956d · a71956d
1 parent 661b789
commit a71956d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/include/swoole_file.h b/include/swoole_file.h
@@ -36,6 +36,7 @@ typedef struct stat FileStatus;
 class File {
   private:
     int fd_;
+    int flags_;
     std::string path_;
 
   public:
@@ -50,21 +51,25 @@ class File {
 
     explicit File(int fd) {
         fd_ = fd;
+        flags_ = 0;
     }
 
     File(int fd, const std::string &path) {
         fd_ = fd;
         path_ = path;
+        flags_ = 0;
     }
 
     File(const std::string &path, int oflags) {
         fd_ = ::open(path.c_str(), oflags);
         path_ = path;
+        flags_ = oflags;
     }
 
     File(const std::string &path, int oflags, int mode) {
         fd_ = ::open(path.c_str(), oflags, mode);
         path_ = path;
+        flags_ = oflags;
     }
 
     ~File() {

diff --git a/src/coroutine/system.cc b/src/coroutine/system.cc
@@ -110,7 +110,7 @@ std::shared_ptr<String> System::read_file(const char *file, bool lock) {
 
 ssize_t System::write_file(const char *file, char *buf, size_t length, bool lock, int flags) {
     ssize_t retval = -1;
-    uint16_t file_flags = flags | O_CREAT | O_WRONLY;
+    int file_flags = flags | O_CREAT | O_WRONLY;
     swoole::coroutine::async([&]() {
         File _file(file, file_flags, 0644);
         if (!_file.ready()) {

diff --git a/src/os/file.cc b/src/os/file.cc
@@ -116,7 +116,12 @@ bool file_put_contents(const std::string &filename, const char *content, size_t
 size_t File::write_all(const void *data, size_t len) {
     size_t written_bytes = 0;
     while (written_bytes < len) {
-        ssize_t n = pwrite((char *) data + written_bytes, len - written_bytes, written_bytes);
+        ssize_t n;
+        if (flags_ & APPEND) {
+            n = write((char *) data + written_bytes, len - written_bytes);
+        } else {
+            n = pwrite((char *) data + written_bytes, len - written_bytes, written_bytes);
+        }
         if (n > 0) {
             written_bytes += n;
         } else if (n == 0) {