summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Walter <d.walter@0x90.at>2016-03-10 13:09:24 +0100
committerDaniel Walter <d.walter@0x90.at>2016-03-10 13:09:24 +0100
commit50219004d6a631b156be04e4ce4b235622a6db93 (patch)
tree7b91494ab0c79c3d889d09f968e868472806c0d7
parentb51721c65a8ec2067c599c076d2db6b4a29f567a (diff)
return n/a instead of exiting if a specific value cannot be read
-rw-r--r--slstatus.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/slstatus.c b/slstatus.c
index 369c6ff..3297e1d 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -79,7 +79,7 @@ get_battery()
/* open battery now file */
if (!(fp = fopen(batterynowfile, "r"))) {
fprintf(stderr, "Error opening battery file.");
- exit(1);
+ return smprintf("n/a");
}
/* read value */
@@ -91,7 +91,7 @@ get_battery()
/* open battery full file */
if (!(fp = fopen(batteryfullfile, "r"))) {
fprintf(stderr, "Error opening battery file.");
- exit(1);
+ return smprintf("n/a");
}
/* read value */
@@ -117,7 +117,7 @@ get_cpu_temperature()
/* open temperature file */
if (!(fp = fopen(tempfile, "r"))) {
fprintf(stderr, "Could not open temperature file.\n");
- exit(1);
+ return smprintf("n/a");
}
/* extract temperature */
@@ -141,7 +141,7 @@ get_cpu_usage()
/* open stat file */
if (!(fp = fopen("/proc/stat","r"))) {
fprintf(stderr, "Error opening stat file.");
- exit(1);
+ return smprintf("n/a");
}
/* read values */
@@ -156,7 +156,7 @@ get_cpu_usage()
/* open stat file */
if (!(fp = fopen("/proc/stat","r"))) {
fprintf(stderr, "Error opening stat file.");
- exit(1);
+ return smprintf("n/a");
}
/* read values */
@@ -183,8 +183,8 @@ get_datetime()
/* get time in format */
time(&tm);
if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
- fprintf(stderr, "Strftime failed.\n");
- exit(1);
+ fprintf(stderr, "Strftime failed.\n");
+ return smprintf("n/a");
}
/* return time */
@@ -202,7 +202,7 @@ get_ram_usage()
/* open meminfo file */
if (!(fp = fopen("/proc/meminfo", "r"))) {
fprintf(stderr, "Error opening meminfo file.");
- exit(1);
+ return smprintf("n/a");
}
/* read the values */
@@ -283,7 +283,7 @@ get_wifi_signal()
/* open wifi file */
if(!(fp = fopen(path, "r"))) {
fprintf(stderr, "Error opening wifi operstate file.");
- exit(1);
+ return smprintf("n/a");
}
/* read the status */
@@ -294,13 +294,13 @@ get_wifi_signal()
/* check if interface down */
if(strcmp(status, "up\n") != 0){
- return "n/a";
+ return smprintf("n/a");
}
/* open wifi file */
if (!(fp = fopen("/proc/net/wireless", "r"))) {
fprintf(stderr, "Error opening wireless file.");
- exit(1);
+ return smprintf("n/a");
}
/* extract the signal strength */