Reindent and restyle

[sysstatus.git] / statuses / tools.c

diff --git a/statuses/tools.c b/statuses/tools.c
index 1e0385d34a94705b15904444796a7eae80d86cb0..abb8a0db943f1693bf01492ff5bc5d1a3f0b2b71 100644 (file)
--- a/statuses/tools.c
+++ b/statuses/tools.c
@@ -1,24 +1,60 @@
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "tools.h"
 
-char powertochar(int power)
+char powerToChar(int power)
 {
-       switch(power)
-       {
-               case 0:
-                       return 'b';
-               case 1:
-                       return 'k';
-               case 2:
-                       return 'M';
-               case 3:
-                       return 'G';
-               case 4:
-                       return 'T';
-               case 5:
-                       return 'P';
-               case 6:
-                       return 'E';
-       }
-       
-       return '?';
+  switch(power)
+  {
+    case 0:
+      return 'b';
+    case 1:
+      return 'k';
+    case 2:
+      return 'M';
+    case 3:
+      return 'G';
+    case 4:
+      return 'T';
+    case 5:
+      return 'P';
+    case 6:
+      return 'E';
+  }
+
+  return '?';
+}
+
+
+void statusError(char *where, char *what, char *extra)
+{
+  fprintf(stderr, "%s: %s", where, what);
+  if (extra) {
+    fprintf(stderr, " -- %s", extra);
+  }
+  fputs("\n", stderr);
+}
+
+
+ssize_t fileRead(char *buf, size_t bufsize, char *file)
+{
+  int fd;
+  int readbytes;
+
+  fd = open(file, 0);
+  if (fd < 0) {
+    return -1;
+  }
+
+  readbytes = read(fd, buf, bufsize - 1);
+  close(fd);
+
+  if (readbytes > 0) {
+    buf[readbytes] = '\0';
+  } else {
+    buf[0] = '\0';
+  }
+
+  return readbytes;
 }