[tor-commits] [tor/master] Remove pre-unlink check tor_remove_file; check errno instead.

[nickm at torproject.org]

commit 4b7b305bf0513a9b010ab0fc75060dce8d29206a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 10:42:02 2017 -0500

    Remove pre-unlink check tor_remove_file; check errno instead.
    
    This removes a time-of-check/time-of-use issue, though in this case
    it would probably be harmless.
---
 src/or/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index e66167fe4..f4050d3a5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3401,11 +3401,9 @@ tor_free_all(int postfork)
 void
 tor_remove_file(const char *filename)
 {
-  if (file_status(filename) == FN_FILE) {
-    if (tor_unlink(filename) != 0) {
-      log_warn(LD_FS, "Couldn't unlink %s: %s",
+  if (tor_unlink(filename) != 0 && errno != ENOENT) {
+    log_warn(LD_FS, "Couldn't unlink %s: %s",
                filename, strerror(errno));
-    }
   }
 }