From 2fc29dbd3da312f6c3de2e75e8f7363235b0795d Mon Sep 17 00:00:00 2001 From: drkhsh Date: Wed, 23 Nov 2022 23:59:51 +0100 Subject: New component: cat Generically reads an arbitrary file natively. Saves a few layers of execution in comparison to using `run_command` with an argument like `cat ./file`. --- Makefile | 1 + README | 1 + components/cat.c | 32 ++++++++++++++++++++++++++++++++ config.def.h | 1 + slstatus.h | 3 +++ 5 files changed, 38 insertions(+) create mode 100644 components/cat.c diff --git a/Makefile b/Makefile index 3be46cc..7834257 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ include config.mk REQ = util COM =\ components/battery\ + components/cat\ components/cpu\ components/datetime\ components/disk\ diff --git a/README b/README index 4da0756..b3fa7ae 100644 --- a/README +++ b/README @@ -7,6 +7,7 @@ slstatus is a suckless status monitor for window managers that use WM_NAME Features -------- - Battery percentage/state/time left +- Cat (read file) - CPU usage - CPU frequency - Custom shell commands diff --git a/components/cat.c b/components/cat.c new file mode 100644 index 0000000..07944cc --- /dev/null +++ b/components/cat.c @@ -0,0 +1,32 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include + +#include "../slstatus.h" +#include "../util.h" + +const char * +cat(const char *path) +{ + char *f; + FILE *fp; + + if (!(fp = fopen(path, "r"))) { + warn("fopen '%s':", path); + return NULL; + } + + f = fgets(buf, sizeof(buf) - 1, fp); + if (fclose(fp) < 0) { + warn("fclose '%s':", path); + return NULL; + } + if (!f) + return NULL; + + if ((f = strrchr(buf, '\n'))) + f[0] = '\0'; + + return buf[0] ? buf : NULL; +} + diff --git a/config.def.h b/config.def.h index 5f6c114..90b57a1 100644 --- a/config.def.h +++ b/config.def.h @@ -18,6 +18,7 @@ static const char unknown_str[] = "n/a"; * NULL on OpenBSD/FreeBSD * battery_remaining battery remaining HH:MM battery name (BAT0) * NULL on OpenBSD/FreeBSD + * cat read arbitrary file path * cpu_perc cpu usage in percent NULL * cpu_freq cpu frequency in MHz NULL * datetime date and time format string (%F %T) diff --git a/slstatus.h b/slstatus.h index f3b4979..f062e73 100644 --- a/slstatus.h +++ b/slstatus.h @@ -5,6 +5,9 @@ const char *battery_perc(const char *); const char *battery_state(const char *); const char *battery_remaining(const char *); +/* cat */ +const char *cat(const char *path); + /* cpu */ const char *cpu_freq(const char *unused); const char *cpu_perc(const char *unused); -- cgit v1.2.3