From 753144d58b5b7edb104f78b0c0331ad150fcdb7c Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 10 Oct 2008 10:33:05 +0200 Subject: [PATCH] Make source splint-clean (invoked with -weak) --- config.c | 2 +- config.h | 2 +- wmiistatus.c | 160 ++++++++++++++++++++++++++++----------------------- wmiistatus.h | 2 +- 4 files changed, 91 insertions(+), 75 deletions(-) diff --git a/config.c b/config.c index da1d387..e8c95dc 100644 --- a/config.c +++ b/config.c @@ -23,7 +23,7 @@ const char *wmii_normcolors = "#222222 #333333"; char order[MAX_ORDER][2]; const char **run_watches; unsigned int num_run_watches; -int interval = 1; +unsigned int interval = 1; void die(const char *fmt, ...); diff --git a/config.h b/config.h index 3e018a4..9437ef2 100644 --- a/config.h +++ b/config.h @@ -15,7 +15,7 @@ extern const char **run_watches; extern unsigned int num_run_watches; extern const char *wmii_normcolors; extern const char order[MAX_ORDER][2]; -extern int interval; +extern unsigned int interval; extern bool use_colors; #endif diff --git a/wmiistatus.c b/wmiistatus.c index 546d042..a7f0b7a 100644 --- a/wmiistatus.c +++ b/wmiistatus.c @@ -64,7 +64,7 @@ */ static char *concat(const char *str1, const char *str2) { static char concatbuf[32]; - snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); + (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); return concatbuf; } @@ -78,16 +78,17 @@ static void cleanup_rbar_dir() { char pathbuf[strlen(wmii_path)+256+1]; if ((dir = opendir(wmii_path)) == NULL) - exit(-3); + exit(EXIT_FAILURE); while ((ent = readdir(dir)) != NULL) { if (ent->d_type == DT_REG) { - sprintf(pathbuf, "%s%s", wmii_path, ent->d_name); - unlink(pathbuf); + (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, ent->d_name); + if (unlink(pathbuf) == -1) + exit(EXIT_FAILURE); } } - closedir(dir); + (void)closedir(dir); } /* @@ -97,16 +98,17 @@ static void cleanup_rbar_dir() { */ static void create_file(const char *name) { char pathbuf[strlen(wmii_path)+256+1]; + int fd; - sprintf(pathbuf, "%s%s", wmii_path, name); - int fd = creat(pathbuf, S_IRUSR | S_IWUSR); - if (fd < 0) - exit(-4); + (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); - write(fd, tmp, strlen(tmp)); + if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp)) + exit(EXIT_FAILURE); } - close(fd); + (void)close(fd); } /* @@ -115,13 +117,14 @@ static void create_file(const char *name) { */ static void write_to_statusbar(const char *name, const char *message) { char pathbuf[strlen(wmii_path)+256+1]; - - sprintf(pathbuf, "%s%s", wmii_path, name); - int fd = open(pathbuf, O_RDWR); - if (fd == -1) - exit(-2); - write(fd, message, strlen(message)); - close(fd); + 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); } /* @@ -142,19 +145,19 @@ 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_error_to_statusbar(buffer); - exit(-1); + 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++; @@ -169,17 +172,19 @@ static char *skip_character(char *input, char character, int amount) { static char *get_battery_info() { char buf[1024]; static char part[512]; - char *walk, *last = buf; - int fd = open(battery_path, O_RDONLY); - if (fd == -1) - die("Could not open %s", battery_path); + 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); @@ -193,27 +198,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; @@ -227,35 +234,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)) { if (use_colors) - snprintf(part, sizeof(part), "%s%s", concat("#FF0000 ", wmii_normcolors), " W: down"); - else snprintf(part, sizeof(part), "W: down"); + (void)snprintf(part, sizeof(part), "%s%s", concat("#FF0000 ", wmii_normcolors), " W: down"); + else (void)snprintf(part, sizeof(part), "W: down"); } else { - snprintf(part, sizeof(part), "W: (%02d%%) ", quality); - char *ip_address = get_ip_address(wlan_interface); + char *ip_address; + (void)snprintf(part, sizeof(part), "W: (%02d%%) ", quality); + ip_address = get_ip_address(wlan_interface); strcpy(part+strlen(part), ip_address); } @@ -267,12 +276,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) @@ -289,22 +299,22 @@ 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); 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 (void)snprintf(part, sizeof(part), "E: %s", ip_address); return part; } @@ -317,27 +327,28 @@ 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); } @@ -346,6 +357,7 @@ int main(int argc, char *argv[]) { pathbuf[512], *end; unsigned int i; + int load_avg; char *configfile = PREFIX "/etc/wmiistatus.conf"; int o, option_index = 0; @@ -370,7 +382,7 @@ int main(int argc, char *argv[]) { if (time_format) create_file(concat(order[ORDER_TIME],"time")); for (i = 0; i < num_run_watches; i += 2) { - sprintf(pathbuf, "%s%s", order[ORDER_RUN], run_watches[i]); + snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); create_file(pathbuf); } @@ -378,9 +390,14 @@ int main(int argc, char *argv[]) { for (i = 0; i < num_run_watches; i += 2) { bool running = process_runs(run_watches[i+1]); if (use_colors) - sprintf(part, "%s %s: %s", (running ? concat("#00FF00 ", wmii_normcolors) : concat("#FF0000 ", wmii_normcolors)), run_watches[i], (running ? "yes" : "no")); - else sprintf(part, "%s: %s", run_watches[i], (running ? "yes" : "no")); - sprintf(pathbuf, "%s%s", order[ORDER_RUN], run_watches[i]); + 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); } @@ -392,11 +409,10 @@ int main(int argc, char *argv[]) { 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); *end = '\0'; write_to_statusbar(concat(order[ORDER_LOAD], "load"), part); @@ -405,7 +421,7 @@ int main(int argc, char *argv[]) { /* Get date & time */ time_t current_time = time(NULL); struct tm *current_tm = localtime(¤t_time); - strftime(part, sizeof(part), time_format, current_tm); + (void)strftime(part, sizeof(part), time_format, current_tm); write_to_statusbar(concat(order[ORDER_TIME], "time"), part); } diff --git a/wmiistatus.h b/wmiistatus.h index e026e64..e4a057c 100644 --- a/wmiistatus.h +++ b/wmiistatus.h @@ -10,7 +10,7 @@ static void write_error_to_statusbar(const char *message); static char *skip_character(char *input, char character, int amount); static char *get_battery_info(void); static char *get_wireless_info(void); -static char *get_ip_address(const char *interface); +static const char *get_ip_address(const char *interface); static char *get_eth_info(void); static bool process_runs(const char *path); #endif -- 2.39.2