X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=wmiistatus.c;h=e99625a8f5c87ea3c34920af88128c057a162aad;hb=fe75f783ed8cc34d8219f9f59c30bbba2dc86738;hp=bdb1e6a5ed8bbcc795b1815cec8f5c9ac2017711;hpb=e94e25208936ab8f6ab684b1b229bc29073b955d;p=i3%2Fi3status diff --git a/wmiistatus.c b/wmiistatus.c index bdb1e6a..e99625a 100644 --- a/wmiistatus.c +++ b/wmiistatus.c @@ -48,53 +48,125 @@ #include #include #include +#include +#include +#include +#include + +#define _IS_WMIISTATUS_C #include "wmiistatus.h" +#undef _IS_WMIISTATUS_C #include "config.h" -static void write_to_statusbar(const char *message) { - int fd = open(wmii_path, O_RDWR); - if (fd == -1) - exit(-2); - write(fd, message, strlen(message)); - close(fd); +/* + * 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; +} + +/* + * Cleans wmii's /rbar directory by deleting all regular files + * + */ +static void cleanup_rbar_dir() { + 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) { + char pathbuf[strlen(wmii_path)+256+1]; + int fd; + + (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); + if ((fd = open(pathbuf, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) + exit(EXIT_FAILURE); + if (use_colors) { + char *tmp = concat("#888888 ", wmii_normcolors); + if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp)) + exit(EXIT_FAILURE); + } + (void)close(fd); +} + +/* + * Writes the given message in the corresponding file in wmii's /rbar directory + * + */ +static void write_to_statusbar(const char *name, const char *message) { + 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) + exit(EXIT_FAILURE); + 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); } /* * Write errormessage to statusbar and exit * */ -static void die(const char *fmt, ...) { +void die(const char *fmt, ...) { char buffer[512]; va_list ap; va_start(ap, fmt); - vsprintf(buffer, fmt, ap); + (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); va_end(ap); - write_to_statusbar(buffer); - exit(-1); + write_error_to_statusbar(buffer); + exit(EXIT_FAILURE); } static char *skip_character(char *input, char character, int amount) { char *walk; - int len = strlen(input), - blanks = 0; + size_t len = strlen(input); + int blanks = 0; - for (walk = input; ((walk - input) < len) && (blanks < amount); walk++) + for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) if (*walk == character) blanks++; return (walk == input ? walk : walk-1); } -static void push_part(const char *input, const int n) { - if (first_push) - first_push = false; - else - strncpy(output+strlen(output), " | ", strlen(" | ")); - strncpy(output+strlen(output), input, n); -} - /* * Get battery information from /sys. Note that it uses the design capacity to calculate the percentage, * not the full capacity. @@ -103,17 +175,19 @@ static void push_part(const char *input, const int n) { static char *get_battery_info() { char buf[1024]; static char part[512]; - char *walk, *last = buf; - int fd = open(battery, O_RDONLY); - if (fd == -1) - die("Could not open %s", battery); + char *walk, *last; + int fd; int full_design = -1, remaining = -1, present_rate = -1; charging_status_t status = CS_DISCHARGING; - memset(part, '\0', sizeof(part)); - read(fd, buf, sizeof(buf)); - for (walk = buf; (walk-buf) < 1024; walk++) + + if ((fd = open(battery_path, O_RDONLY)) == -1) + die("Could not open %s", battery_path); + + memset(part, 0, sizeof(part)); + (void)read(fd, buf, sizeof(buf)); + for (walk = buf, last = buf; (walk-buf) < 1024; walk++) if (*walk == '=') { if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN")) full_design = atoi(walk+1); @@ -127,27 +201,29 @@ static char *get_battery_info() { status = CS_FULL; } else if (*walk == '\n') last = walk+1; - close(fd); + (void)close(fd); if ((full_design != -1) && (remaining != -1) && (present_rate != -1)) { float remaining_time, perc; + 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 { - snprintf(part, sizeof(part), "FULL"); + (void)snprintf(part, sizeof(part), "FULL"); return part; } perc = ((float)remaining / (float)full_design); - int seconds = (int)(remaining_time * 3600.0); - int hours = seconds / 3600; + seconds = (int)(remaining_time * 3600.0); + hours = seconds / 3600; seconds -= (hours * 3600); - int minutes = seconds / 60; + minutes = seconds / 60; seconds -= (minutes * 60); - sprintf(part, "%s %.02f%% %02d:%02d:%02d", (status == CS_CHARGING? "CHR" : "BAT"), + (void)snprintf(part, sizeof(part), "%s %.02f%% %02d:%02d:%02d", + (status == CS_CHARGING? "CHR" : "BAT"), (perc * 100), hours, minutes, seconds); } return part; @@ -161,32 +237,37 @@ static char *get_wireless_info() { char buf[1024]; static char part[512]; char *interfaces; - memset(buf, '\0', sizeof(buf)); - memset(part, '\0', sizeof(part)); + int fd; + memset(buf, 0, sizeof(buf)); + memset(part, 0, sizeof(part)); - int fd = open("/proc/net/wireless", O_RDONLY); - if (fd == -1) + if ((fd = open("/proc/net/wireless", O_RDONLY)) == -1) die("Could not open /proc/net/wireless"); - read(fd, buf, sizeof(buf)); - close(fd); + (void)read(fd, buf, sizeof(buf)); + (void)close(fd); interfaces = skip_character(buf, '\n', 2) + 1; while (interfaces < buf+strlen(buf)) { while (isspace((int)*interfaces)) interfaces++; if (strncmp(interfaces, wlan_interface, strlen(wlan_interface)) == 0) { + int quality; /* Skip status field (0000) */ interfaces += strlen(wlan_interface) + 2; interfaces = skip_character(interfaces, ' ', 1); while (isspace((int)*interfaces)) interfaces++; - int quality = atoi(interfaces); + quality = atoi(interfaces); /* For some reason, I get 255 sometimes */ - if ((quality == 255) || (quality == 0)) - snprintf(part, sizeof(part), "W: down"); - else { - snprintf(part, sizeof(part), "W: (%02d%%) ", quality); - char *ip_address = get_ip_address(wlan_interface); + if ((quality == 255) || (quality == 0)) { + if (use_colors) + (void)snprintf(part, sizeof(part), "%s%s", concat("#FF0000 ", wmii_normcolors), " W: down"); + else (void)snprintf(part, sizeof(part), "W: down"); + + } else { + const char *ip_address; + (void)snprintf(part, sizeof(part), "W: (%02d%%) ", quality); + ip_address = get_ip_address(wlan_interface); strcpy(part+strlen(part), ip_address); } @@ -198,12 +279,13 @@ static char *get_wireless_info() { return part; } -static char *get_ip_address(const char *interface) { +static const char *get_ip_address(const char *interface) { static char part[512]; struct ifreq ifr; - memset(part, '\0', sizeof(part)); + int fd; + memset(part, 0, sizeof(part)); - int fd = socket(AF_INET, SOCK_DGRAM, 0); + fd = socket(AF_INET, SOCK_DGRAM, 0); strcpy(ifr.ifr_name, interface); if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) @@ -220,22 +302,46 @@ static char *get_ip_address(const char *interface) { if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { struct sockaddr_in addr; memcpy(&addr, &ifr.ifr_addr, sizeof(struct sockaddr_in)); - inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, sizeof(struct sockaddr_in)); + (void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, (socklen_t)sizeof(struct sockaddr_in)); if (strlen(part) == 0) - sprintf(part, "no IP"); + snprintf(part, sizeof(part), "no IP"); } - close(fd); + (void)close(fd); return part; } static char *get_eth_info() { static char part[512]; - char *ip_address = get_ip_address(eth_interface); + const char *ip_address = get_ip_address(eth_interface); + int ethspeed = 0; + + if (get_ethspeed) { + struct ifreq ifr; + struct ethtool_cmd ecmd; + int fd, err; + + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) + write_error_to_statusbar("Could not open socket"); + + ecmd.cmd = ETHTOOL_GSET; + (void)memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_data = (caddr_t)&ecmd; + (void)strcpy(ifr.ifr_name, eth_interface); + if ((err = ioctl(fd, SIOCETHTOOL, &ifr)) == 0) + ethspeed = ecmd.speed; + else write_error_to_statusbar("Could not get interface speed. Insufficient privileges?"); + + (void)close(fd); + } if (ip_address == NULL) - snprintf(part, sizeof(part), "E: down"); - else snprintf(part, sizeof(part), "E: %s", ip_address); + (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; } @@ -248,70 +354,104 @@ static bool process_runs(const char *path) { char pidbuf[512], procbuf[512], *walk; - int n; + ssize_t n; static glob_t globbuf; struct stat statbuf; + const char *real_path; + int fd; if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) die("glob() failed"); - const char *real_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path); - int fd = open(real_path, O_RDONLY); + real_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path); + fd = open(real_path, O_RDONLY); globfree(&globbuf); if (fd < 0) return false; - n = read(fd, pidbuf, sizeof(pidbuf)); - if (n > 0) + if ((n = read(fd, pidbuf, sizeof(pidbuf))) > 0) pidbuf[n] = '\0'; - close(fd); + (void)close(fd); for (walk = pidbuf; *walk != '\0'; walk++) if (!isdigit((int)(*walk))) { *walk = '\0'; break; } - sprintf(procbuf, "/proc/%s", pidbuf); + (void)snprintf(procbuf, sizeof(procbuf), "/proc/%s", pidbuf); return (stat(procbuf, &statbuf) >= 0); } -int main(void) { +int main(int argc, char *argv[]) { char part[512], + pathbuf[512], *end; unsigned int i; + int load_avg; + + char *configfile = PREFIX "/etc/wmiistatus.conf"; + int o, option_index = 0; + struct option long_options[] = { + {"config", required_argument, 0, 'c'}, + {0, 0, 0, 0} + }; + + while ((o = getopt_long(argc, argv, "c:", long_options, &option_index)) != -1) + if ((char)o == 'c') + configfile = optarg; + + load_configuration(configfile); + cleanup_rbar_dir(); + if (wlan_interface) + create_file(concat(order[ORDER_WLAN],"wlan")); + if (eth_interface) + create_file(concat(order[ORDER_ETH],"eth")); + if (battery_path) + create_file(concat(order[ORDER_BATTERY],"battery")); + 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); + } while (1) { - memset(output, '\0', sizeof(output)); - first_push = true; - - for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) { - sprintf(part, "%s: %s", run_watches[i], (process_runs(run_watches[i+1]) ? "yes" : "no")); - push_part(part, strlen(part)); + for (i = 0; i < num_run_watches; i += 2) { + bool running = process_runs(run_watches[i+1]); + if (use_colors) + snprintf(part, sizeof(part), "%s %s: %s", + (running ? + concat("#00FF00 ", wmii_normcolors) : + concat("#FF0000 ", wmii_normcolors)), + run_watches[i], + (running ? "yes" : "no")); + else snprintf(part, sizeof(part), "%s: %s", run_watches[i], (running ? "yes" : "no")); + snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); + write_to_statusbar(pathbuf, part); } - char *wireless_info = get_wireless_info(); - push_part(wireless_info, strlen(wireless_info)); - - char *eth_info = get_eth_info(); - push_part(eth_info, strlen(eth_info)); - - char *battery_info = get_battery_info(); - push_part(battery_info, strlen(battery_info)); + if (wlan_interface) + write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info()); + if (eth_interface) + write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info()); + if (battery_path) + write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info()); /* Get load */ - int load_avg = open("/proc/loadavg", O_RDONLY); - if (load_avg == -1) + if ((load_avg = open("/proc/loadavg", O_RDONLY)) == -1) die("Could not open /proc/loadavg"); - read(load_avg, part, sizeof(part)); - close(load_avg); + (void)read(load_avg, part, sizeof(part)); + (void)close(load_avg); end = skip_character(part, ' ', 3); - push_part(part, (end-part)); - - /* Get date & time */ - time_t current_time = time(NULL); - struct tm *current_tm = localtime(¤t_time); - strftime(part, sizeof(part), time_format, current_tm); - push_part(part, strlen(part)); - - write_to_statusbar(output); + *end = '\0'; + write_to_statusbar(concat(order[ORDER_LOAD], "load"), part); + + if (time_format) { + /* Get date & time */ + time_t current_time = time(NULL); + struct tm *current_tm = localtime(¤t_time); + (void)strftime(part, sizeof(part), time_format, current_tm); + write_to_statusbar(concat(order[ORDER_TIME], "time"), part); + } - sleep(1); + sleep(interval); } }