From 9b7963c4fc9e458e54e757cc9ee4499518fe4528 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 9 Jan 2009 00:13:18 +0100 Subject: [PATCH] Handle common errors without dying --- config.c | 2 -- wmiistatus.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config.c b/config.c index ed5c96f..e77ff2e 100644 --- a/config.c +++ b/config.c @@ -124,8 +124,6 @@ int load_configuration(const char *configfile) { } OPT("battery_path") { - if ((stat(dest_value, &stbuf)) == -1) - die("battery_path contains an invalid path"); battery_path = strdup(dest_value); } OPT("run_watch") diff --git a/wmiistatus.c b/wmiistatus.c index 10b1b33..1c9360f 100644 --- a/wmiistatus.c +++ b/wmiistatus.c @@ -219,7 +219,7 @@ static char *get_battery_info() { charging_status_t status = CS_DISCHARGING; if ((fd = open(battery_path, O_RDONLY)) == -1) - die("Could not open %s", battery_path); + return "No battery found"; memset(part, 0, sizeof(part)); (void)read(fd, buf, sizeof(buf)); @@ -368,7 +368,7 @@ static char *get_eth_info() { (void)strcpy(ifr.ifr_name, eth_interface); if ((err = ioctl(fd, SIOCETHTOOL, &ifr)) == 0) ethspeed = (ecmd.speed == 65535 ? 0 : ecmd.speed); - else write_error_to_statusbar("Could not get interface speed. Insufficient privileges?"); + else get_ethspeed = false; (void)close(fd); } -- 2.39.5