diff options
| -rw-r--r-- | i3status.c | 918 |
1 files changed, 460 insertions, 458 deletions
@@ -1,4 +1,6 @@ /* + * vim:ts=8:expandtab + * * i3status – Generates a status line for dzen2 or wmii * * @@ -69,8 +71,8 @@ #define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)" struct battery { - const char *path; - SIMPLEQ_ENTRY(battery) batteries; + const char *path; + SIMPLEQ_ENTRY(battery) batteries; }; SIMPLEQ_HEAD(battery_head, battery) batteries; @@ -98,9 +100,9 @@ static unsigned int interval = 1; * */ static char *concat(const char *str1, const char *str2) { - static char concatbuf[32]; - (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); - return concatbuf; + static char concatbuf[32]; + (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); + return concatbuf; } /* @@ -108,13 +110,13 @@ static char *concat(const char *str1, const char *str2) { * */ static char *color(const char *colorstr) { - static char colorbuf[32]; + static char colorbuf[32]; #ifdef DZEN - (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr); + (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr); #else - (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors); + (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors); #endif - return colorbuf; + return colorbuf; } /* @@ -123,24 +125,24 @@ static char *color(const char *colorstr) { */ static void cleanup_rbar_dir() { #ifdef DZEN - return; + 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); + 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); } /* @@ -150,27 +152,27 @@ static void cleanup_rbar_dir() { */ static void create_file(const char *name) { #ifdef DZEN - return; + 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); + 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); } /* @@ -179,29 +181,29 @@ static void create_file(const char *name) { * */ static void setup(void) { - unsigned int i; - char pathbuf[512]; + 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)); + 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 (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); - } + 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); + } } /* @@ -210,27 +212,27 @@ static void setup(void) { */ static void write_to_statusbar(const char *name, const char *message, bool final_entry) { #ifdef DZEN - if (final_entry) { - (void)printf("%s^p(6)\n", message); - fflush(stdout); - return; - } - (void)printf("%s" BAR, message); - return; + if (final_entry) { + (void)printf("%s^p(6)\n", message); + fflush(stdout); + return; + } + (void)printf("%s" BAR, message); + 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); + 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); } /* @@ -238,9 +240,9 @@ static void write_to_statusbar(const char *name, const char *message, bool final * */ static void write_error_to_statusbar(const char *message) { - cleanup_rbar_dir(); - create_file("error"); - write_to_statusbar("error", message, true); + cleanup_rbar_dir(); + create_file("error"); + write_to_statusbar("error", message, true); } /* @@ -248,16 +250,16 @@ static void write_error_to_statusbar(const char *message) { * */ void die(const char *fmt, ...) { - if (wmii_path != NULL) { - char buffer[512]; - va_list ap; - va_start(ap, fmt); - (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); - va_end(ap); - - write_error_to_statusbar(buffer); - } - exit(EXIT_FAILURE); + if (wmii_path != NULL) { + char buffer[512]; + va_list ap; + va_start(ap, fmt); + (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); + va_end(ap); + + write_error_to_statusbar(buffer); + } + exit(EXIT_FAILURE); } /* @@ -266,15 +268,15 @@ void die(const char *fmt, ...) { * */ static char *skip_character(char *input, char character, int amount) { - char *walk; - size_t len = strlen(input); - int blanks = 0; + 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++; + for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) + if (*walk == character) + blanks++; - return (walk == input ? walk : walk-1); + return (walk == input ? walk : walk-1); } /* @@ -284,68 +286,68 @@ static char *skip_character(char *input, char character, int amount) { * */ static char *get_battery_info(const char *path) { - 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(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 == '=') { - if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN") || - BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN")) - full_design = atoi(walk+1); - else 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 if (*walk == '\n') - last = 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), - hours, minutes, seconds); - } 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; + 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(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 == '=') { + if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN") || + BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN")) + full_design = atoi(walk+1); + else 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 if (*walk == '\n') + last = 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), + hours, minutes, seconds); + } 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; } /* @@ -354,30 +356,30 @@ static char *get_battery_info(const char *path) { * */ 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; + 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; } /* @@ -387,37 +389,37 @@ static const char *get_ip_address(const char *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; + 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; } /* @@ -425,35 +427,35 @@ static char *get_wireless_info() { * */ static char *get_eth_info() { - static char part[512]; - const char *ip_address = get_ip_address(eth_interface); - int ethspeed = 0; + static char part[512]; + const char *ip_address = get_ip_address(eth_interface); + int ethspeed = 0; - if (get_ethspeed) { + 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; + /* 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); - } + 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; + return part; } /* @@ -463,33 +465,33 @@ static char *get_eth_info() { * */ 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); + 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); + 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); + /* 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 } @@ -498,205 +500,205 @@ static bool process_runs(const char *path) { * */ 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_path") { - struct battery *new = calloc(1, sizeof(struct battery)); - if (new == NULL) - die("Could not allocate memory\n"); - new->path = strdup(dest_value); - SIMPLEQ_INSERT_TAIL(&batteries, new, batteries); - } OPT("color") - use_colors = true; - OPT("get_ethspeed") - get_ethspeed = true; - OPT("normcolors") - wmii_normcolors = strdup(dest_value); - OPT("interval") - interval = atoi(dest_value); - OPT("wmii_path") - { + #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_path") { + struct battery *new = calloc(1, sizeof(struct battery)); + if (new == NULL) + die("Could not allocate memory\n"); + new->path = strdup(dest_value); + SIMPLEQ_INSERT_TAIL(&batteries, new, batteries); + } OPT("color") + use_colors = true; + OPT("get_ethspeed") + get_ethspeed = true; + 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"); + 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("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); + } + 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("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); + if (wmii_path == NULL) + exit(EXIT_FAILURE); #endif - return result; + return result; } int main(int argc, char *argv[]) { - char part[512], - pathbuf[512]; - unsigned int i; - - char *configfile = PREFIX "/etc/i3status.conf"; - int o, option_index = 0; - struct option long_options[] = { - {"config", required_argument, 0, 'c'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; - - SIMPLEQ_INIT(&batteries); - - while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1) - if ((char)o == 'c') - configfile = optarg; - else if ((char)o == 'h') { - printf("i3status (c) 2008-2009 Michael Stapelberg\n" - "Syntax: %s [-c <configfile>]\n", argv[0]); - return 0; - } - - if (load_configuration(configfile) < 0) - return EXIT_FAILURE; - - setup(); - - if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - die("Could not create socket\n"); - - while (1) { - 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 ? color("#00FF00") : color("#FF0000")), - 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, false); - } - - if (wlan_interface) - write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info(), false); - if (eth_interface) - write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info(), false); - struct battery *current_battery; - SIMPLEQ_FOREACH(current_battery, &batteries, batteries) { - write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info(current_battery->path), false); - } - - /* Get load */ + char part[512], + pathbuf[512]; + unsigned int i; + + char *configfile = PREFIX "/etc/i3status.conf"; + int o, option_index = 0; + struct option long_options[] = { + {"config", required_argument, 0, 'c'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + + SIMPLEQ_INIT(&batteries); + + while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1) + if ((char)o == 'c') + configfile = optarg; + else if ((char)o == 'h') { + printf("i3status (c) 2008-2009 Michael Stapelberg\n" + "Syntax: %s [-c <configfile>]\n", argv[0]); + return 0; + } + + if (load_configuration(configfile) < 0) + return EXIT_FAILURE; + + setup(); + + if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + die("Could not create socket\n"); + + while (1) { + 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 ? color("#00FF00") : color("#FF0000")), + 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, false); + } + + if (wlan_interface) + write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info(), false); + if (eth_interface) + write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info(), false); + struct battery *current_battery; + SIMPLEQ_FOREACH(current_battery, &batteries, batteries) { + write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info(current_battery->path), 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'; + 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); + /* 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); - - 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, true); - } - - sleep(interval); - } + write_to_statusbar(concat(order[ORDER_LOAD], "load"), part, !time_format); + + 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, true); + } + + sleep(interval); + } } |