From: Tommie Gannert <tommie@gannert.se>
Date: Tue, 16 Aug 2016 08:18:05 +0000 (+0100)
Subject: Match trailing equal sign in slurp_battery_info.
X-Git-Tag: 2.11~17^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ac8998ef03374abca56da9929812c6fcba936031;p=i3%2Fi3status

Match trailing equal sign in slurp_battery_info.

Should make it more resilient to future ambiguities in uevent.
---

diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index c20e87e..27473a2 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -65,21 +65,21 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
         if (*walk != '=')
             continue;
 
-        if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW")) {
+        if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW=")) {
             watt_as_unit = true;
             batt_info->remaining = atoi(walk + 1);
-        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) {
+        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW=")) {
             watt_as_unit = false;
             batt_info->remaining = atoi(walk + 1);
-        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
+        } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW="))
             batt_info->present_rate = abs(atoi(walk + 1));
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW"))
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW="))
             voltage = abs(atoi(walk + 1));
         /* on some systems POWER_SUPPLY_POWER_NOW does not exist, but actually
          * it is the same as POWER_SUPPLY_CURRENT_NOW but with μWh as
          * unit instead of μAh. We will calculate it as we need it
          * later. */
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW"))
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW="))
             batt_info->present_rate = abs(atoi(walk + 1));
         else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
             batt_info->status = CS_CHARGING;
@@ -89,11 +89,11 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
             batt_info->status = CS_DISCHARGING;
         else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS="))
             batt_info->status = CS_UNKNOWN;
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") ||
-                 BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN"))
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN=") ||
+                 BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN="))
             batt_info->full_design = atoi(walk + 1);
-        else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") ||
-                 BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL"))
+        else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL=") ||
+                 BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL="))
             batt_info->full_last = atoi(walk + 1);
     }