marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle common errors without dying

Browse Source
This commit is contained in:
Michael Stapelberg 2009-01-09 00:13:18 +01:00
parent 513cfe8f1b
commit 9b7963c4fc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.c
View File

@ -124,8 +124,6 @@ int load_configuration(const char *configfile) {
} }
OPT("battery_path") OPT("battery_path")
{ {
if ((stat(dest_value, &stbuf)) == -1)
die("battery_path contains an invalid path");
battery_path = strdup(dest_value); battery_path = strdup(dest_value);
} }
OPT("run_watch") OPT("run_watch")

4
wmiistatus.c
View File

@ -219,7 +219,7 @@ static char *get_battery_info() {
charging_status_t status = CS_DISCHARGING; charging_status_t status = CS_DISCHARGING;
if ((fd = open(battery_path, O_RDONLY)) == -1) if ((fd = open(battery_path, O_RDONLY)) == -1)
die("Could not open %s", battery_path); return "No battery found";
memset(part, 0, sizeof(part)); memset(part, 0, sizeof(part));
(void)read(fd, buf, sizeof(buf)); (void)read(fd, buf, sizeof(buf));
@ -368,7 +368,7 @@ static char *get_eth_info() {
(void)strcpy(ifr.ifr_name, eth_interface); (void)strcpy(ifr.ifr_name, eth_interface);
if ((err = ioctl(fd, SIOCETHTOOL, &ifr)) == 0) if ((err = ioctl(fd, SIOCETHTOOL, &ifr)) == 0)
ethspeed = (ecmd.speed == 65535 ? 0 : ecmd.speed); 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); (void)close(fd);
} }