Shift X2 status from legacy to archived

[khatus.git] / x5 / khatus_sensor_battery.c

diff --git a/x5/khatus_sensor_battery.c b/x5/khatus_sensor_battery.c
index b589bef..9923b34 100644 (file)
--- a/x5/khatus_sensor_battery.c
+++ b/x5/khatus_sensor_battery.c
@@ -1,37 +1,33 @@
+#include <signal.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "khatus_lib_log.h"
-#include "khatus_lib_time.h"
+#include "khlib_log.h"
+#include "khlib_time.h"
 
 #define usage(...) {print_usage(); fprintf(stderr, "Error:\n    " __VA_ARGS__); exit(EXIT_FAILURE);}
 
 #define MAX_LEN 20
-#define END_OF_MESSAGE '\n'
 
 char *argv0;
 
-char path[PATH_MAX];
-
 double  opt_interval = 1.0;
 char   *opt_battery  = "BAT0";
-char   *opt_fifo     = NULL;
 
 void
 print_usage()
 {
        printf(
-           "%s: [OPT ...] FIFO\n"
+           "%s: [OPT ...]\n"
            "\n"
-           "FIFO = string    # path to fifo file\n"
            "OPT = -i int     # interval\n"
            "    | -b string  # battery file name from /sys/class/power_supply/\n"
            "    | -h         # help message (i.e. what you're reading now :) )\n",
@@ -43,9 +39,9 @@ opt_parse(int argc, char **argv)
 {
        char c;
 
-       while ((c = getopt(argc, argv, "f:i:h")) != -1)
+       while ((c = getopt(argc, argv, "b:i:h")) != -1)
                switch (c) {
-               case 'f':
+               case 'b':
                        opt_battery = calloc(strlen(optarg), sizeof(char));
                        strcpy(opt_battery, optarg);
                        break;
@@ -56,7 +52,7 @@ opt_parse(int argc, char **argv)
                        print_usage();
                        exit(EXIT_SUCCESS);
                case '?':
-                       if (optopt == 'f' || optopt == 'i')
+                       if (optopt == 'b' || optopt == 'i')
                                fprintf(stderr,
                                        "Option -%c requires an argument.\n",
                                        optopt);
@@ -72,66 +68,30 @@ opt_parse(int argc, char **argv)
                default:
                        assert(0);
                }
-       opt_fifo = argv[optind];
-       debug("opt_fifo: %s\n", opt_fifo);
-       if (!opt_fifo)
-               usage("No filename was provided\n");
-}
-
-void
-loop(struct timespec *ti, char *fifo, char *buf, int fun(char *))
-{
-       int fd = -1;
-       int w  = -1;  /* written */
-       int r  = -1;  /* remaining */
-       int i  = -1;  /* buffer position */
-
-       for (;;) {
-               debug("openning \"%s\"\n", fifo);
-               fd = open(fifo, O_WRONLY);
-               if (fd < 0)
-                       fatal("Failed to open FIFO file: \"%s\". Error: %s\n",
-                           fifo,
-                           strerror(errno));
-               debug("openned. fd: %d\n", fd);
-               r = fun(buf);
-               buf[r] = END_OF_MESSAGE;
-               for (i = 0; (w = write(fd, buf + i++, 1)) && r; r--)
-                       ;
-               if (w < 0)
-                       fatal("Failed to write to %s. Err num: %d, Err msg: %s\n",
-                           fifo,
-                           errno,
-                           strerror(errno));
-               if (close(fd) < 0)
-                       fatal("Failed to close %s. Err num: %d, Err msg: %s\n",
-                           fifo,
-                           errno,
-                           strerror(errno));
-               fd = -1;
-               debug("closed. fd: %d\n", fd);
-               snooze(ti);
-       }
 }
 
 int
-read_capacity(char *buf)
+get_capacity(char *buf, char *path)
 {
        FILE *fp;
        int cap;
 
        if (!(fp = fopen(path, "r")))
-               fatal("Failed to open %s. errno: %d, msg: %s\n",
-                   path, errno, strerror(errno));
+               khlib_fatal(
+                   "Failed to open %s. errno: %d, msg: %s\n",
+                   path,
+                   errno,
+                   strerror(errno)
+               );
 
        switch (fscanf(fp, "%d", &cap)) {
-       case -1: fatal("EOF\n");
-       case  0: fatal("Read 0\n");
+       case -1: khlib_fatal("EOF\n");
+       case  0: khlib_fatal("Read 0\n");
        case  1: break;
        default: assert(0);
        }
        fclose(fp);
-       return snprintf(buf, 6, "%3d%%\n", cap);
+       return snprintf(buf, 6, "%3d%%", cap);
 }
 
 int
@@ -140,12 +100,24 @@ main(int argc, char **argv)
        argv0 = argv[0];
 
        char  buf[10];
+       char path[PATH_MAX];
        char *path_fmt = "/sys/class/power_supply/%s/capacity";
-       struct timespec ti = timespec_of_float(opt_interval);
+       struct timespec ti;
 
        opt_parse(argc, argv);
-
+       ti = khlib_timespec_of_float(opt_interval);
+       khlib_debug("opt_battery: \"%s\"\n", opt_battery);
+       khlib_debug("opt_interval: %f\n", opt_interval);
+       khlib_debug("ti: {tv_sec = %ld, tv_nsec = %ld}\n",ti.tv_sec,ti.tv_nsec);
        memset(path, '\0', PATH_MAX);
        snprintf(path, PATH_MAX, path_fmt, opt_battery);
-       loop(&ti, opt_fifo, buf, &read_capacity);
+       signal(SIGPIPE, SIG_IGN);
+
+       for (;;) {
+               get_capacity(buf, path);
+               puts(buf);
+               fflush(stdout);
+               khlib_sleep(&ti);
+       }
+       return EXIT_SUCCESS;
 }