caskd
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return n/a instead of exiting if a specific value cannot be read

This commit is contained in:
Daniel Walter 2016-03-10 13:09:24 +01:00
parent b51721c65a
commit 50219004d6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slstatus.c
View File

@ -79,7 +79,7 @@ get_battery()
/* open battery now file */ /* open battery now file */
if (!(fp = fopen(batterynowfile, "r"))) { if (!(fp = fopen(batterynowfile, "r"))) {
fprintf(stderr, "Error opening battery file."); fprintf(stderr, "Error opening battery file.");
exit(1); return smprintf("n/a");
} }
/* read value */ /* read value */
@ -91,7 +91,7 @@ get_battery()
/* open battery full file */ /* open battery full file */
if (!(fp = fopen(batteryfullfile, "r"))) { if (!(fp = fopen(batteryfullfile, "r"))) {
fprintf(stderr, "Error opening battery file."); fprintf(stderr, "Error opening battery file.");
exit(1); return smprintf("n/a");
} }
/* read value */ /* read value */
@ -117,7 +117,7 @@ get_cpu_temperature()
/* open temperature file */ /* open temperature file */
if (!(fp = fopen(tempfile, "r"))) { if (!(fp = fopen(tempfile, "r"))) {
fprintf(stderr, "Could not open temperature file.\n"); fprintf(stderr, "Could not open temperature file.\n");
exit(1); return smprintf("n/a");
} }
/* extract temperature */ /* extract temperature */
@ -141,7 +141,7 @@ get_cpu_usage()
/* open stat file */ /* open stat file */
if (!(fp = fopen("/proc/stat","r"))) { if (!(fp = fopen("/proc/stat","r"))) {
fprintf(stderr, "Error opening stat file."); fprintf(stderr, "Error opening stat file.");
exit(1); return smprintf("n/a");
} }
/* read values */ /* read values */
@ -156,7 +156,7 @@ get_cpu_usage()
/* open stat file */ /* open stat file */
if (!(fp = fopen("/proc/stat","r"))) { if (!(fp = fopen("/proc/stat","r"))) {
fprintf(stderr, "Error opening stat file."); fprintf(stderr, "Error opening stat file.");
exit(1); return smprintf("n/a");
} }
/* read values */ /* read values */
@ -184,7 +184,7 @@ get_datetime()
time(&tm); time(&tm);
if(!strftime(buf, bufsize, timeformat, localtime(&tm))) { if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
fprintf(stderr, "Strftime failed.\n"); fprintf(stderr, "Strftime failed.\n");
exit(1); return smprintf("n/a");
} }
/* return time */ /* return time */
@ -202,7 +202,7 @@ get_ram_usage()
/* open meminfo file */ /* open meminfo file */
if (!(fp = fopen("/proc/meminfo", "r"))) { if (!(fp = fopen("/proc/meminfo", "r"))) {
fprintf(stderr, "Error opening meminfo file."); fprintf(stderr, "Error opening meminfo file.");
exit(1); return smprintf("n/a");
} }
/* read the values */ /* read the values */
@ -283,7 +283,7 @@ get_wifi_signal()
/* open wifi file */ /* open wifi file */
if(!(fp = fopen(path, "r"))) { if(!(fp = fopen(path, "r"))) {
fprintf(stderr, "Error opening wifi operstate file."); fprintf(stderr, "Error opening wifi operstate file.");
exit(1); return smprintf("n/a");
} }
/* read the status */ /* read the status */
@ -294,13 +294,13 @@ get_wifi_signal()
/* check if interface down */ /* check if interface down */
if(strcmp(status, "up\n") != 0){ if(strcmp(status, "up\n") != 0){
return "n/a"; return smprintf("n/a");
} }
/* open wifi file */ /* open wifi file */
if (!(fp = fopen("/proc/net/wireless", "r"))) { if (!(fp = fopen("/proc/net/wireless", "r"))) {
fprintf(stderr, "Error opening wireless file."); fprintf(stderr, "Error opening wireless file.");
exit(1); return smprintf("n/a");
} }
/* extract the signal strength */ /* extract the signal strength */