Merge branch 'master' into master
This commit is contained in:
commit
13604963bc
8 changed files with 156 additions and 185 deletions
|
@ -6,6 +6,6 @@ Thanks you very much for your great help!
|
||||||
- [Vlaix](https://github.com/Vlaix)
|
- [Vlaix](https://github.com/Vlaix)
|
||||||
- [pfannkuckengesicht](https://github.com/pfannkuchengesicht)
|
- [pfannkuckengesicht](https://github.com/pfannkuchengesicht)
|
||||||
- [sahne](https://github.com/sahne)
|
- [sahne](https://github.com/sahne)
|
||||||
- [Ali H. Fardan](http://raiz.duckdns.org)
|
- [Ali H. Fardan](http://hexeract.info)
|
||||||
- [Quentin Rameau](https://fifth.space)
|
- [Quentin Rameau](https://fifth.space)
|
||||||
- [Mike Coddington](https://coddington.us)
|
- [Mike Coddington](https://coddington.us)
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -31,16 +31,16 @@ ${NAME}: ${OBJ}
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@echo cleaning
|
@echo cleaning
|
||||||
@rm -f ${NAME} ${OBJ} ${NAME}-${VERSION}.tar.gz
|
@rm -f ${NAME} ${OBJ} ${NAME}.tar.gz
|
||||||
|
|
||||||
dist: clean
|
dist: clean
|
||||||
@echo creating dist tarball
|
@echo creating dist tarball
|
||||||
@mkdir -p ${NAME}-${VERSION}
|
@mkdir -p ${NAME}
|
||||||
@cp -R Makefile config.mk LICENSE \
|
@cp -R Makefile config.mk LICENSE \
|
||||||
${SRC} ${NAME}-${VERSION}
|
${SRC} ${NAME}
|
||||||
@tar -cf ${NAME}-${VERSION}.tar ${NAME}-${VERSION}
|
@tar -cf ${NAME}.tar ${NAME}
|
||||||
@gzip ${NAME}-${VERSION}.tar
|
@gzip ${NAME}.tar
|
||||||
@rm -rf ${NAME}-${VERSION}
|
@rm -rf ${NAME}
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
||||||
|
@ -49,7 +49,7 @@ install: all
|
||||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
|
@chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME}
|
||||||
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
||||||
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||||
@sed "s/VERSION/${VERSION}/g" < ${NAME}.1 > ${DESTDIR}${MANPREFIX}/man1/${NAME}.1
|
@cp -f ${NAME}.1 ${DESTDIR}${MANPREFIX}/man1
|
||||||
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/${NAME}.1
|
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/${NAME}.1
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
|
|
6
TODO.md
Normal file
6
TODO.md
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
* [ ] fix build on OpenBSD
|
||||||
|
* [ ] fix build on NetBSD
|
||||||
|
* [ ] fix build on FreeBSD
|
||||||
|
* [X] test wifi functions after the last few commits
|
||||||
|
* [ ] allow calling routines from command line arguments like: slstatus --datetime "%F %T"
|
||||||
|
* [X] see if drkhsh approves it
|
|
@ -1,7 +1,5 @@
|
||||||
# See LICENSE file for copyright and license details.
|
# See LICENSE file for copyright and license details.
|
||||||
|
|
||||||
VERSION = 3.0
|
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
MANPREFIX = ${PREFIX}/share/man
|
MANPREFIX = ${PREFIX}/share/man
|
||||||
|
|
||||||
|
|
3
extern/concat.h
vendored
3
extern/concat.h
vendored
|
@ -11,6 +11,9 @@ ccat(const unsigned short int count, ...)
|
||||||
unsigned short int i;
|
unsigned short int i;
|
||||||
concat[0] = '\0';
|
concat[0] = '\0';
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
va_start(ap, count);
|
va_start(ap, count);
|
||||||
for(i = 0; i < count; i++)
|
for(i = 0; i < count; i++)
|
||||||
strlcat(concat, va_arg(ap, char *), sizeof(concat));
|
strlcat(concat, va_arg(ap, char *), sizeof(concat));
|
||||||
|
|
50
extern/strlcpy.h
vendored
50
extern/strlcpy.h
vendored
|
@ -1,50 +0,0 @@
|
||||||
/* $OpenBSD: strlcpy.c,v 1.13 2015/08/31 02:53:57 guenther Exp $ */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
|
||||||
*
|
|
||||||
* Permission to use, copy, modify, and distribute this software for any
|
|
||||||
* purpose with or without fee is hereby granted, provided that the above
|
|
||||||
* copyright notice and this permission notice appear in all copies.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copy string src to buffer dst of size dsize. At most dsize-1
|
|
||||||
* chars will be copied. Always NUL terminates (unless dsize == 0).
|
|
||||||
* Returns strlen(src); if retval >= dsize, truncation occurred.
|
|
||||||
*/
|
|
||||||
size_t
|
|
||||||
strlcpy(char *dst, const char *src, size_t dsize)
|
|
||||||
{
|
|
||||||
const char *osrc = src;
|
|
||||||
size_t nleft = dsize;
|
|
||||||
|
|
||||||
/* Copy as many bytes as will fit. */
|
|
||||||
if (nleft != 0) {
|
|
||||||
while (--nleft != 0) {
|
|
||||||
if ((*dst++ = *src++) == '\0')
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Not enough room in dst, add NUL and traverse rest of src. */
|
|
||||||
if (nleft == 0) {
|
|
||||||
if (dsize != 0)
|
|
||||||
*dst = '\0'; /* NUL-terminate dst */
|
|
||||||
while (*src++)
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
return(src - osrc - 1); /* count does not include NUL */
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
.TH SLSTATUS 1 slstatus\-VERSION
|
.TH SLSTATUS 1 slstatus
|
||||||
.SH NAME
|
.SH NAME
|
||||||
slstatus \- suckless status
|
slstatus \- suckless status
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
|
|
254
slstatus.c
254
slstatus.c
|
@ -26,11 +26,9 @@
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
#undef strlcat
|
#undef strlcat
|
||||||
#undef strlcpy
|
|
||||||
|
|
||||||
#include "extern/arg.h"
|
#include "extern/arg.h"
|
||||||
#include "extern/strlcat.h"
|
#include "extern/strlcat.h"
|
||||||
#include "extern/strlcpy.h"
|
|
||||||
#include "extern/concat.h"
|
#include "extern/concat.h"
|
||||||
|
|
||||||
struct arg {
|
struct arg {
|
||||||
|
@ -52,6 +50,7 @@ static char *entropy(void);
|
||||||
static char *gid(void);
|
static char *gid(void);
|
||||||
static char *hostname(void);
|
static char *hostname(void);
|
||||||
static char *ip(const char *iface);
|
static char *ip(const char *iface);
|
||||||
|
static char *kernel_release(void);
|
||||||
static char *load_avg(void);
|
static char *load_avg(void);
|
||||||
static char *ram_free(void);
|
static char *ram_free(void);
|
||||||
static char *ram_perc(void);
|
static char *ram_perc(void);
|
||||||
|
@ -69,14 +68,12 @@ static char *username(void);
|
||||||
static char *vol_perc(const char *card);
|
static char *vol_perc(const char *card);
|
||||||
static char *wifi_perc(const char *iface);
|
static char *wifi_perc(const char *iface);
|
||||||
static char *wifi_essid(const char *iface);
|
static char *wifi_essid(const char *iface);
|
||||||
static char *kernel_release(void);
|
|
||||||
static void set_status(const char *str);
|
|
||||||
static void sighandler(const int signo);
|
static void sighandler(const int signo);
|
||||||
static void usage(void);
|
static void usage(int);
|
||||||
|
|
||||||
char *argv0;
|
char *argv0;
|
||||||
char concat[];
|
char concat[];
|
||||||
static unsigned short int delay;
|
static unsigned short int delay = 0;
|
||||||
static unsigned short int done;
|
static unsigned short int done;
|
||||||
static unsigned short int dflag, oflag;
|
static unsigned short int dflag, oflag;
|
||||||
static Display *dpy;
|
static Display *dpy;
|
||||||
|
@ -116,7 +113,7 @@ battery_perc(const char *bat)
|
||||||
fp = fopen(concat, "r");
|
fp = fopen(concat, "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file %s", concat);
|
warn("Failed to open file %s", concat);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%i", &perc);
|
fscanf(fp, "%i", &perc);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -134,7 +131,7 @@ battery_state(const char *bat)
|
||||||
fp = fopen(concat, "r");
|
fp = fopen(concat, "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file %s", concat);
|
warn("Failed to open file %s", concat);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%12s", state);
|
fscanf(fp, "%12s", state);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -160,18 +157,18 @@ cpu_perc(void)
|
||||||
fp = fopen("/proc/stat", "r");
|
fp = fopen("/proc/stat", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/stat");
|
warn("Failed to open file /proc/stat");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
|
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
|
delay++;
|
||||||
sleep(delay);
|
sleep(delay);
|
||||||
|
|
||||||
fp = fopen("/proc/stat", "r");
|
fp = fopen("/proc/stat", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/stat");
|
warn("Failed to open file /proc/stat");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
|
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -188,7 +185,7 @@ datetime(const char *fmt)
|
||||||
|
|
||||||
t = time(NULL);
|
t = time(NULL);
|
||||||
if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
|
if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%s", str);
|
return smprintf("%s", str);
|
||||||
|
@ -201,7 +198,7 @@ disk_free(const char *mnt)
|
||||||
|
|
||||||
if (statvfs(mnt, &fs) < 0) {
|
if (statvfs(mnt, &fs) < 0) {
|
||||||
warn("Failed to get filesystem info");
|
warn("Failed to get filesystem info");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
|
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
|
||||||
|
@ -215,7 +212,7 @@ disk_perc(const char *mnt)
|
||||||
|
|
||||||
if (statvfs(mnt, &fs) < 0) {
|
if (statvfs(mnt, &fs) < 0) {
|
||||||
warn("Failed to get filesystem info");
|
warn("Failed to get filesystem info");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
|
perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
|
||||||
|
@ -230,7 +227,7 @@ disk_total(const char *mnt)
|
||||||
|
|
||||||
if (statvfs(mnt, &fs) < 0) {
|
if (statvfs(mnt, &fs) < 0) {
|
||||||
warn("Failed to get filesystem info");
|
warn("Failed to get filesystem info");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
|
return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
|
||||||
|
@ -243,7 +240,7 @@ disk_used(const char *mnt)
|
||||||
|
|
||||||
if (statvfs(mnt, &fs) < 0) {
|
if (statvfs(mnt, &fs) < 0) {
|
||||||
warn("Failed to get filesystem info");
|
warn("Failed to get filesystem info");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
|
return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
|
||||||
|
@ -258,7 +255,7 @@ entropy(void)
|
||||||
fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
|
fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
|
warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%d", &num);
|
fscanf(fp, "%d", &num);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -279,7 +276,7 @@ hostname(void)
|
||||||
|
|
||||||
if (gethostname(buf, sizeof(buf)) == -1) {
|
if (gethostname(buf, sizeof(buf)) == -1) {
|
||||||
warn("hostname");
|
warn("hostname");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%s", buf);
|
return smprintf("%s", buf);
|
||||||
|
@ -294,7 +291,7 @@ ip(const char *iface)
|
||||||
|
|
||||||
if (getifaddrs(&ifaddr) == -1) {
|
if (getifaddrs(&ifaddr) == -1) {
|
||||||
warn("Failed to get IP address for interface %s", iface);
|
warn("Failed to get IP address for interface %s", iface);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
|
for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
|
||||||
|
@ -305,7 +302,7 @@ ip(const char *iface)
|
||||||
if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
|
if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
|
||||||
if (s != 0) {
|
if (s != 0) {
|
||||||
warnx("Failed to get IP address for interface %s", iface);
|
warnx("Failed to get IP address for interface %s", iface);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
return smprintf("%s", host);
|
return smprintf("%s", host);
|
||||||
}
|
}
|
||||||
|
@ -313,9 +310,21 @@ ip(const char *iface)
|
||||||
|
|
||||||
freeifaddrs(ifaddr);
|
freeifaddrs(ifaddr);
|
||||||
|
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *
|
||||||
|
kernel_release(void)
|
||||||
|
{
|
||||||
|
struct utsname udata;
|
||||||
|
|
||||||
|
if (uname(&udata) < 0) {
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf(UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return smprintf("%s", udata.release);
|
||||||
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
load_avg(void)
|
load_avg(void)
|
||||||
{
|
{
|
||||||
|
@ -323,7 +332,7 @@ load_avg(void)
|
||||||
|
|
||||||
if (getloadavg(avgs, 3) < 0) {
|
if (getloadavg(avgs, 3) < 0) {
|
||||||
warnx("Failed to get the load avg");
|
warnx("Failed to get the load avg");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
|
return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
|
||||||
|
@ -338,7 +347,7 @@ ram_free(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "MemFree: %ld kB\n", &free);
|
fscanf(fp, "MemFree: %ld kB\n", &free);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -355,7 +364,7 @@ ram_perc(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
||||||
fscanf(fp, "MemFree: %ld kB\n", &free);
|
fscanf(fp, "MemFree: %ld kB\n", &free);
|
||||||
|
@ -375,7 +384,7 @@ ram_total(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -392,7 +401,7 @@ ram_used(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
||||||
fscanf(fp, "MemFree: %ld kB\n", &free);
|
fscanf(fp, "MemFree: %ld kB\n", &free);
|
||||||
|
@ -406,19 +415,22 @@ ram_used(void)
|
||||||
static char *
|
static char *
|
||||||
run_command(const char *cmd)
|
run_command(const char *cmd)
|
||||||
{
|
{
|
||||||
|
char *nlptr;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
char buf[1024] = "n/a";
|
char buf[1024] = UNKNOWN_STR;
|
||||||
|
|
||||||
fp = popen(cmd, "r");
|
fp = popen(cmd, "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to get command output for %s", cmd);
|
warn("Failed to get command output for %s", cmd);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fgets(buf, sizeof(buf)-1, fp);
|
fgets(buf, sizeof(buf), fp);
|
||||||
pclose(fp);
|
pclose(fp);
|
||||||
|
|
||||||
buf[strlen(buf)] = '\0';
|
buf[strlen(buf)] = '\0';
|
||||||
strtok(buf, "\n");
|
|
||||||
|
if ((nlptr = strstr(buf, "\n")) != NULL) {
|
||||||
|
nlptr[0] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
return smprintf("%s", buf);
|
return smprintf("%s", buf);
|
||||||
}
|
}
|
||||||
|
@ -435,23 +447,26 @@ swap_free(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
|
|
||||||
|
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
|
||||||
|
warn("swap_free: read error");
|
||||||
|
fclose(fp);
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
|
|
||||||
buf[bytes_read] = '\0';
|
buf[bytes_read] = '\0';
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
|
|
||||||
warn("Failed to read /proc/meminfo\n");
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapTotal");
|
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||||
if (total == 0) {
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapFree");
|
if ((match = strstr(buf, "SwapFree")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||||
|
|
||||||
return smprintf("%f", (float)free / 1024 / 1024);
|
return smprintf("%f", (float)free / 1024 / 1024);
|
||||||
|
@ -469,26 +484,31 @@ swap_perc(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
|
|
||||||
|
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
|
||||||
|
warn("swap_perc: read error");
|
||||||
|
fclose(fp);
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
|
|
||||||
buf[bytes_read] = '\0';
|
buf[bytes_read] = '\0';
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
|
|
||||||
warn("Failed to read /proc/meminfo\n");
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapTotal");
|
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||||
if (total == 0) {
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapCached");
|
if ((match = strstr(buf, "SwapCached")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapCached: %ld kB\n", &cached);
|
sscanf(match, "SwapCached: %ld kB\n", &cached);
|
||||||
|
|
||||||
match = strstr(buf, "SwapFree");
|
if ((match = strstr(buf, "SwapFree")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||||
|
|
||||||
return smprintf("%d%%", 100 * (total - free - cached) / total);
|
return smprintf("%d%%", 100 * (total - free - cached) / total);
|
||||||
|
@ -506,21 +526,21 @@ swap_total(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
|
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
|
||||||
buf[bytes_read] = '\0';
|
warn("swap_total: read error");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
warn("Failed to read /proc/meminfo\n");
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
match = strstr(buf, "SwapTotal");
|
buf[bytes_read] = '\0';
|
||||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
fclose(fp);
|
||||||
if (total == 0) {
|
|
||||||
return smprintf(UNKNOWN_STR);
|
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||||
|
|
||||||
return smprintf("%f", (float)total / 1024 / 1024);
|
return smprintf("%f", (float)total / 1024 / 1024);
|
||||||
}
|
}
|
||||||
|
@ -537,26 +557,30 @@ swap_used(void)
|
||||||
fp = fopen("/proc/meminfo", "r");
|
fp = fopen("/proc/meminfo", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/meminfo");
|
warn("Failed to open file /proc/meminfo");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
|
if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
|
||||||
|
warn("swap_used: read error");
|
||||||
|
fclose(fp);
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
|
|
||||||
buf[bytes_read] = '\0';
|
buf[bytes_read] = '\0';
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if (bytes_read == 0 || bytes_read == sizeof(buf)) {
|
|
||||||
warn("Failed to read /proc/meminfo\n");
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapTotal");
|
if ((match = strstr(buf, "SwapTotal")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
sscanf(match, "SwapTotal: %ld kB\n", &total);
|
||||||
if (total == 0) {
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
}
|
|
||||||
|
|
||||||
match = strstr(buf, "SwapCached");
|
if ((match = strstr(buf, "SwapCached")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapCached: %ld kB\n", &cached);
|
sscanf(match, "SwapCached: %ld kB\n", &cached);
|
||||||
|
|
||||||
match = strstr(buf, "SwapFree");
|
if ((match = strstr(buf, "SwapFree")) == NULL) {
|
||||||
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
|
}
|
||||||
sscanf(match, "SwapFree: %ld kB\n", &free);
|
sscanf(match, "SwapFree: %ld kB\n", &free);
|
||||||
|
|
||||||
return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
|
return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
|
||||||
|
@ -571,7 +595,7 @@ temp(const char *file)
|
||||||
fp = fopen(file, "r");
|
fp = fopen(file, "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file %s", file);
|
warn("Failed to open file %s", file);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fscanf(fp, "%d", &temp);
|
fscanf(fp, "%d", &temp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -601,7 +625,7 @@ username(void)
|
||||||
|
|
||||||
if (pw == NULL) {
|
if (pw == NULL) {
|
||||||
warn("Failed to get username");
|
warn("Failed to get username");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
return smprintf("%s", pw->pw_name);
|
return smprintf("%s", pw->pw_name);
|
||||||
|
@ -656,18 +680,18 @@ wifi_perc(const char *iface)
|
||||||
fp = fopen(concat, "r");
|
fp = fopen(concat, "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file %s", concat);
|
warn("Failed to open file %s", concat);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
fgets(status, 5, fp);
|
fgets(status, 5, fp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
if(strcmp(status, "up\n") != 0) {
|
if(strcmp(status, "up\n") != 0) {
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
fp = fopen("/proc/net/wireless", "r");
|
fp = fopen("/proc/net/wireless", "r");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
warn("Failed to open file /proc/net/wireless");
|
warn("Failed to open file /proc/net/wireless");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
ccat(2, iface, ":");
|
ccat(2, iface, ":");
|
||||||
fgets(buf, sizeof(buf), fp);
|
fgets(buf, sizeof(buf), fp);
|
||||||
|
@ -675,11 +699,11 @@ wifi_perc(const char *iface)
|
||||||
fgets(buf, sizeof(buf), fp);
|
fgets(buf, sizeof(buf), fp);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
datastart = strstr(buf, concat);
|
if ((datastart = strstr(buf, concat)) == NULL) {
|
||||||
if (datastart != NULL) {
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
datastart = strstr(buf, ":");
|
|
||||||
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc);
|
|
||||||
}
|
}
|
||||||
|
datastart = (datastart+(strlen(iface)+1));
|
||||||
|
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &perc);
|
||||||
|
|
||||||
return smprintf("%d%%", perc);
|
return smprintf("%d%%", perc);
|
||||||
}
|
}
|
||||||
|
@ -693,42 +717,26 @@ wifi_essid(const char *iface)
|
||||||
|
|
||||||
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;
|
||||||
sprintf(wreq.ifr_name, iface);
|
snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
|
||||||
|
|
||||||
if (sockfd == -1) {
|
if (sockfd == -1) {
|
||||||
warn("Failed to get ESSID for interface %s", iface);
|
warn("Failed to get ESSID for interface %s", iface);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
wreq.u.essid.pointer = id;
|
wreq.u.essid.pointer = id;
|
||||||
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
|
if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
|
||||||
warn("Failed to get ESSID for interface %s", iface);
|
warn("Failed to get ESSID for interface %s", iface);
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
|
|
||||||
close(sockfd);
|
close(sockfd);
|
||||||
|
|
||||||
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
|
if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf("%s", UNKNOWN_STR);
|
||||||
else
|
else
|
||||||
return smprintf("%s", (char *)wreq.u.essid.pointer);
|
return smprintf("%s", (char *)wreq.u.essid.pointer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
|
||||||
kernel_release(void)
|
|
||||||
{
|
|
||||||
struct utsname udata;
|
|
||||||
if (uname(&udata) < 0)
|
|
||||||
return smprintf(UNKNOWN_STR);
|
|
||||||
|
|
||||||
return smprintf("%s", udata.release);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
set_status(const char *str)
|
|
||||||
{
|
|
||||||
XStoreName(dpy, DefaultRootWindow(dpy), str);
|
|
||||||
XSync(dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
sighandler(const int signo)
|
sighandler(const int signo)
|
||||||
{
|
{
|
||||||
|
@ -738,17 +746,17 @@ sighandler(const int signo)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
usage(void)
|
usage(int eval)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "usage: %s [-dhov]\n", argv0);
|
fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0);
|
||||||
exit(1);
|
exit(eval);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
unsigned short int i;
|
unsigned short int i;
|
||||||
char status_string[4096];
|
char status_string[2048];
|
||||||
char *res, *element;
|
char *res, *element;
|
||||||
struct arg argument;
|
struct arg argument;
|
||||||
struct sigaction act;
|
struct sigaction act;
|
||||||
|
@ -761,14 +769,16 @@ main(int argc, char *argv[])
|
||||||
oflag = 1;
|
oflag = 1;
|
||||||
break;
|
break;
|
||||||
case 'v':
|
case 'v':
|
||||||
printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
|
printf("slstatus (C) 2016 slstatus engineers\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
case 'h':
|
||||||
|
usage(0);
|
||||||
default:
|
default:
|
||||||
usage();
|
usage(1);
|
||||||
} ARGEND
|
} ARGEND
|
||||||
|
|
||||||
if (dflag && oflag) {
|
if (dflag && oflag) {
|
||||||
usage();
|
usage(1);
|
||||||
}
|
}
|
||||||
if (dflag && daemon(1, 1) < 0) {
|
if (dflag && daemon(1, 1) < 0) {
|
||||||
err(1, "daemon");
|
err(1, "daemon");
|
||||||
|
@ -797,30 +807,34 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
element = smprintf(argument.fmt, res);
|
element = smprintf(argument.fmt, res);
|
||||||
if (element == NULL) {
|
if (element == NULL) {
|
||||||
element = smprintf(UNKNOWN_STR);
|
element = smprintf("%s", UNKNOWN_STR);
|
||||||
warnx("Failed to format output");
|
warnx("Failed to format output");
|
||||||
}
|
}
|
||||||
strlcat(status_string, element, sizeof(status_string));
|
if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string)) {
|
||||||
|
warnx("Output too long");
|
||||||
|
}
|
||||||
free(res);
|
free(res);
|
||||||
free(element);
|
free(element);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!oflag) {
|
if (!oflag) {
|
||||||
set_status(status_string);
|
XStoreName(dpy, DefaultRootWindow(dpy), status_string);
|
||||||
|
XSync(dpy, False);
|
||||||
} else {
|
} else {
|
||||||
printf("%s\n", status_string);
|
printf("%s\n", status_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
if ((UPDATE_INTERVAL - delay) <= 0) {
|
||||||
* subtract delay time spend in function
|
delay = 0;
|
||||||
* calls from the actual global delay time
|
continue;
|
||||||
*/
|
} else {
|
||||||
sleep(UPDATE_INTERVAL - delay);
|
sleep(UPDATE_INTERVAL - delay);
|
||||||
delay = 0;
|
delay = 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!oflag) {
|
if (!oflag) {
|
||||||
set_status(NULL);
|
XStoreName(dpy, DefaultRootWindow(dpy), NULL);
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue