diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | i3status.c | 674 | ||||
| -rw-r--r-- | i3status.h | 64 | ||||
| -rw-r--r-- | src/config.c | 145 | ||||
| -rw-r--r-- | src/general.c | 70 | ||||
| -rw-r--r-- | src/get_battery_info.c | 88 | ||||
| -rw-r--r-- | src/get_cpu_temperature.c | 25 | ||||
| -rw-r--r-- | src/get_eth_info.c | 49 | ||||
| -rw-r--r-- | src/get_ip_addr.c | 43 | ||||
| -rw-r--r-- | src/get_ipv6_addr.c | 61 | ||||
| -rw-r--r-- | src/get_load.c | 25 | ||||
| -rw-r--r-- | src/get_wireless_info.c | 44 | ||||
| -rw-r--r-- | src/output.c | 157 | ||||
| -rw-r--r-- | src/process_runs.c | 55 | 
14 files changed, 850 insertions, 660 deletions
| @@ -3,6 +3,7 @@ CFLAGS+=-g  CFLAGS+=-std=gnu99  CFLAGS+=-pedantic  CFLAGS+=-DPREFIX=\"\" +CFLAGS+=-I.  VERSION=$(shell git describe --tags --abbrev=0) @@ -12,16 +13,19 @@ CFLAGS+=-D_GNU_SOURCE  endif  # Define this if you want i3status to spit out dzen2-compatible output on stdout -#CFLAGS+=-DDZEN +CFLAGS+=-DDZEN  CFLAGS+=$(EXTRA_CFLAGS) +src/%.o: src/%.c src/%.h +	$(CC) $(CFLAGS) -c -o $@ $< +  %.o: %.c %.h  	$(CC) $(CFLAGS) -c -o $@ $< -i3status: i3status.o +i3status: src/general.o src/config.o src/get_load.o src/output.o src/get_cpu_temperature.o src/process_runs.o src/get_eth_info.o src/get_ip_addr.o src/get_wireless_info.o src/get_battery_info.o src/get_ipv6_addr.o i3status.o  clean: -	rm -f *.o +	rm -f *.o src/*.o  distclean: clean  	rm -f i3status @@ -46,653 +46,34 @@  #include <stdlib.h>  #include <limits.h>  #include <ctype.h> -#include <net/if.h>  #include <sys/ioctl.h>  #include <sys/socket.h>  #include <netinet/in.h> -#include <arpa/inet.h> -#include <glob.h> -#include <dirent.h>  #include <getopt.h>  #include <signal.h>  #include "queue.h" -#ifdef LINUX -#include <linux/ethtool.h> -#include <linux/sockios.h> -#else -/* TODO: correctly check for *BSD */ -#include <sys/param.h> -#include <sys/sysctl.h> -#include <sys/resource.h> -#endif -  #include "i3status.h" -#define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)" - -struct battery { -        char *path; -        /* Use last full capacity instead of design capacity */ -        bool use_last_full; -        SIMPLEQ_ENTRY(battery) batteries; -}; - -SIMPLEQ_HEAD(battery_head, battery) batteries; +struct battery_head batteries;  /* socket file descriptor for general purposes */ -static int general_socket; - -static const char *wlan_interface; -static const char *eth_interface; -static char *wmii_path; -static const char *time_format; -static bool use_colors; -static bool get_ethspeed; -static bool get_cpu_temperature; -static char *thermal_zone; -static const char *wmii_normcolors = "#222222 #333333"; -static char order[MAX_ORDER][2]; -static const char **run_watches; -static unsigned int num_run_watches; -static unsigned int interval = 1; - -static int max(int a, int b) { -        return (a > b ? a : b); -} - -/* - * This function just concats two strings in place, it should only be used - * for concatting order to the name of a file or concatting color codes. - * Otherwise, the buffer size would have to be increased. - * - */ -static char *concat(const char *str1, const char *str2) { -        static char concatbuf[32]; -        (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); -        return concatbuf; -} - -/* - * Returns the correct color format for dzen (^fg(color)) or wmii (color <normcolors>) - * - */ -static char *color(const char *colorstr) { -        static char colorbuf[32]; -#ifdef DZEN -        (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr); -#else -        (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors); -#endif -        return colorbuf; -} - -/* - * Cleans wmii's /rbar directory by deleting all regular files - * - */ -static void cleanup_rbar_dir() { -#ifdef DZEN -        return; -#endif -        struct dirent *ent; -        DIR *dir; -        char pathbuf[strlen(wmii_path)+256+1]; - -        if ((dir = opendir(wmii_path)) == NULL) -                exit(EXIT_FAILURE); - -        while ((ent = readdir(dir)) != NULL) { -                if (ent->d_type == DT_REG) { -                        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, ent->d_name); -                        if (unlink(pathbuf) == -1) -                                exit(EXIT_FAILURE); -                } -        } - -        (void)closedir(dir); -} - -/* - * Creates the specified file in wmii's /rbar directory with - * correct modes and initializes colors if colormode is enabled - * - */ -static void create_file(const char *name) { -#ifdef DZEN -        return; -#endif -        char pathbuf[strlen(wmii_path)+256+1]; -        int fd; -        int flags = O_CREAT | O_WRONLY; -        struct stat statbuf; - -        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); - -        /* Overwrite file's contents if it exists */ -        if (stat(pathbuf, &statbuf) >= 0) -                flags |= O_TRUNC; - -        if ((fd = open(pathbuf, flags, S_IRUSR | S_IWUSR)) < 0) -                exit(EXIT_FAILURE); -        if (use_colors) { -                char *tmp = color("#888888"); -                if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp)) -                        exit(EXIT_FAILURE); -        } -        (void)close(fd); -} - -/* - * Waits until wmii_path/rbar exists (= the filesystem gets mounted), - * cleans up all files and creates the needed files - * - */ -static void setup(void) { -        unsigned int i; -        char pathbuf[512]; - -#ifndef DZEN -        struct stat statbuf; -        /* Wait until wmii_path/rbar exists */ -        for (; stat(wmii_path, &statbuf) < 0; sleep(interval)); -#endif - -        cleanup_rbar_dir(); -        if (wlan_interface) -                create_file(concat(order[ORDER_WLAN],"wlan")); -        if (eth_interface) -                create_file(concat(order[ORDER_ETH],"eth")); -        if (get_cpu_temperature) -                create_file(concat(order[ORDER_CPU_TEMPERATURE], "cpu_temperature")); -        create_file(concat(order[ORDER_LOAD],"load")); -        if (time_format) -                create_file(concat(order[ORDER_TIME],"time")); -        for (i = 0; i < num_run_watches; i += 2) { -                snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); -                create_file(pathbuf); -        } -} - -/* - * Writes the given message in the corresponding file in wmii's /rbar directory - * - */ -static void write_to_statusbar(const char *name, const char *message, bool final_entry) { -#ifdef DZEN -        if (final_entry) { -                if (printf("%s^p(6)\n", message) < 0) { -                        perror("printf"); -                        exit(1); -                } - -                fflush(stdout); -                return; -        } -        if (printf("%s" BAR, message) < 0) { -                perror("printf"); -                exit(1); -        } -        return; -#endif - -        char pathbuf[strlen(wmii_path)+256+1]; -        int fd; - -        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); -        if ((fd = open(pathbuf, O_RDWR)) == -1) { -                /* Try to re-setup stuff and just continue */ -                setup(); -                return; -        } -        if (write(fd, message, strlen(message)) != (ssize_t)strlen(message)) -                exit(EXIT_FAILURE); -        (void)close(fd); -} - -/* - * Writes an errormessage to statusbar - * - */ -static void write_error_to_statusbar(const char *message) { -        cleanup_rbar_dir(); -        create_file("error"); -        write_to_statusbar("error", message, true); -} - -/* - * Write errormessage to statusbar and exit - * - */ -void die(const char *fmt, ...) { -        char buffer[512]; -        va_list ap; -        va_start(ap, fmt); -        (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); -        va_end(ap); - -        if (wmii_path != NULL) -                write_error_to_statusbar(buffer); -        else -                fprintf(stderr, "%s", buffer); -        exit(EXIT_FAILURE); -} - -/* - * Skip the given character for exactly 'amount' times, returns - * a pointer to the first non-'character' character in 'input'. - * - */ -static char *skip_character(char *input, char character, int amount) { -        char *walk; -        size_t len = strlen(input); -        int blanks = 0; - -        for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) -                if (*walk == character) -                        blanks++; - -        return (walk == input ? walk : walk-1); -} - -/* - * Get battery information from /sys. Note that it uses the design capacity to - * calculate the percentage, not the last full capacity, so you can see how - * worn off your battery is. - * - */ -static char *get_battery_info(struct battery *bat) { -        char buf[1024]; -        static char part[512]; -        char *walk, *last; -        int fd; -        int full_design = -1, -            remaining = -1, -            present_rate = -1; -        charging_status_t status = CS_DISCHARGING; - -        if ((fd = open(bat->path, O_RDONLY)) == -1) -                return "No battery found"; - -        memset(part, 0, sizeof(part)); -        (void)read(fd, buf, sizeof(buf)); -        for (walk = buf, last = buf; (walk-buf) < 1024; walk++) { -                if (*walk == '\n') { -                        last = walk+1; -                        continue; -                } - -                if (*walk != '=') -                        continue; - -                if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") || -                    BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) -                        remaining = atoi(walk+1); -                else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW")) -                        present_rate = atoi(walk+1); -                else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging")) -                        status = CS_CHARGING; -                else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full")) -                        status = CS_FULL; -                else { -                        /* The only thing left is the full capacity */ -                        if (bat->use_last_full) { -                                if (!BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") && -                                    !BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL")) -                                        continue; -                        } else { -                                if (!BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") && -                                    !BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN")) -                                        continue; -                        } - -                        full_design = atoi(walk+1); -                } -        } -        (void)close(fd); - -        if ((full_design == 1) || (remaining == -1)) -                return part; - -        if (present_rate > 0) { -                float remaining_time; -                int seconds, hours, minutes; -                if (status == CS_CHARGING) -                        remaining_time = ((float)full_design - (float)remaining) / (float)present_rate; -                else if (status == CS_DISCHARGING) -                        remaining_time = ((float)remaining / (float)present_rate); -                else remaining_time = 0; - -                seconds = (int)(remaining_time * 3600.0); -                hours = seconds / 3600; -                seconds -= (hours * 3600); -                minutes = seconds / 60; -                seconds -= (minutes * 60); - -                (void)snprintf(part, sizeof(part), "%s %.02f%% %02d:%02d:%02d", -                        (status == CS_CHARGING ? "CHR" : -                         (status == CS_DISCHARGING ? "BAT" : "FULL")), -                        (((float)remaining / (float)full_design) * 100), -                        max(hours, 0), max(minutes, 0), max(seconds, 0)); -        } else { -                (void)snprintf(part, sizeof(part), "%s %.02f%%", -                        (status == CS_CHARGING ? "CHR" : -                         (status == CS_DISCHARGING ? "BAT" : "FULL")), -                        (((float)remaining / (float)full_design) * 100)); -        } -        return part; -} - -/* - * Return the IP address for the given interface or "no IP" if the - * interface is up and running but hasn't got an IP address yet - * - */ -static const char *get_ip_address(const char *interface) { -        static char part[512]; -        struct ifreq ifr; -        struct sockaddr_in addr; -        socklen_t len = sizeof(struct sockaddr_in); -        memset(part, 0, sizeof(part)); - -        /* First check if the interface is running */ -        (void)strcpy(ifr.ifr_name, interface); -        if (ioctl(general_socket, SIOCGIFFLAGS, &ifr) < 0 || -            !(ifr.ifr_flags & IFF_RUNNING)) -                return NULL; - -        /* Interface is up, get the IP address */ -        (void)strcpy(ifr.ifr_name, interface); -        ifr.ifr_addr.sa_family = AF_INET; -        if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0) -                return "no IP"; - -        memcpy(&addr, &ifr.ifr_addr, len); -        (void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, len); -        if (strlen(part) == 0) -                (void)snprintf(part, sizeof(part), "no IP"); - -        return part; -} - -/* - * Just parses /proc/net/wireless looking for lines beginning with - * wlan_interface, extracting the quality of the link and adding the - * current IP address of wlan_interface. - * - */ -static char *get_wireless_info() { -        char buf[1024]; -        static char part[512]; -        char *interfaces; -        int fd; -        memset(buf, 0, sizeof(buf)); -        memset(part, 0, sizeof(part)); - -        if ((fd = open("/proc/net/wireless", O_RDONLY)) == -1) -                die("Could not open /proc/net/wireless\n"); -        (void)read(fd, buf, sizeof(buf)); -        (void)close(fd); - -        interfaces = skip_character(buf, '\n', 1) + 1; -        while ((interfaces = skip_character(interfaces, '\n', 1)+1) < buf+strlen(buf)) { -                while (isspace((int)*interfaces)) -                        interfaces++; -                if (!BEGINS_WITH(interfaces, wlan_interface)) -                        continue; -                int quality; -                if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1) -                        continue; -                if ((quality == UCHAR_MAX) || (quality == 0)) { -                        if (use_colors) -                                (void)snprintf(part, sizeof(part), "%sW: down", color("#FF0000")); -                        else (void)snprintf(part, sizeof(part), "W: down"); -                } else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s", -                                color("#00FF00"), quality, get_ip_address(wlan_interface)); -                return part; -        } - -        return part; -} - -/* - * Combines ethernet IP addresses and speed (if requested) for displaying - * - */ -static char *get_eth_info() { -        static char part[512]; -        const char *ip_address = get_ip_address(eth_interface); -        int ethspeed = 0; - -        if (get_ethspeed) { -#ifdef LINUX -                /* This code path requires root privileges */ -                struct ifreq ifr; -                struct ethtool_cmd ecmd; - -                ecmd.cmd = ETHTOOL_GSET; -                (void)memset(&ifr, 0, sizeof(ifr)); -                ifr.ifr_data = (caddr_t)&ecmd; -                (void)strcpy(ifr.ifr_name, eth_interface); -                if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) -                        ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed); -                else get_ethspeed = false; -#endif -        } - -        if (ip_address == NULL) -                (void)snprintf(part, sizeof(part), "E: down"); -        else { -                if (get_ethspeed) -                        (void)snprintf(part, sizeof(part), "E: %s (%d Mbit/s)", ip_address, ethspeed); -                else (void)snprintf(part, sizeof(part), "E: %s", ip_address); -        } - -        return part; -} - -/* - * Reads the CPU temperature from /sys/class/thermal/thermal_zone0/temp and - * returns the temperature in degree celcius. - * - */ -static char *get_cpu_temperature_info() { -        static char part[16]; -        char buf[16]; -        int temp; -        int fd; - -        memset(buf, 0, sizeof(buf)); -        memset(part, 0, sizeof(part)); - -        if ((fd = open(thermal_zone, O_RDONLY)) == -1) -                die("Could not open %s\n", thermal_zone); -        (void)read(fd, buf, sizeof(buf)); -        (void)close(fd); - -        if (sscanf(buf, "%d", &temp) != 1) -                (void)snprintf(part, sizeof(part), "T: ? C"); -        else -                (void)snprintf(part, sizeof(part), "T: %d C", (temp/1000)); - -        return part; -} - -/* - * Checks if the PID in path is still valid by checking: - *  (Linux) if /proc/<pid> exists - *  (NetBSD) if sysctl returns process infos for this pid - * - */ -static bool process_runs(const char *path) { -        char pidbuf[16]; -        static glob_t globbuf; -        int fd; -        memset(pidbuf, 0, sizeof(pidbuf)); - -        if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) -                die("glob() failed\n"); -        fd = open((globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path), O_RDONLY); -        globfree(&globbuf); -        if (fd < 0) -                return false; -        (void)read(fd, pidbuf, sizeof(pidbuf)); -        (void)close(fd); - -#ifdef LINUX -        struct stat statbuf; -        char procbuf[512]; -        (void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10)); -        return (stat(procbuf, &statbuf) >= 0); -#else -        /* TODO: correctly check for NetBSD. Evaluate if this runs on OpenBSD/FreeBSD */ -        struct kinfo_proc info; -        size_t length = sizeof(struct kinfo_proc); -        int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, strtol(pidbuf, NULL, 10) }; -        if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) -                return false; -        return (length != 0); -#endif -} - -/* - * Reads the configuration from the given file - * - */ -static int load_configuration(const char *configfile) { -        #define OPT(x) else if (strcasecmp(dest_name, x) == 0) - -        /* check if the file exists */ -        struct stat buf; -        if (stat(configfile, &buf) < 0) -                return -1; - -        int result = 0; -        FILE *handle = fopen(configfile, "r"); -        if (handle == NULL) -                die("Could not open configfile\n"); -        char dest_name[512], dest_value[512], whole_buffer[1026]; - -        while (!feof(handle)) { -                char *ret; -                if ((ret = fgets(whole_buffer, 1024, handle)) == whole_buffer) { -                        /* sscanf implicitly strips whitespace */ -                        if (sscanf(whole_buffer, "%s %[^\n]", dest_name, dest_value) < 1) -                                continue; -                } else if (ret != NULL) -                        die("Could not read line in configuration file\n"); - -                /* skip comments and empty lines */ -                if (dest_name[0] == '#' || strlen(dest_name) < 3) -                        continue; - -                OPT("wlan") -                        wlan_interface = strdup(dest_value); -                OPT("eth") -                        eth_interface = strdup(dest_value); -                OPT("time_format") -                        time_format = strdup(dest_value); -                OPT("battery") { -                        struct battery *new = calloc(1, sizeof(struct battery)); -                        if (new == NULL) -                                die("Could not allocate memory\n"); -                        if (asprintf(&(new->path), "/sys/class/power_supply/BAT%d/uevent", atoi(dest_value)) == -1) -                                die("Could not build battery path\n"); - -                        /* check if flags were specified for this battery */ -                        if (strstr(dest_value, ",") != NULL) { -                                char *flags = strstr(dest_value, ","); -                                flags++; -                                if (*flags == 'f') -                                        new->use_last_full = true; -                        } -                        SIMPLEQ_INSERT_TAIL(&batteries, new, batteries); -                } OPT("color") -                        use_colors = true; -                OPT("get_ethspeed") -                        get_ethspeed = true; -                OPT("get_cpu_temperature") { -                        get_cpu_temperature = true; -                        if (strlen(dest_value) > 0) { -                                if (asprintf(&thermal_zone, "/sys/class/thermal/thermal_zone%d/temp", atoi(dest_value)) == -1) -                                        die("Could not build thermal_zone path\n"); -                        } else { -                                 if (asprintf(&thermal_zone, "/sys/class/thermal/thermal_zone0/temp") == -1) -                                        die("Could not build thermal_zone path\n"); -                        } -                } OPT("normcolors") -                        wmii_normcolors = strdup(dest_value); -                OPT("interval") -                        interval = atoi(dest_value); -                OPT("wmii_path") -                { -#ifndef DZEN -                        static glob_t globbuf; -                        struct stat stbuf; -                        if (glob(dest_value, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) -                                die("glob() failed\n"); -                        wmii_path = strdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : dest_value); -                        globfree(&globbuf); - -                        if ((stat(wmii_path, &stbuf)) == -1) { -                                fprintf(stderr, "Warning: wmii_path contains an invalid path\n"); -                                free(wmii_path); -                                wmii_path = strdup(dest_value); -                        } -                        if (wmii_path[strlen(wmii_path)-1] != '/') -                                die("wmii_path is not terminated by /\n"); -#endif -                } -                OPT("run_watch") -                { -                        char *name = strdup(dest_value); -                        char *path = name; -                        while (*path != ' ') -                                path++; -                        *(path++) = '\0'; -                        num_run_watches += 2; -                        run_watches = realloc(run_watches, sizeof(char*) * num_run_watches); -                        run_watches[num_run_watches-2] = name; -                        run_watches[num_run_watches-1] = path; -                } -                OPT("order") -                { -                        #define SET_ORDER(opt, idx) { if (strcasecmp(token, opt) == 0) sprintf(order[idx], "%d", c++); } -                        char *walk, *token; -                        int c = 0; -                        walk = token = dest_value; -                        while (*walk != '\0') { -                                while ((*walk != ',') && (*walk != '\0')) -                                        walk++; -                                *(walk++) = '\0'; -                                SET_ORDER("run", ORDER_RUN); -                                SET_ORDER("wlan", ORDER_WLAN); -                                SET_ORDER("eth", ORDER_ETH); -                                SET_ORDER("battery", ORDER_BATTERY); -                                SET_ORDER("cpu_temperature", ORDER_CPU_TEMPERATURE); -                                SET_ORDER("load", ORDER_LOAD); -                                SET_ORDER("time", ORDER_TIME); -                                token = walk; -                                while (isspace((int)(*token))) -                                        token++; -                        } -                } -                else -                { -                        result = -2; -                        die("Unknown configfile option: %s\n", dest_name); -                } -        } -        fclose(handle); - -#ifndef DZEN -        if (wmii_path == NULL) -                exit(EXIT_FAILURE); -#endif - -        return result; -} +int general_socket; + +const char *wlan_interface; +const char *eth_interface; +const char *wmii_path; +const char *time_format; +bool use_colors; +bool get_ethspeed; +bool get_cpu_temperature; +char *thermal_zone; +const char *wmii_normcolors = "#222222 #333333"; +char order[MAX_ORDER][2]; +const char **run_watches; +unsigned int num_run_watches; +unsigned int interval = 1;  /*   * Exit upon SIGPIPE because when we have nowhere to write to, gathering @@ -765,28 +146,7 @@ int main(int argc, char *argv[]) {                  if (get_cpu_temperature)                          write_to_statusbar(concat(order[ORDER_CPU_TEMPERATURE], "cpu_temperature"), get_cpu_temperature_info(), false); -                /* Get load */ -#ifdef LINUX -                int load_avg; -                if ((load_avg = open("/proc/loadavg", O_RDONLY)) == -1) -                        die("Could not open /proc/loadavg\n"); -                (void)read(load_avg, part, sizeof(part)); -                (void)close(load_avg); -                *skip_character(part, ' ', 3) = '\0'; -#else -                /* TODO: correctly check for NetBSD, check if it works the same on *BSD */ -                struct loadavg load; -                size_t length = sizeof(struct loadavg); -                int mib[2] = { CTL_VM, VM_LOADAVG }; -                if (sysctl(mib, 2, &load, &length, NULL, 0) < 0) -                        die("Could not sysctl({ CTL_VM, VM_LOADAVG })\n"); -                double scale = load.fscale; -                (void)snprintf(part, sizeof(part), "%.02f %.02f %.02f", -                                (double)load.ldavg[0] / scale, -                                (double)load.ldavg[1] / scale, -                                (double)load.ldavg[2] / scale); -#endif -                write_to_statusbar(concat(order[ORDER_LOAD], "load"), part, !time_format); +                write_to_statusbar(concat(order[ORDER_LOAD], "load"), get_load(), !time_format);                  if (time_format) {                          /* Get date & time */ @@ -1,4 +1,68 @@ +#ifndef _I3STATUS_H +#define _I3STATUS_H + +#include <stdbool.h> + +#include "queue.h" + +#define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)"  #define BEGINS_WITH(haystack, needle) (strncmp(haystack, needle, strlen(needle)) == 0) +#define max(a, b) (a > b ? a : b)  typedef enum { CS_DISCHARGING, CS_CHARGING, CS_FULL } charging_status_t;  enum { ORDER_RUN, ORDER_WLAN, ORDER_ETH, ORDER_BATTERY, ORDER_CPU_TEMPERATURE, ORDER_LOAD, ORDER_TIME, MAX_ORDER }; + +struct battery { +        char *path; +        /* Use last full capacity instead of design capacity */ +        bool use_last_full; +        SIMPLEQ_ENTRY(battery) batteries; +}; + +/* src/general.c */ +char *skip_character(char *input, char character, int amount); +void die(const char *fmt, ...); +char *concat(const char *str1, const char *str2); +void create_file(const char *name); +void setup(void); +void write_to_statusbar(const char *name, const char *message, bool final_entry); +void slurp(char *filename, char *destination, int size); + +/* src/output.c */ +void write_error_to_statusbar(const char *message); +char *color(const char *colorstr); +void cleanup_rbar_dir(); + +/* src/config.c */ +int load_configuration(const char *configfile); + +const char *get_ipv6_addr(); +const char *get_battery_info(struct battery *bat); +const char *get_ip_addr(); +const char *get_wireless_info(); +const char *get_cpu_temperature_info(); +const char *get_eth_info(); +const char *get_load(); +bool process_runs(const char *path); + +SIMPLEQ_HEAD(battery_head, battery); +extern struct battery_head batteries; + +/* socket file descriptor for general purposes */ +extern int general_socket; + +extern const char *wlan_interface; +extern const char *eth_interface; +extern const char *wmii_path; +extern const char *time_format; +extern bool use_colors; +extern bool get_ethspeed; +extern bool get_cpu_temperature; +extern char *thermal_zone; +extern const char *wmii_normcolors; +extern char order[MAX_ORDER][2]; +extern const char **run_watches; +extern unsigned int num_run_watches; +extern unsigned int interval; + +#endif diff --git a/src/config.c b/src/config.c new file mode 100644 index 0000000..5904512 --- /dev/null +++ b/src/config.c @@ -0,0 +1,145 @@ +#include <sys/stat.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> + +#include "i3status.h" + +/* + * Reads the configuration from the given file + * + */ +int load_configuration(const char *configfile) { +        #define OPT(x) else if (strcasecmp(dest_name, x) == 0) + +        /* check if the file exists */ +        struct stat buf; +        if (stat(configfile, &buf) < 0) +                return -1; + +        int result = 0; +        FILE *handle = fopen(configfile, "r"); +        if (handle == NULL) +                die("Could not open configfile\n"); +        char dest_name[512], dest_value[512], whole_buffer[1026]; + +        while (!feof(handle)) { +                char *ret; +                if ((ret = fgets(whole_buffer, 1024, handle)) == whole_buffer) { +                        /* sscanf implicitly strips whitespace */ +                        if (sscanf(whole_buffer, "%s %[^\n]", dest_name, dest_value) < 1) +                                continue; +                } else if (ret != NULL) +                        die("Could not read line in configuration file\n"); + +                /* skip comments and empty lines */ +                if (dest_name[0] == '#' || strlen(dest_name) < 3) +                        continue; + +                OPT("wlan") +                        wlan_interface = strdup(dest_value); +                OPT("eth") +                        eth_interface = strdup(dest_value); +                OPT("time_format") +                        time_format = strdup(dest_value); +                OPT("battery") { +                        struct battery *new = calloc(1, sizeof(struct battery)); +                        if (new == NULL) +                                die("Could not allocate memory\n"); +                        if (asprintf(&(new->path), "/sys/class/power_supply/BAT%d/uevent", atoi(dest_value)) == -1) +                                die("Could not build battery path\n"); + +                        /* check if flags were specified for this battery */ +                        if (strstr(dest_value, ",") != NULL) { +                                char *flags = strstr(dest_value, ","); +                                flags++; +                                if (*flags == 'f') +                                        new->use_last_full = true; +                        } +                        SIMPLEQ_INSERT_TAIL(&batteries, new, batteries); +                } OPT("color") +                        use_colors = true; +                OPT("get_ethspeed") +                        get_ethspeed = true; +                OPT("get_cpu_temperature") { +                        get_cpu_temperature = true; +                        if (strlen(dest_value) > 0) { +                                if (asprintf(&thermal_zone, "/sys/class/thermal/thermal_zone%d/temp", atoi(dest_value)) == -1) +                                        die("Could not build thermal_zone path\n"); +                        } else { +                                 if (asprintf(&thermal_zone, "/sys/class/thermal/thermal_zone0/temp") == -1) +                                        die("Could not build thermal_zone path\n"); +                        } +                } OPT("normcolors") +                        wmii_normcolors = strdup(dest_value); +                OPT("interval") +                        interval = atoi(dest_value); +                OPT("wmii_path") +                { +#ifndef DZEN +                        static glob_t globbuf; +                        struct stat stbuf; +                        if (glob(dest_value, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) +                                die("glob() failed\n"); +                        wmii_path = strdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : dest_value); +                        globfree(&globbuf); + +                        if ((stat(wmii_path, &stbuf)) == -1) { +                                fprintf(stderr, "Warning: wmii_path contains an invalid path\n"); +                                free(wmii_path); +                                wmii_path = strdup(dest_value); +                        } +                        if (wmii_path[strlen(wmii_path)-1] != '/') +                                die("wmii_path is not terminated by /\n"); +#endif +                } +                OPT("run_watch") +                { +                        char *name = strdup(dest_value); +                        char *path = name; +                        while (*path != ' ') +                                path++; +                        *(path++) = '\0'; +                        num_run_watches += 2; +                        run_watches = realloc(run_watches, sizeof(char*) * num_run_watches); +                        run_watches[num_run_watches-2] = name; +                        run_watches[num_run_watches-1] = path; +                } +                OPT("order") +                { +                        #define SET_ORDER(opt, idx) { if (strcasecmp(token, opt) == 0) sprintf(order[idx], "%d", c++); } +                        char *walk, *token; +                        int c = 0; +                        walk = token = dest_value; +                        while (*walk != '\0') { +                                while ((*walk != ',') && (*walk != '\0')) +                                        walk++; +                                *(walk++) = '\0'; +                                SET_ORDER("run", ORDER_RUN); +                                SET_ORDER("wlan", ORDER_WLAN); +                                SET_ORDER("eth", ORDER_ETH); +                                SET_ORDER("battery", ORDER_BATTERY); +                                SET_ORDER("cpu_temperature", ORDER_CPU_TEMPERATURE); +                                SET_ORDER("load", ORDER_LOAD); +                                SET_ORDER("time", ORDER_TIME); +                                token = walk; +                                while (isspace((int)(*token))) +                                        token++; +                        } +                } +                else +                { +                        result = -2; +                        die("Unknown configfile option: %s\n", dest_name); +                } +        } +        fclose(handle); + +#ifndef DZEN +        if (wmii_path == NULL) +                exit(EXIT_FAILURE); +#endif + +        return result; +} diff --git a/src/general.c b/src/general.c new file mode 100644 index 0000000..4016ecd --- /dev/null +++ b/src/general.c @@ -0,0 +1,70 @@ +#include <sys/types.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/fcntl.h> + +#include "i3status.h" + +/* + * Reads size bytes into the destination buffer from filename. + * + */ +void slurp(char *filename, char *destination, int size) { +	int fd; + +	if ((fd = open(filename, O_RDONLY)) == -1) +		die("Could not open \"%s\"\n", filename); + +	(void)read(fd, destination, size); +	(void)close(fd); +} + +/* + * Skip the given character for exactly 'amount' times, returns + * a pointer to the first non-'character' character in 'input'. + * + */ +char *skip_character(char *input, char character, int amount) { +        char *walk; +        size_t len = strlen(input); +        int blanks = 0; + +        for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) +                if (*walk == character) +                        blanks++; + +        return (walk == input ? walk : walk-1); +} + +/* + * Write errormessage to statusbar and exit + * + */ +void die(const char *fmt, ...) { +        char buffer[512]; +        va_list ap; +        va_start(ap, fmt); +        (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); +        va_end(ap); + +        if (wmii_path != NULL) +                write_error_to_statusbar(buffer); +        else +                fprintf(stderr, "%s", buffer); +        exit(EXIT_FAILURE); +} + +/* + * This function just concats two strings in place, it should only be used + * for concatting order to the name of a file or concatting color codes. + * Otherwise, the buffer size would have to be increased. + * + */ +char *concat(const char *str1, const char *str2) { +        static char concatbuf[32]; +        (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); +        return concatbuf; +} diff --git a/src/get_battery_info.c b/src/get_battery_info.c new file mode 100644 index 0000000..b81eb8e --- /dev/null +++ b/src/get_battery_info.c @@ -0,0 +1,88 @@ +#include <string.h> +#include <stdlib.h> +#include <stdio.h> + +#include "i3status.h" + +/* + * Get battery information from /sys. Note that it uses the design capacity to + * calculate the percentage, not the last full capacity, so you can see how + * worn off your battery is. + * + */ +const char *get_battery_info(struct battery *bat) { +        char buf[1024]; +        static char part[512]; +        char *walk, *last; +        int full_design = -1, +            remaining = -1, +            present_rate = -1; +        charging_status_t status = CS_DISCHARGING; + +	slurp(bat->path, buf, sizeof(buf)); + +        for (walk = buf, last = buf; (walk-buf) < 1024; walk++) { +                if (*walk == '\n') { +                        last = walk+1; +                        continue; +                } + +                if (*walk != '=') +                        continue; + +                if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") || +                    BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) +                        remaining = atoi(walk+1); +                else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW")) +                        present_rate = atoi(walk+1); +                else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging")) +                        status = CS_CHARGING; +                else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Full")) +                        status = CS_FULL; +                else { +                        /* The only thing left is the full capacity */ +                        if (bat->use_last_full) { +                                if (!BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") && +                                    !BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL")) +                                        continue; +                        } else { +                                if (!BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") && +                                    !BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN")) +                                        continue; +                        } + +                        full_design = atoi(walk+1); +                } +        } + +        if ((full_design == 1) || (remaining == -1)) +                return part; + +        if (present_rate > 0) { +                float remaining_time; +                int seconds, hours, minutes; +                if (status == CS_CHARGING) +                        remaining_time = ((float)full_design - (float)remaining) / (float)present_rate; +                else if (status == CS_DISCHARGING) +                        remaining_time = ((float)remaining / (float)present_rate); +                else remaining_time = 0; + +                seconds = (int)(remaining_time * 3600.0); +                hours = seconds / 3600; +                seconds -= (hours * 3600); +                minutes = seconds / 60; +                seconds -= (minutes * 60); + +                (void)snprintf(part, sizeof(part), "%s %.02f%% %02d:%02d:%02d", +                        (status == CS_CHARGING ? "CHR" : +                         (status == CS_DISCHARGING ? "BAT" : "FULL")), +                        (((float)remaining / (float)full_design) * 100), +                        max(hours, 0), max(minutes, 0), max(seconds, 0)); +        } else { +                (void)snprintf(part, sizeof(part), "%s %.02f%%", +                        (status == CS_CHARGING ? "CHR" : +                         (status == CS_DISCHARGING ? "BAT" : "FULL")), +                        (((float)remaining / (float)full_design) * 100)); +        } +        return part; +} diff --git a/src/get_cpu_temperature.c b/src/get_cpu_temperature.c new file mode 100644 index 0000000..56a559c --- /dev/null +++ b/src/get_cpu_temperature.c @@ -0,0 +1,25 @@ +#include <stdlib.h> +#include <limits.h> +#include <stdio.h> + +#include "i3status.h" + +/* + * Reads the CPU temperature from /sys/class/thermal/thermal_zone0/temp and + * returns the temperature in degree celcius. + * + */ +const char *get_cpu_temperature_info() { +        static char buf[16]; +        long int temp; + +	slurp(thermal_zone, buf, sizeof(buf)); +	temp = strtol(buf, NULL, 10); + +        if (temp == LONG_MIN || temp == LONG_MAX || temp <= 0) +                (void)snprintf(buf, sizeof(buf), "T: ? C"); +        else +                (void)snprintf(buf, sizeof(buf), "T: %ld C", (temp/1000)); + +        return buf; +} diff --git a/src/get_eth_info.c b/src/get_eth_info.c new file mode 100644 index 0000000..7561421 --- /dev/null +++ b/src/get_eth_info.c @@ -0,0 +1,49 @@ +#include <string.h> +#include <limits.h> +#include <stdio.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <net/if.h> + +#ifdef LINUX +#include <linux/ethtool.h> +#include <linux/sockios.h> +#endif + +#include "i3status.h" + +/* + * Combines ethernet IP addresses and speed (if requested) for displaying + * + */ +const char *get_eth_info() { +        static char part[512]; +        const char *ip_address = get_ip_addr(eth_interface); +        int ethspeed = 0; + +        if (get_ethspeed) { +#ifdef LINUX +                /* This code path requires root privileges */ +                struct ifreq ifr; +                struct ethtool_cmd ecmd; + +                ecmd.cmd = ETHTOOL_GSET; +                (void)memset(&ifr, 0, sizeof(ifr)); +                ifr.ifr_data = (caddr_t)&ecmd; +                (void)strcpy(ifr.ifr_name, eth_interface); +                if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) +                        ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed); +                else get_ethspeed = false; +#endif +        } + +        if (ip_address == NULL) +                (void)snprintf(part, sizeof(part), "E: down"); +        else { +                if (get_ethspeed) +                        (void)snprintf(part, sizeof(part), "E: %s (%d Mbit/s)", ip_address, ethspeed); +                else (void)snprintf(part, sizeof(part), "E: %s", ip_address); +        } + +        return part; +} diff --git a/src/get_ip_addr.c b/src/get_ip_addr.c new file mode 100644 index 0000000..de03d8c --- /dev/null +++ b/src/get_ip_addr.c @@ -0,0 +1,43 @@ +#include <net/if.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <netdb.h> + +#include "i3status.h" + +/* + * Return the IP address for the given interface or "no IP" if the + * interface is up and running but hasn't got an IP address yet + * + */ +const char *get_ip_addr(const char *interface) { +        static char part[512]; +        struct ifreq ifr; +        socklen_t len = sizeof(struct sockaddr_in); +        memset(part, 0, sizeof(part)); + +        /* First check if the interface is running */ +        (void)strcpy(ifr.ifr_name, interface); +        if (ioctl(general_socket, SIOCGIFFLAGS, &ifr) < 0 || +            !(ifr.ifr_flags & IFF_RUNNING)) +                return NULL; + +        /* Interface is up, get the IP address */ +        (void)strcpy(ifr.ifr_name, interface); +        ifr.ifr_addr.sa_family = AF_INET; +        if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0) +                return "no IP"; + +	int ret; +	if ((ret = getnameinfo(&ifr.ifr_addr, len, part, sizeof(part), NULL, 0, NI_NUMERICHOST)) != 0) { +		fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret)); +		return "no IP"; +	} + +        return part; +} + diff --git a/src/get_ipv6_addr.c b/src/get_ipv6_addr.c new file mode 100644 index 0000000..44edc7a --- /dev/null +++ b/src/get_ipv6_addr.c @@ -0,0 +1,61 @@ +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> +#include <string.h> +#include <arpa/inet.h> + +/* + * Returns the IPv6 address with which you have connectivity at the moment. + * + */ +const char *get_ipv6_addr() { +	static char buf[INET6_ADDRSTRLEN+1]; +	struct addrinfo hints; +	struct addrinfo *result, *resp; +	int fd; + +	memset(&hints, 0, sizeof(struct addrinfo)); +	hints.ai_family = AF_INET6; + +	if (getaddrinfo("k.root-servers.net", "domain", &hints, &result) != 0) { +		perror("getaddrinfo()"); +		return "no IP"; +	} + +	for (resp = result; resp != NULL; resp = resp->ai_next) { +		if ((fd = socket(resp->ai_family, SOCK_STREAM, 0)) == -1) { +			perror("socket()"); +			continue; +		} + +		if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) { +			perror("connect()"); +			continue; +		} + +		struct sockaddr_storage local; +		socklen_t local_len = sizeof(struct sockaddr_storage); +		if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) { +			perror("getsockname()"); +			return "no IP"; +		} + +		memset(buf, 0, INET6_ADDRSTRLEN + 1); +		int ret; +		if ((ret = getnameinfo((struct sockaddr*)&local, local_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) != 0) { +			fprintf(stderr, "getnameinfo(): %s\n", gai_strerror(ret)); +			return "no IP"; +		} + +		(void)close(fd); + +		free(result); +		return buf; +	} + +	free(result); +	return "no IP"; +} diff --git a/src/get_load.c b/src/get_load.c new file mode 100644 index 0000000..7d5349f --- /dev/null +++ b/src/get_load.c @@ -0,0 +1,25 @@ +#include "i3status.h" + +const char *get_load() { +	static char part[512]; + +/* Get load */ +#ifdef LINUX +	slurp("/proc/loadavg", part, sizeof(part)); +	*skip_character(part, ' ', 3) = '\0'; +#else +	/* TODO: correctly check for NetBSD, check if it works the same on *BSD */ +	struct loadavg load; +	size_t length = sizeof(struct loadavg); +	int mib[2] = { CTL_VM, VM_LOADAVG }; +	if (sysctl(mib, 2, &load, &length, NULL, 0) < 0) +		die("Could not sysctl({ CTL_VM, VM_LOADAVG })\n"); +	double scale = load.fscale; +	(void)snprintf(part, sizeof(part), "%.02f %.02f %.02f", +			(double)load.ldavg[0] / scale, +			(double)load.ldavg[1] / scale, +			(double)load.ldavg[2] / scale); +#endif + +	return part; +} diff --git a/src/get_wireless_info.c b/src/get_wireless_info.c new file mode 100644 index 0000000..fd0c60b --- /dev/null +++ b/src/get_wireless_info.c @@ -0,0 +1,44 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <limits.h> + +#include "i3status.h" + +/* + * Just parses /proc/net/wireless looking for lines beginning with + * wlan_interface, extracting the quality of the link and adding the + * current IP address of wlan_interface. + * + */ +const char *get_wireless_info() { +        char buf[1024]; +        static char part[512]; +        char *interfaces; +        memset(buf, 0, sizeof(buf)); +        memset(part, 0, sizeof(part)); + +	slurp("/proc/net/wireless", buf, sizeof(buf)); + +        interfaces = skip_character(buf, '\n', 1) + 1; +        while ((interfaces = skip_character(interfaces, '\n', 1)+1) < buf+strlen(buf)) { +                while (isspace((int)*interfaces)) +                        interfaces++; +                if (!BEGINS_WITH(interfaces, wlan_interface)) +                        continue; +                int quality; +                if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1) +                        continue; +                if ((quality == UCHAR_MAX) || (quality == 0)) { +                        if (use_colors) +                                (void)snprintf(part, sizeof(part), "%sW: down", color("#FF0000")); +                        else (void)snprintf(part, sizeof(part), "W: down"); +                } else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s", +                                color("#00FF00"), quality, get_ip_addr(wlan_interface)); +                return part; +        } + +        return part; +} + diff --git a/src/output.c b/src/output.c new file mode 100644 index 0000000..379710e --- /dev/null +++ b/src/output.c @@ -0,0 +1,157 @@ +#include <stdbool.h> +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <fcntl.h> +#include <dirent.h> + +#include "i3status.h" + +/* + * Writes an errormessage to statusbar + * + */ +void write_error_to_statusbar(const char *message) { +        cleanup_rbar_dir(); +        create_file("error"); +        write_to_statusbar("error", message, true); +} + +/* + * Returns the correct color format for dzen (^fg(color)) or wmii (color <normcolors>) + * + */ +char *color(const char *colorstr) { +        static char colorbuf[32]; +#ifdef DZEN +        (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr); +#else +        (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors); +#endif +        return colorbuf; +} + +/* + * Cleans wmii's /rbar directory by deleting all regular files + * + */ +void cleanup_rbar_dir() { +#ifdef DZEN +        return; +#endif +        struct dirent *ent; +        DIR *dir; +        char pathbuf[strlen(wmii_path)+256+1]; + +        if ((dir = opendir(wmii_path)) == NULL) +                exit(EXIT_FAILURE); + +        while ((ent = readdir(dir)) != NULL) { +                if (ent->d_type == DT_REG) { +                        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, ent->d_name); +                        if (unlink(pathbuf) == -1) +                                exit(EXIT_FAILURE); +                } +        } + +        (void)closedir(dir); +} + +/* + * Creates the specified file in wmii's /rbar directory with + * correct modes and initializes colors if colormode is enabled + * + */ +void create_file(const char *name) { +#ifdef DZEN +        return; +#endif +        char pathbuf[strlen(wmii_path)+256+1]; +        int fd; +        int flags = O_CREAT | O_WRONLY; +        struct stat statbuf; + +        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); + +        /* Overwrite file's contents if it exists */ +        if (stat(pathbuf, &statbuf) >= 0) +                flags |= O_TRUNC; + +        if ((fd = open(pathbuf, flags, S_IRUSR | S_IWUSR)) < 0) +                exit(EXIT_FAILURE); +        if (use_colors) { +                char *tmp = color("#888888"); +                if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp)) +                        exit(EXIT_FAILURE); +        } +        (void)close(fd); +} + +/* + * Waits until wmii_path/rbar exists (= the filesystem gets mounted), + * cleans up all files and creates the needed files + * + */ +void setup(void) { +        unsigned int i; +        char pathbuf[512]; + +#ifndef DZEN +        struct stat statbuf; +        /* Wait until wmii_path/rbar exists */ +        for (; stat(wmii_path, &statbuf) < 0; sleep(interval)); +#endif + +        cleanup_rbar_dir(); +        if (wlan_interface) +                create_file(concat(order[ORDER_WLAN],"wlan")); +        if (eth_interface) +                create_file(concat(order[ORDER_ETH],"eth")); +        if (get_cpu_temperature) +                create_file(concat(order[ORDER_CPU_TEMPERATURE], "cpu_temperature")); +        create_file(concat(order[ORDER_LOAD],"load")); +        if (time_format) +                create_file(concat(order[ORDER_TIME],"time")); +        for (i = 0; i < num_run_watches; i += 2) { +                snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); +                create_file(pathbuf); +        } +} + +/* + * Writes the given message in the corresponding file in wmii's /rbar directory + * + */ +void write_to_statusbar(const char *name, const char *message, bool final_entry) { +#ifdef DZEN +        if (final_entry) { +                if (printf("%s^p(6)\n", message) < 0) { +                        perror("printf"); +                        exit(1); +                } + +                fflush(stdout); +                return; +        } +        if (printf("%s" BAR, message) < 0) { +                perror("printf"); +                exit(1); +        } +        return; +#endif + +        char pathbuf[strlen(wmii_path)+256+1]; +        int fd; + +        (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); +        if ((fd = open(pathbuf, O_RDWR)) == -1) { +                /* Try to re-setup stuff and just continue */ +                setup(); +                return; +        } +        if (write(fd, message, strlen(message)) != (ssize_t)strlen(message)) +                exit(EXIT_FAILURE); +        (void)close(fd); +} diff --git a/src/process_runs.c b/src/process_runs.c new file mode 100644 index 0000000..5e13de7 --- /dev/null +++ b/src/process_runs.c @@ -0,0 +1,55 @@ +#include <stdbool.h> +#include <glob.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + +#ifndef LINUX +/* TODO: correctly check for *BSD */ +#include <sys/param.h> +#include <sys/sysctl.h> +#include <sys/resource.h> +#endif + +#include "i3status.h" + +/* + * Checks if the PID in path is still valid by checking: + *  (Linux) if /proc/<pid> exists + *  (NetBSD) if sysctl returns process infos for this pid + * + */ +bool process_runs(const char *path) { +        char pidbuf[16]; +        static glob_t globbuf; +        int fd; +        memset(pidbuf, 0, sizeof(pidbuf)); + +        if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) +                die("glob() failed\n"); +        fd = open((globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path), O_RDONLY); +        globfree(&globbuf); +        if (fd < 0) +                return false; +        (void)read(fd, pidbuf, sizeof(pidbuf)); +        (void)close(fd); + +#ifdef LINUX +        struct stat statbuf; +        char procbuf[512]; +        (void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10)); +        return (stat(procbuf, &statbuf) >= 0); +#else +        /* TODO: correctly check for NetBSD. Evaluate if this runs on OpenBSD/FreeBSD */ +        struct kinfo_proc info; +        size_t length = sizeof(struct kinfo_proc); +        int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, strtol(pidbuf, NULL, 10) }; +        if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) +                return false; +        return (length != 0); +#endif +} | 
