Fix fd leakage. Fix check of value returned by 'open'

FreeSlave · Mar 28, 2017 · ae20dbf · ae20dbf
1 parent b03a270
commit ae20dbf
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/source/trashcan.d b/source/trashcan.d
@@ -335,9 +335,10 @@ private:
             string timeString = currentTime.toISOExtString();
             string contents = format("[Trash Info]\nPath=%s\nDeletionDate=%s\n", path.escapeValue(), timeString);
 
-            auto mode = O_CREAT | O_WRONLY | O_EXCL;
-            auto fd = open(toStringz(trashInfoPath), mode, octal!666);
-            errnoEnforce(fd != 0);
+            const mode = O_CREAT | O_WRONLY | O_EXCL;
+            auto fd = .open(toStringz(trashInfoPath), mode, octal!666);
+            errnoEnforce(fd != -1);
+            scope(exit) .close(fd);
             errnoEnforce(write(fd, contents.ptr, contents.length) == contents.length);
 
             path.rename(trashFilePath);