@@ -5,12 +5,12 @@ | |||||
#include "../util.h" | #include "../util.h" | ||||
const char * | const char * | ||||
disk_free(const char *mnt) | |||||
disk_free(const char *path) | |||||
{ | { | ||||
struct statvfs fs; | struct statvfs fs; | ||||
if (statvfs(mnt, &fs) < 0) { | |||||
warn("statvfs '%s':", mnt); | |||||
if (statvfs(path, &fs) < 0) { | |||||
warn("statvfs '%s':", path); | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -18,12 +18,12 @@ disk_free(const char *mnt) | |||||
} | } | ||||
const char * | const char * | ||||
disk_perc(const char *mnt) | |||||
disk_perc(const char *path) | |||||
{ | { | ||||
struct statvfs fs; | struct statvfs fs; | ||||
if (statvfs(mnt, &fs) < 0) { | |||||
warn("statvfs '%s':", mnt); | |||||
if (statvfs(path, &fs) < 0) { | |||||
warn("statvfs '%s':", path); | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -32,12 +32,12 @@ disk_perc(const char *mnt) | |||||
} | } | ||||
const char * | const char * | ||||
disk_total(const char *mnt) | |||||
disk_total(const char *path) | |||||
{ | { | ||||
struct statvfs fs; | struct statvfs fs; | ||||
if (statvfs(mnt, &fs) < 0) { | |||||
warn("statvfs '%s':", mnt); | |||||
if (statvfs(path, &fs) < 0) { | |||||
warn("statvfs '%s':", path); | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -45,12 +45,12 @@ disk_total(const char *mnt) | |||||
} | } | ||||
const char * | const char * | ||||
disk_used(const char *mnt) | |||||
disk_used(const char *path) | |||||
{ | { | ||||
struct statvfs fs; | struct statvfs fs; | ||||
if (statvfs(mnt, &fs) < 0) { | |||||
warn("statvfs '%s':", mnt); | |||||
if (statvfs(path, &fs) < 0) { | |||||
warn("statvfs '%s':", path); | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -11,7 +11,7 @@ | |||||
#include "../util.h" | #include "../util.h" | ||||
static const char * | static const char * | ||||
ip(const char *iface, unsigned short sa_family) | |||||
ip(const char *interface, unsigned short sa_family) | |||||
{ | { | ||||
struct ifaddrs *ifaddr, *ifa; | struct ifaddrs *ifaddr, *ifa; | ||||
int s; | int s; | ||||
@@ -28,7 +28,7 @@ ip(const char *iface, unsigned short sa_family) | |||||
} | } | ||||
s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), | s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), | ||||
host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); | host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); | ||||
if (!strcmp(ifa->ifa_name, iface) && | |||||
if (!strcmp(ifa->ifa_name, interface) && | |||||
(ifa->ifa_addr->sa_family == sa_family)) { | (ifa->ifa_addr->sa_family == sa_family)) { | ||||
freeifaddrs(ifaddr); | freeifaddrs(ifaddr); | ||||
if (s != 0) { | if (s != 0) { | ||||
@@ -45,13 +45,13 @@ ip(const char *iface, unsigned short sa_family) | |||||
} | } | ||||
const char * | const char * | ||||
ipv4(const char *iface) | |||||
ipv4(const char *interface) | |||||
{ | { | ||||
return ip(iface, AF_INET); | |||||
return ip(interface, AF_INET); | |||||
} | } | ||||
const char * | const char * | ||||
ipv6(const char *iface) | |||||
ipv6(const char *interface) | |||||
{ | { | ||||
return ip(iface, AF_INET6); | |||||
return ip(interface, AF_INET6); | |||||
} | } |
@@ -6,14 +6,14 @@ | |||||
#include "../util.h" | #include "../util.h" | ||||
const char * | const char * | ||||
num_files(const char *dir) | |||||
num_files(const char *path) | |||||
{ | { | ||||
struct dirent *dp; | struct dirent *dp; | ||||
DIR *fd; | DIR *fd; | ||||
int num; | int num; | ||||
if (!(fd = opendir(dir))) { | |||||
warn("opendir '%s':", dir); | |||||
if (!(fd = opendir(path))) { | |||||
warn("opendir '%s':", path); | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -13,7 +13,7 @@ | |||||
#include <linux/wireless.h> | #include <linux/wireless.h> | ||||
const char * | const char * | ||||
wifi_perc(const char *iface) | |||||
wifi_perc(const char *interface) | |||||
{ | { | ||||
int i, cur; | int i, cur; | ||||
int total = 70; /* the max of /proc/net/wireless */ | int total = 70; /* the max of /proc/net/wireless */ | ||||
@@ -24,7 +24,7 @@ | |||||
if (esnprintf(path, sizeof(path), | if (esnprintf(path, sizeof(path), | ||||
"/sys/class/net/%s/operstate", | "/sys/class/net/%s/operstate", | ||||
iface) < 0) { | |||||
interface) < 0) { | |||||
return NULL; | return NULL; | ||||
} | } | ||||
if (!(fp = fopen(path, "r"))) { | if (!(fp = fopen(path, "r"))) { | ||||
@@ -51,11 +51,11 @@ | |||||
return NULL; | return NULL; | ||||
} | } | ||||
if (!(datastart = strstr(buf, iface))) { | |||||
if (!(datastart = strstr(buf, interface))) { | |||||
return NULL; | return NULL; | ||||
} | } | ||||
datastart = (datastart+(strlen(iface)+1)); | |||||
datastart = (datastart+(strlen(interface)+1)); | |||||
sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t " | sscanf(datastart + 1, " %*d %d %*d %*d\t\t %*d\t " | ||||
"%*d\t\t%*d\t\t %*d\t %*d\t\t %*d", &cur); | "%*d\t\t%*d\t\t %*d\t %*d\t\t %*d", &cur); | ||||
@@ -63,7 +63,7 @@ | |||||
} | } | ||||
const char * | const char * | ||||
wifi_essid(const char *iface) | |||||
wifi_essid(const char *interface) | |||||
{ | { | ||||
static char id[IW_ESSID_MAX_SIZE+1]; | static char id[IW_ESSID_MAX_SIZE+1]; | ||||
int sockfd; | int sockfd; | ||||
@@ -72,7 +72,7 @@ | |||||
memset(&wreq, 0, sizeof(struct iwreq)); | memset(&wreq, 0, sizeof(struct iwreq)); | ||||
wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; | wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; | ||||
if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), | if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), | ||||
"%s", iface) < 0) { | |||||
"%s", interface) < 0) { | |||||
return NULL; | return NULL; | ||||
} | } | ||||
@@ -105,7 +105,7 @@ | |||||
#include <sys/types.h> | #include <sys/types.h> | ||||
static int | static int | ||||
load_ieee80211_nodereq(const char *iface, struct ieee80211_nodereq *nr) | |||||
load_ieee80211_nodereq(const char *interface, struct ieee80211_nodereq *nr) | |||||
{ | { | ||||
struct ieee80211_bssid bssid; | struct ieee80211_bssid bssid; | ||||
int sockfd; | int sockfd; | ||||
@@ -117,7 +117,7 @@ | |||||
warn("socket 'AF_INET':"); | warn("socket 'AF_INET':"); | ||||
return 0; | return 0; | ||||
} | } | ||||
strlcpy(bssid.i_name, iface, sizeof(bssid.i_name)); | |||||
strlcpy(bssid.i_name, interface, sizeof(bssid.i_name)); | |||||
if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) { | if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) { | ||||
warn("ioctl 'SIOCG80211BSSID':"); | warn("ioctl 'SIOCG80211BSSID':"); | ||||
close(sockfd); | close(sockfd); | ||||
@@ -129,7 +129,7 @@ | |||||
close(sockfd); | close(sockfd); | ||||
return 0; | return 0; | ||||
} | } | ||||
strlcpy(nr->nr_ifname, iface, sizeof(nr->nr_ifname)); | |||||
strlcpy(nr->nr_ifname, interface, sizeof(nr->nr_ifname)); | |||||
memcpy(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr)); | memcpy(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr)); | ||||
if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) { | if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) { | ||||
warn("ioctl 'SIOCG80211NODE':"); | warn("ioctl 'SIOCG80211NODE':"); | ||||
@@ -141,12 +141,12 @@ | |||||
} | } | ||||
const char * | const char * | ||||
wifi_perc(const char *iface) | |||||
wifi_perc(const char *interface) | |||||
{ | { | ||||
struct ieee80211_nodereq nr; | struct ieee80211_nodereq nr; | ||||
int q; | int q; | ||||
if (load_ieee80211_nodereq(iface, &nr)) { | |||||
if (load_ieee80211_nodereq(interface, &nr)) { | |||||
if (nr.nr_max_rssi) { | if (nr.nr_max_rssi) { | ||||
q = IEEE80211_NODEREQ_RSSI(&nr); | q = IEEE80211_NODEREQ_RSSI(&nr); | ||||
} else { | } else { | ||||
@@ -160,11 +160,11 @@ | |||||
} | } | ||||
const char * | const char * | ||||
wifi_essid(const char *iface) | |||||
wifi_essid(const char *interface) | |||||
{ | { | ||||
struct ieee80211_nodereq nr; | struct ieee80211_nodereq nr; | ||||
if (load_ieee80211_nodereq(iface, &nr)) { | |||||
if (load_ieee80211_nodereq(interface, &nr)) { | |||||
return bprintf("%s", nr.nr_nwid); | return bprintf("%s", nr.nr_nwid); | ||||
} | } | ||||
@@ -13,10 +13,10 @@ const char *cpu_perc(void); | |||||
const char *datetime(const char *fmt); | const char *datetime(const char *fmt); | ||||
/* disk */ | /* disk */ | ||||
const char *disk_free(const char *mnt); | |||||
const char *disk_perc(const char *mnt); | |||||
const char *disk_total(const char *mnt); | |||||
const char *disk_used(const char *mnt); | |||||
const char *disk_free(const char *path); | |||||
const char *disk_perc(const char *path); | |||||
const char *disk_total(const char *path); | |||||
const char *disk_used(const char *path); | |||||
/* entropy */ | /* entropy */ | ||||
const char *entropy(void); | const char *entropy(void); | ||||
@@ -25,8 +25,8 @@ const char *entropy(void); | |||||
const char *hostname(void); | const char *hostname(void); | ||||
/* ip */ | /* ip */ | ||||
const char *ipv4(const char *iface); | |||||
const char *ipv6(const char *iface); | |||||
const char *ipv4(const char *interface); | |||||
const char *ipv6(const char *interface); | |||||
/* kernel_release */ | /* kernel_release */ | ||||
const char *kernel_release(void); | const char *kernel_release(void); | ||||
@@ -45,7 +45,7 @@ const char *netspeed_rx(const char *interface); | |||||
const char *netspeed_tx(const char *interface); | const char *netspeed_tx(const char *interface); | ||||
/* num_files */ | /* num_files */ | ||||
const char *num_files(const char *dir); | |||||
const char *num_files(const char *path); | |||||
/* ram */ | /* ram */ | ||||
const char *ram_free(void); | const char *ram_free(void); | ||||
@@ -77,5 +77,5 @@ const char *uid(void); | |||||
const char *vol_perc(const char *card); | const char *vol_perc(const char *card); | ||||
/* wifi */ | /* wifi */ | ||||
const char *wifi_perc(const char *iface); | |||||
const char *wifi_essid(const char *iface); | |||||
const char *wifi_perc(const char *interface); | |||||
const char *wifi_essid(const char *interface); |