Use indentation to increase readability
Granted, this style is definitely not common, but for the short utility-functions of this program it's just the right choice. This provides great flexibility, such that in the long run, it will be possible to also share code between the OS-implementations. This also keeps the state-keeping at a minimum and makes it clearer which functions are implemented on which OS without having to jiggle around with too many files in the process.
This commit is contained in:
Laslo Hunhold
Aaron Marcher
parent
42edfea89a
commit
9750a3d731
2
LICENSE
2
LICENSE
@ -11,7 +11,7 @@ Copyright 2016-2017 Quentin Rameau <quinq@fifth.space>
|
||||
Copyright 2016 Mike Coddington <mike@coddington.us>
|
||||
Copyright 2016-2018 parazyd <parazyd@dyne.org>
|
||||
Copyright 2017 Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Copyright 2017 Laslo Hunhold <dev@frign.de>
|
||||
Copyright 2017-2018 Laslo Hunhold <dev@frign.de>
|
||||
Copyright 2018 Darron Anderson <darronanderson@protonmail.com>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
|
||||
@ -2,68 +2,39 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if defined(__linux__)
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#elif defined(__OpenBSD__)
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <machine/apmvar.h>
|
||||
#endif
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
battery_perc(const char *bat)
|
||||
{
|
||||
#include <limits.h>
|
||||
|
||||
const char *
|
||||
battery_perc(const char *bat)
|
||||
{
|
||||
int perc;
|
||||
char path[PATH_MAX];
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
|
||||
bat, "/capacity");
|
||||
return (pscanf(path, "%i", &perc) == 1) ?
|
||||
bprintf("%d", perc) : NULL;
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
const char *
|
||||
battery_perc(const char *null)
|
||||
{
|
||||
struct apm_power_info apm_info;
|
||||
int fd;
|
||||
|
||||
fd = open("/dev/apm", O_RDONLY);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
|
||||
fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
close(fd);
|
||||
|
||||
return bprintf("%d", apm_info.battery_life);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
battery_power(const char *bat)
|
||||
{
|
||||
const char *
|
||||
battery_power(const char *bat)
|
||||
{
|
||||
int watts;
|
||||
char path[PATH_MAX];
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
|
||||
bat, "/power_now");
|
||||
return (pscanf(path, "%i", &watts) == 1) ?
|
||||
bprintf("%d", (watts + 500000) / 1000000) : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
battery_state(const char *bat)
|
||||
{
|
||||
const char *
|
||||
battery_state(const char *bat)
|
||||
{
|
||||
struct {
|
||||
char *state;
|
||||
char *symbol;
|
||||
@ -76,7 +47,8 @@ battery_state(const char *bat)
|
||||
size_t i;
|
||||
char path[PATH_MAX], state[12];
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
|
||||
bat, "/status");
|
||||
if (pscanf(path, "%12s", state) != 1) {
|
||||
return NULL;
|
||||
}
|
||||
@ -87,5 +59,33 @@ battery_state(const char *bat)
|
||||
}
|
||||
}
|
||||
return (i == LEN(map)) ? "?" : map[i].symbol;
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
#include <fcntl.h>
|
||||
#include <machine/apmvar.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
const char *
|
||||
battery_perc(const char *null)
|
||||
{
|
||||
struct apm_power_info apm_info;
|
||||
int fd;
|
||||
|
||||
fd = open("/dev/apm", O_RDONLY);
|
||||
if (fd < 0) {
|
||||
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
|
||||
fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
|
||||
strerror(errno));
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
close(fd);
|
||||
|
||||
return bprintf("%d", apm_info.battery_life);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -2,34 +2,31 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if defined(__OpenBSD__)
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
cpu_freq(void)
|
||||
{
|
||||
const char *
|
||||
cpu_freq(void)
|
||||
{
|
||||
int freq;
|
||||
|
||||
return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
|
||||
"%i", &freq) == 1) ?
|
||||
bprintf("%d", (freq + 500) / 1000) : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
cpu_perc(void)
|
||||
{
|
||||
const char *
|
||||
cpu_perc(void)
|
||||
{
|
||||
int perc;
|
||||
static long double a[7];
|
||||
static int valid;
|
||||
long double b[7];
|
||||
|
||||
memcpy(b, a, sizeof(b));
|
||||
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
|
||||
&a[3], &a[4], &a[5], &a[6]) != 7) {
|
||||
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
|
||||
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) != 7) {
|
||||
return NULL;
|
||||
}
|
||||
if (!valid) {
|
||||
@ -37,23 +34,26 @@ cpu_perc(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
perc = 100 * ((b[0]+b[1]+b[2]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[5]+a[6])) /
|
||||
((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
|
||||
perc = 100 *
|
||||
((b[0]+b[1]+b[2]+b[5]+b[6]) -
|
||||
(a[0]+a[1]+a[2]+a[5]+a[6])) /
|
||||
((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) -
|
||||
(a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
|
||||
|
||||
return bprintf("%d", perc);
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
cpu_iowait(void)
|
||||
{
|
||||
const char *
|
||||
cpu_iowait(void)
|
||||
{
|
||||
int perc;
|
||||
static int valid;
|
||||
static long double a[7];
|
||||
long double b[7];
|
||||
|
||||
memcpy(b, a, sizeof(b));
|
||||
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
|
||||
&a[3], &a[4], &a[5], &a[6]) != 7) {
|
||||
if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
|
||||
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) != 7) {
|
||||
return NULL;
|
||||
}
|
||||
if (!valid) {
|
||||
@ -62,14 +62,17 @@ cpu_iowait(void)
|
||||
}
|
||||
|
||||
perc = 100 * ((b[4]) - (a[4])) /
|
||||
((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
|
||||
((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) -
|
||||
(a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
|
||||
|
||||
return bprintf("%d", perc);
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
const char *
|
||||
cpu_freq(void)
|
||||
{
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
const char *
|
||||
cpu_freq(void)
|
||||
{
|
||||
int freq, mib[2];
|
||||
size_t size;
|
||||
|
||||
@ -79,10 +82,11 @@ cpu_freq(void)
|
||||
size = sizeof(freq);
|
||||
|
||||
if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
|
||||
fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
|
||||
fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return bprintf("%d", freq);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,15 +1,18 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#if defined(__linux__)
|
||||
#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "../util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
entropy(void)
|
||||
{
|
||||
const char *
|
||||
entropy(void)
|
||||
{
|
||||
int num;
|
||||
|
||||
return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
|
||||
return (pscanf("/proc/sys/kernel/random/entropy_avail",
|
||||
"%d", &num) == 1) ?
|
||||
bprintf("%d", num) : NULL;
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
/* unimplemented */
|
||||
#endif
|
||||
|
||||
@ -1,27 +1,21 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdio.h>
|
||||
#if defined (__OpenBSD__)
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
ram_free(void)
|
||||
{
|
||||
const char *
|
||||
ram_free(void)
|
||||
{
|
||||
long free;
|
||||
|
||||
return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
|
||||
bprintf("%f", (float)free / 1024 / 1024) : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_perc(void)
|
||||
{
|
||||
const char *
|
||||
ram_perc(void)
|
||||
{
|
||||
long total, free, buffers, cached;
|
||||
|
||||
return (pscanf("/proc/meminfo",
|
||||
@ -30,22 +24,23 @@ ram_perc(void)
|
||||
"MemAvailable: %ld kB\nBuffers: %ld kB\n"
|
||||
"Cached: %ld kB\n",
|
||||
&total, &free, &buffers, &buffers, &cached) == 5) ?
|
||||
bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
|
||||
bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
|
||||
total) :
|
||||
NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_total(void)
|
||||
{
|
||||
const char *
|
||||
ram_total(void)
|
||||
{
|
||||
long total;
|
||||
|
||||
return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
|
||||
bprintf("%f", (float)total / 1024 / 1024) : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_used(void)
|
||||
{
|
||||
const char *
|
||||
ram_used(void)
|
||||
{
|
||||
long total, free, buffers, cached;
|
||||
|
||||
return (pscanf("/proc/meminfo",
|
||||
@ -54,40 +49,47 @@ ram_used(void)
|
||||
"MemAvailable: %ld kB\nBuffers: %ld kB\n"
|
||||
"Cached: %ld kB\n",
|
||||
&total, &free, &buffers, &buffers, &cached) == 5) ?
|
||||
bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
|
||||
bprintf("%f", (float)(total - free - buffers - cached) /
|
||||
1024 / 1024) :
|
||||
NULL;
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
inline int
|
||||
load_uvmexp(struct uvmexp *uvmexp)
|
||||
{
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
inline int
|
||||
load_uvmexp(struct uvmexp *uvmexp)
|
||||
{
|
||||
int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
|
||||
size_t size;
|
||||
|
||||
size = sizeof(*uvmexp);
|
||||
|
||||
return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_free(void)
|
||||
{
|
||||
const char *
|
||||
ram_free(void)
|
||||
{
|
||||
struct uvmexp uvmexp;
|
||||
float free;
|
||||
int free_pages;
|
||||
|
||||
if (load_uvmexp(&uvmexp)) {
|
||||
free_pages = uvmexp.npages - uvmexp.active;
|
||||
free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
|
||||
free = (double) (free_pages * uvmexp.pagesize) / 1024 /
|
||||
1024 / 1024;
|
||||
return bprintf("%f", free);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_perc(void)
|
||||
{
|
||||
const char *
|
||||
ram_perc(void)
|
||||
{
|
||||
struct uvmexp uvmexp;
|
||||
int percent;
|
||||
|
||||
@ -97,33 +99,35 @@ ram_perc(void)
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_total(void)
|
||||
{
|
||||
const char *
|
||||
ram_total(void)
|
||||
{
|
||||
struct uvmexp uvmexp;
|
||||
float total;
|
||||
|
||||
if (load_uvmexp(&uvmexp)) {
|
||||
total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
|
||||
total = (double) (uvmexp.npages * uvmexp.pagesize) /
|
||||
1024 / 1024 / 1024;
|
||||
return bprintf("%f", total);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
ram_used(void)
|
||||
{
|
||||
const char *
|
||||
ram_used(void)
|
||||
{
|
||||
struct uvmexp uvmexp;
|
||||
float used;
|
||||
|
||||
if (load_uvmexp(&uvmexp)) {
|
||||
used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
|
||||
used = (double) (uvmexp.active * uvmexp.pagesize) /
|
||||
1024 / 1024 / 1024;
|
||||
return bprintf("%f", used);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#if defined(__linux__)
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
swap_free(void)
|
||||
{
|
||||
const char *
|
||||
swap_free(void)
|
||||
{
|
||||
long total, free;
|
||||
FILE *fp;
|
||||
size_t bytes_read;
|
||||
@ -16,12 +16,15 @@ swap_free(void)
|
||||
|
||||
fp = fopen("/proc/meminfo", "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
|
||||
fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
@ -36,11 +39,11 @@ swap_free(void)
|
||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||
|
||||
return bprintf("%f", (float)free / 1024 / 1024);
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
swap_perc(void)
|
||||
{
|
||||
const char *
|
||||
swap_perc(void)
|
||||
{
|
||||
long total, free, cached;
|
||||
FILE *fp;
|
||||
size_t bytes_read;
|
||||
@ -48,12 +51,15 @@ swap_perc(void)
|
||||
|
||||
fp = fopen("/proc/meminfo", "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
|
||||
fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
@ -72,11 +78,11 @@ swap_perc(void)
|
||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||
|
||||
return bprintf("%d", 100 * (total - free - cached) / total);
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
swap_total(void)
|
||||
{
|
||||
const char *
|
||||
swap_total(void)
|
||||
{
|
||||
long total;
|
||||
FILE *fp;
|
||||
size_t bytes_read;
|
||||
@ -84,11 +90,14 @@ swap_total(void)
|
||||
|
||||
fp = fopen("/proc/meminfo", "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
|
||||
fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
@ -99,11 +108,11 @@ swap_total(void)
|
||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||
|
||||
return bprintf("%f", (float)total / 1024 / 1024);
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
swap_used(void)
|
||||
{
|
||||
const char *
|
||||
swap_used(void)
|
||||
{
|
||||
long total, free, cached;
|
||||
FILE *fp;
|
||||
size_t bytes_read;
|
||||
@ -111,11 +120,14 @@ swap_used(void)
|
||||
|
||||
fp = fopen("/proc/meminfo", "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n", strerror(errno));
|
||||
fprintf(stderr, "fopen '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n", strerror(errno));
|
||||
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
|
||||
fp)) == 0) {
|
||||
fprintf(stderr, "fread '/proc/meminfo': %s\n",
|
||||
strerror(errno));
|
||||
fclose(fp);
|
||||
return NULL;
|
||||
}
|
||||
@ -134,5 +146,7 @@ swap_used(void)
|
||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||
|
||||
return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
/* unimplemented */
|
||||
#endif
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if defined(__OpenBSD__)
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/sensors.h>
|
||||
#endif
|
||||
#include <stddef.h>
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
temp(const char *file)
|
||||
{
|
||||
const char *
|
||||
temp(const char *file)
|
||||
{
|
||||
int temp;
|
||||
|
||||
return (pscanf(file, "%d", &temp) == 1) ?
|
||||
bprintf("%d", temp / 1000) : NULL;
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
const char *
|
||||
temp(const char *null)
|
||||
{
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/sensors.h>
|
||||
|
||||
const char *
|
||||
temp(const char *null)
|
||||
{
|
||||
int mib[5];
|
||||
size_t size;
|
||||
struct sensor temp;
|
||||
@ -36,10 +36,12 @@ temp(const char *null)
|
||||
size = sizeof(temp);
|
||||
|
||||
if (sysctl(mib, 5, &temp, &size, NULL, 0) == -1) {
|
||||
fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", strerror(errno));
|
||||
fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
|
||||
}
|
||||
/* kelvin to celsius */
|
||||
return bprintf("%d", (temp.value - 273150000) / 1000000);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -2,19 +2,15 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if defined(__linux__)
|
||||
#include <sys/sysinfo.h>
|
||||
#elif defined(__OpenBSD__)
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include "../util.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
const char *
|
||||
uptime(void)
|
||||
{
|
||||
#include <sys/sysinfo.h>
|
||||
|
||||
const char *
|
||||
uptime(void)
|
||||
{
|
||||
int h;
|
||||
int m;
|
||||
int uptime = 0;
|
||||
@ -27,11 +23,14 @@ uptime(void)
|
||||
m = (uptime - h * 3600) / 60;
|
||||
|
||||
return bprintf("%dh %dm", h, m);
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
const char *
|
||||
uptime(void)
|
||||
{
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
const char *
|
||||
uptime(void)
|
||||
{
|
||||
int h;
|
||||
int m;
|
||||
int uptime = 0;
|
||||
@ -59,5 +58,5 @@ uptime(void)
|
||||
m = (uptime - h * 3600) / 60;
|
||||
|
||||
return bprintf("%dh %dm", h, m);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#if defined(__linux__)
|
||||
#include <errno.h>
|
||||
#include <ifaddrs.h>
|
||||
#include <linux/wireless.h>
|
||||
#include <sys/socket.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <ifaddrs.h>
|
||||
#include <linux/wireless.h>
|
||||
#include <sys/socket.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "../util.h"
|
||||
#include "../util.h"
|
||||
|
||||
const char *
|
||||
wifi_perc(const char *iface)
|
||||
{
|
||||
const char *
|
||||
wifi_perc(const char *iface)
|
||||
{
|
||||
int i, cur;
|
||||
float perc;
|
||||
int total = 70; /* the max of /proc/net/wireless */
|
||||
@ -23,10 +23,12 @@ wifi_perc(const char *iface)
|
||||
char status[5];
|
||||
FILE *fp;
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
|
||||
snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface,
|
||||
"/operstate");
|
||||
fp = fopen(path, "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
|
||||
fprintf(stderr, "fopen '%s': %s\n", path,
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
p = fgets(status, 5, fp);
|
||||
@ -37,7 +39,8 @@ wifi_perc(const char *iface)
|
||||
|
||||
fp = fopen("/proc/net/wireless", "r");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno));
|
||||
fprintf(stderr, "fopen '/proc/net/wireless': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -53,16 +56,17 @@ wifi_perc(const char *iface)
|
||||
return NULL;
|
||||
|
||||
datastart = (datastart+(strlen(iface)+1));
|
||||
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &cur);
|
||||
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t "
|
||||
"%*d\t\t%*d\t\t %*d\t %*d\t\t %*d", &cur);
|
||||
|
||||
perc = (float)cur / total * 100.0;
|
||||
|
||||
return bprintf("%.0f", perc);
|
||||
}
|
||||
}
|
||||
|
||||
const char *
|
||||
wifi_essid(const char *iface)
|
||||
{
|
||||
const char *
|
||||
wifi_essid(const char *iface)
|
||||
{
|
||||
static char id[IW_ESSID_MAX_SIZE+1];
|
||||
int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
struct iwreq wreq;
|
||||
@ -72,12 +76,14 @@ wifi_essid(const char *iface)
|
||||
snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
|
||||
|
||||
if (sockfd == -1) {
|
||||
fprintf(stderr, "socket 'AF_INET': %s\n", strerror(errno));
|
||||
fprintf(stderr, "socket 'AF_INET': %s\n",
|
||||
strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
wreq.u.essid.pointer = id;
|
||||
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
|
||||
fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
|
||||
fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n",
|
||||
strerror(errno));
|
||||
close(sockfd);
|
||||
return NULL;
|
||||
}
|
||||
@ -88,5 +94,7 @@ wifi_essid(const char *iface)
|
||||
return NULL;
|
||||
else
|
||||
return id;
|
||||
}
|
||||
}
|
||||
#elif defined(__OpenBSD__)
|
||||
/* unimplemented */
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user