From f75ab6d2c11e8a8e18191b087564aedebbeb96c5 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:33 +0200 Subject: Imported Upstream version 1.0.3 --- BatteryMeter.c | 261 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 128 insertions(+), 133 deletions(-) (limited to 'BatteryMeter.c') diff --git a/BatteryMeter.c b/BatteryMeter.c index 071efd5..f2dfa6a 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -36,12 +36,13 @@ int BatteryMeter_attributes[] = { static unsigned long int parseUevent(FILE * file, const char *key) { char line[100]; unsigned long int dValue = 0; + char* saveptr; while (fgets(line, sizeof line, file)) { if (strncmp(line, key, strlen(key)) == 0) { char *value; - strtok(line, "="); - value = strtok(NULL, "="); + strtok_r(line, "=", &saveptr); + value = strtok_r(NULL, "=", &saveptr); dValue = atoi(value); break; } @@ -55,169 +56,160 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short if (!batteryDir) return 0; - typedef struct listLbl { - char *content; - struct listLbl *next; - } list; - - list *myList = NULL; - list *newEntry; - - /* - Some of this is based off of code found in kismet (they claim it came from gkrellm). - Written for multi battery use... - */ - for (const struct dirent* dirEntries = readdir((DIR *) batteryDir); dirEntries; dirEntries = readdir((DIR *) batteryDir)) { - char* entryName = (char *) dirEntries->d_name; + #define MAX_BATTERIES 64 + char* batteries[MAX_BATTERIES]; + unsigned int nBatteries = 0; + memset(batteries, 0, MAX_BATTERIES * sizeof(char*)); + struct dirent result; + struct dirent* dirEntry; + while (nBatteries < MAX_BATTERIES) { + int err = readdir_r(batteryDir, &result, &dirEntry); + if (err || !dirEntry) + break; + char* entryName = dirEntry->d_name; if (strncmp(entryName, "BAT", 3)) continue; - - newEntry = calloc(1, sizeof(list)); - newEntry->next = myList; - newEntry->content = entryName; - myList = newEntry; + batteries[nBatteries] = strdup(entryName); + nBatteries++; } + closedir(batteryDir); unsigned long int total = 0; - for (newEntry = myList; newEntry; newEntry = newEntry->next) { - const char infoPath[30]; - const FILE *file; - char line[50]; + for (unsigned int i = 0; i < nBatteries; i++) { + char infoPath[30]; + snprintf(infoPath, sizeof infoPath, "%s%s/%s", batteryPath, batteries[i], fileName); - snprintf((char *) infoPath, sizeof infoPath, "%s%s/%s", batteryPath, newEntry->content, fileName); - - if ((file = fopen(infoPath, "r")) == NULL) { - closedir(batteryDir); - return 0; + FILE* file = fopen(infoPath, "r"); + if (!file) { + break; } + char line[50] = ""; for (unsigned short int i = 0; i < lineNum; i++) { - fgets(line, sizeof line, (FILE *) file); + char* ok = fgets(line, sizeof line, file); + if (!ok) break; } - fclose((FILE *) file); + fclose(file); - const char *foundNumTmp = String_getToken(line, wordNum); - const unsigned long int foundNum = atoi(foundNumTmp); - free((char *) foundNumTmp); + char *foundNumStr = String_getToken(line, wordNum); + const unsigned long int foundNum = atoi(foundNumStr); + free(foundNumStr); total += foundNum; } - free(myList); - free(newEntry); - closedir(batteryDir); + for (unsigned int i = 0; i < nBatteries; i++) { + free(batteries[i]); + } + return total; } -static ACPresence chkIsOnline() { - FILE *file = NULL; +static ACPresence procAcpiCheck() { ACPresence isOn = AC_ERROR; + const char *power_supplyPath = PROCDIR "/acpi/ac_adapter"; + DIR *power_supplyDir = opendir(power_supplyPath); + if (!power_supplyDir) { + return AC_ERROR; + } - if (access(PROCDIR "/acpi/ac_adapter", F_OK) == 0) { - const char *power_supplyPath = PROCDIR "/acpi/ac_adapter"; - DIR *power_supplyDir = opendir(power_supplyPath); - if (!power_supplyDir) - return AC_ERROR; - - for (const struct dirent *dirEntries = readdir((DIR *) power_supplyDir); dirEntries; dirEntries = readdir((DIR *) power_supplyDir)) { - char* entryName = (char *) dirEntries->d_name; - - if (entryName[0] != 'A') - continue; - - char statePath[50]; - snprintf((char *) statePath, sizeof statePath, "%s/%s/state", power_supplyPath, entryName); - file = fopen(statePath, "r"); - - if (!file) { - isOn = AC_ERROR; - continue; - } - - char line[100]; - fgets(line, sizeof line, file); - line[sizeof(line) - 1] = '\0'; + struct dirent result; + struct dirent* dirEntry; + for (;;) { + int err = readdir_r((DIR *) power_supplyDir, &result, &dirEntry); + if (err || !dirEntry) + break; - if (file) { - fclose(file); - file = NULL; - } + char* entryName = (char *) dirEntry->d_name; - const char *isOnline = String_getToken(line, 2); + if (entryName[0] != 'A') + continue; - if (strcmp(isOnline, "on-line") == 0) { - free((char *) isOnline); - isOn = AC_PRESENT; - // If any AC adapter is being used then stop - break; + char statePath[50]; + snprintf((char *) statePath, sizeof statePath, "%s/%s/state", power_supplyPath, entryName); + FILE* file = fopen(statePath, "r"); - } else { - isOn = AC_ABSENT; - } - free((char *) isOnline); + if (!file) { + isOn = AC_ERROR; + continue; } - if (power_supplyDir) - closedir(power_supplyDir); - - } else { - - const char *power_supplyPath = "/sys/class/power_supply"; - - if (access("/sys/class/power_supply", F_OK) == 0) { - const struct dirent *dirEntries; - DIR *power_supplyDir = opendir(power_supplyPath); - char *entryName; + char line[100]; + fgets(line, sizeof line, file); + line[sizeof(line) - 1] = '\0'; - if (!power_supplyDir) { - return AC_ERROR; - } - - for (dirEntries = readdir((DIR *) power_supplyDir); dirEntries; dirEntries = readdir((DIR *) power_supplyDir)) { - entryName = (char *) dirEntries->d_name; + fclose(file); - if (strncmp(entryName, "A", 1)) { - continue; - } + const char *isOnline = String_getToken(line, 2); - char onlinePath[50]; - snprintf((char *) onlinePath, sizeof onlinePath, "%s/%s/online", power_supplyPath, entryName); - file = fopen(onlinePath, "r"); + if (strcmp(isOnline, "on-line") == 0) { + isOn = AC_PRESENT; + } else { + isOn = AC_ABSENT; + } + free((char *) isOnline); + if (isOn == AC_PRESENT) { + break; + } + } - if (!file) { - isOn = AC_ERROR; - continue; - } + if (power_supplyDir) + closedir(power_supplyDir); + return isOn; +} - isOn = (fgetc(file) - '0'); +static ACPresence sysCheck() { + ACPresence isOn = AC_ERROR; + const char *power_supplyPath = "/sys/class/power_supply"; + DIR *power_supplyDir = opendir(power_supplyPath); + if (!power_supplyDir) { + return AC_ERROR; + } - if (file) { - fclose(file); - file = NULL; - } + struct dirent result; + struct dirent* dirEntry; + for (;;) { + int err = readdir_r((DIR *) power_supplyDir, &result, &dirEntry); + if (err || !dirEntry) + break; - if (isOn == AC_PRESENT) { - // If any AC adapter is being used then stop - break; - } else { - continue; - } + char* entryName = (char *) dirEntry->d_name; + if (strncmp(entryName, "A", 1)) { + continue; + } + char onlinePath[50]; + snprintf((char *) onlinePath, sizeof onlinePath, "%s/%s/online", power_supplyPath, entryName); + FILE* file = fopen(onlinePath, "r"); + if (!file) { + isOn = AC_ERROR; + } else { + isOn = (fgetc(file) - '0'); + fclose(file); + if (isOn == AC_PRESENT) { + // If any AC adapter is being used then stop + break; } - - if (power_supplyDir) - closedir(power_supplyDir); } } - // Just in case :-) - if (file) - fclose(file); + if (power_supplyDir) + closedir(power_supplyDir); return isOn; } +static ACPresence chkIsOnline() { + if (access(PROCDIR "/acpi/ac_adapter", F_OK) == 0) { + return procAcpiCheck(); + } else if (access("/sys/class/power_supply", F_OK) == 0) { + return sysCheck(); + } else { + return AC_ERROR; + } +} + static double getProcBatData() { const unsigned long int totalFull = parseBatInfo("info", 3, 4); if (totalFull == 0) @@ -227,24 +219,25 @@ static double getProcBatData() { if (totalRemain == 0) return 0; - double percent = totalFull > 0 ? ((double) totalRemain * 100) / (double) totalFull : 0; - return percent; + return totalRemain * 100.0 / (double) totalFull; } static double getSysBatData() { - const struct dirent *dirEntries; const char *power_supplyPath = "/sys/class/power_supply/"; DIR *power_supplyDir = opendir(power_supplyPath); if (!power_supplyDir) return 0; - char *entryName; - unsigned long int totalFull = 0; unsigned long int totalRemain = 0; - for (dirEntries = readdir((DIR *) power_supplyDir); dirEntries; dirEntries = readdir((DIR *) power_supplyDir)) { - entryName = (char *) dirEntries->d_name; + struct dirent result; + struct dirent* dirEntry; + for (;;) { + int err = readdir_r((DIR *) power_supplyDir, &result, &dirEntry); + if (err || !dirEntry) + break; + char* entryName = (char *) dirEntry->d_name; if (strncmp(entryName, "BAT", 3)) { continue; @@ -328,11 +321,13 @@ static void BatteryMeter_setValues(Meter * this, char *buffer, int len) { return; } -MeterType BatteryMeter = { +MeterClass BatteryMeter_class = { + .super = { + .extends = Class(Meter), + .delete = Meter_delete + }, .setValues = BatteryMeter_setValues, - .display = NULL, - .mode = TEXT_METERMODE, - .items = 1, + .defaultMode = TEXT_METERMODE, .total = 100.0, .attributes = BatteryMeter_attributes, .name = "Battery", -- cgit v1.2.3