paleofetch

commit c7022eb2701c322295b41a208e123ddc813b255d
parent 31e00671f085a5d410442c7db9119035de562163
Author: Sridaran Thoniyil <sri7thon@gmail.com>
Date:   Fri,  8 May 2020 15:04:39 -0400

Revert "Get rid of the second buffer in battery function"

This reverts commit fd9f29ee659a30b4d8de913e7b7077cfad36ff22.

Diffstat:
M
paleofetch.c
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/paleofetch.c b/paleofetch.c
@@ -235,24 +235,24 @@ static char *get_uptime() {
 // returns "<Battery Percentage>% [<Charging | Discharging | Unknown>]"
 static char *get_battery_percentage() {
     // battery status is at most 11 characters: "discharging"
-    char *battery_percentage = malloc(BUF_SIZE / 2);
+    char *battery_percentage = malloc(BUF_SIZE / 2), battery_status[12];
     FILE *battery_percentage_file, *battery_status_file;
 
     if((battery_percentage_file = fopen(BATTERY_DIRECTORY "/capacity", "r")) != NULL) {
         // at most 100, which is 3 characters
-        // read 4 so that the string is null or newline terminated even at 100
-        fread(battery_percentage, 1, 4, battery_percentage_file);
+        fread(battery_percentage, 1, 3, battery_percentage_file);
         int battery_percentage_length = remove_newline_get_length(battery_percentage);
         char* battery_percentage_end = battery_percentage + battery_percentage_length;
         strcat(battery_percentage_end, "% [");
         battery_percentage_end += 3;
         if((battery_status_file = fopen(BATTERY_DIRECTORY "/status", "r")) != NULL) {
-            fread(battery_percentage_end, 1, 12, battery_status_file);
-            int battery_status_length = remove_newline_get_length(battery_percentage_end);
+            fread(battery_status, 1, 12, battery_status_file);
+            int battery_status_length = remove_newline_get_length(battery_status);
+            strcat(battery_percentage_end, battery_status);
             strcat(battery_percentage_end + battery_status_length, "]");
         }
         else {
-            strcat(battery_percentage_end, "Unknown]");
+            strcat(battery_percentage, "Unknown]");
         }
 
         fclose(battery_status_file);