Detect batteries using glob (#163)

diff --git a/i3status.c b/i3status.c
index 5e177450ae7f6be5f5cf5a59eea96e0dbf588c9f..239729ebb114adab18ee2fd67184275a6850792e 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -104,7 +104,7 @@ static void *scalloc(size_t size) {
     return result;
 }
 
-static char *sstrdup(const char *str) {
+char *sstrdup(const char *str) {
     char *result = strdup(str);
     exit_if_null(result, "Error: out of memory (strdup())\n");
     return result;

diff --git a/include/i3status.h b/include/i3status.h
index dd0ba02f327e0cd0d39e68b6a78089e807c23dc3..d168f7454fa79cd25533c245bf2f0ec47d9b34ec 100644 (file)
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -176,6 +176,8 @@ struct min_width {
     const char *str;
 };
 
+char *sstrdup(const char *str);
+
 /* src/general.c */
 char *skip_character(char *input, char character, int amount);
 void die(const char *fmt, ...);

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 52d503149d4e2b6081d83517e62cd88daf190741..387fb44f2a3c35c0e9be059e2bc005f57f960568 100644 (file)
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -11,7 +11,7 @@
 
 #if defined(LINUX)
 #include <errno.h>
-#include <sys/stat.h>
+#include <glob.h>
 #include <sys/types.h>
 #endif
 
@@ -414,40 +414,39 @@ static bool slurp_all_batteries(struct battery_info *batt_info, yajl_gen json_ge
     char *outwalk = buffer;
     bool is_found = false;
 
-    /* 1,000 batteries should be enough for anyone */
-    for (int i = 0; i < 1000; i++) {
-        char batpath[1024];
-        (void)snprintf(batpath, sizeof(batpath), path, i);
-
-        if (!strcmp(batpath, path)) {
-            OUTPUT_FULL_TEXT("no '%d' in battery path");
-            return false;
-        }
+    char *placeholder;
+    char *globpath = sstrdup(path);
+    if ((placeholder = strstr(path, "%d")) != NULL) {
+        char *globplaceholder = globpath + (placeholder - path);
+        *globplaceholder = '*';
+        strcpy(globplaceholder + 1, placeholder + 2);
+    }
 
-        /* Probe to see if there is such a battery. */
-        struct stat sb;
-        if (stat(batpath, &sb) != 0) {
-            /* No such file, then we are done, assuming sysfs files have sequential numbers. */
-            if (errno == ENOENT)
-                break;
+    if (!strcmp(globpath, path)) {
+        OUTPUT_FULL_TEXT("no '%d' in battery path");
+        return false;
+    }
 
-            OUTPUT_FULL_TEXT(format_down);
-            return false;
+    glob_t globbuf;
+    if (glob(globpath, 0, NULL, &globbuf) == 0) {
+        for (size_t i = 0; i < globbuf.gl_pathc; i++) {
+            /* Probe to see if there is such a battery. */
+            struct battery_info batt_buf = {
+                .full_design = 0,
+                .full_last = 0,
+                .remaining = 0,
+                .present_rate = 0,
+                .status = CS_UNKNOWN,
+            };
+            if (!slurp_battery_info(&batt_buf, json_gen, buffer, i, globbuf.gl_pathv[i], format_down))
+                return false;
+
+            is_found = true;
+            add_battery_info(batt_info, &batt_buf);
         }
-
-        struct battery_info batt_buf = {
-            .full_design = 0,
-            .full_last = 0,
-            .remaining = 0,
-            .present_rate = 0,
-            .status = CS_UNKNOWN,
-        };
-        if (!slurp_battery_info(&batt_buf, json_gen, buffer, i, path, format_down))
-            return false;
-
-        is_found = true;
-        add_battery_info(batt_info, &batt_buf);
     }
+    globfree(&globbuf);
+    free(globpath);
 
     if (!is_found) {
         OUTPUT_FULL_TEXT(format_down);