Merge branch 'master' of github.com:Tookmund/Swapspace

Tookmund · Aug 4, 2016 · 9abce25 · 9abce25
2 parents 385085c + fa480c7
commit 9abce25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = src
 sysconf_DATA = swapspace.conf
 
 install-data-local:
-	$(MKDIR_P) $(localstatedir)/lib/swapspace
+	$(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/swapspace
diff --git a/src/swaps.c b/src/swaps.c
@@ -476,6 +476,8 @@ static memsize_t filesize(const char name[])
   if (unlikely(pos == -1))
     log_perr_str(LOG_WARNING, "Can't determine size of", name, errno);
 
+  close(fd);
+
   return pos;
 }
 
@@ -703,7 +705,10 @@ static bool retire_swapfile(int file)
   unlink(namebuf);
 
 #ifndef NO_CONFIG
-  if (fd != -1) write_data(fd, swapfiles[file].size, true);
+  if (fd != -1) {
+    write_data(fd, swapfiles[file].size, true);
+    close(fd);
+  }
 #endif
 
   swapfiles[file].size = 0;