removing Yoda-Style

[i3/i3status] / src / general.c

diff --git a/src/general.c b/src/general.c
index a093c160d73eb874645f5a1702eda143f6859cea..c5b33b46f652142dbfad53fdd7a73463c217fd37 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/fcntl.h>
+#include <sys/stat.h>
 
 #include "i3status.h"
 
@@ -13,13 +14,16 @@
  * Reads size bytes into the destination buffer from filename.
  *
  */
-bool slurp(char *filename, char *destination, int size) {
+bool slurp(const char *filename, char *destination, int size) {
         int fd;
 
         if ((fd = open(filename, O_RDONLY)) == -1)
                 return false;
 
-        (void)read(fd, destination, size);
+        /* We need one byte for the trailing 0 byte */
+        int n = read(fd, destination, size-1);
+        if (n != -1)
+                destination[n] = '\0';
         (void)close(fd);
 
         return true;