lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #19 from R41z/master

Browse source 
several changes
This commit is contained in:
Aaron Marcher 2016-09-18 21:44:48 +02:00 committed by GitHub
commit 237a7720b7
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config.mk
View file

@ -1,7 +1,3 @@
# See LICENSE file for copyright and license details.
VERSION = 2.0
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man MANPREFIX = ${PREFIX}/share/man
@ -11,7 +7,6 @@ X11LIB = /usr/X11R6/lib
INCS = -I. -I/usr/include -I${X11INC} INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lasound LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lasound
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
# -Wno-unused-function for routines not activated by user # -Wno-unused-function for routines not activated by user
CFLAGS = -std=c99 -pedantic -Wno-unused-function -Wall -Wextra -Os ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wno-unused-function -Wall -Wextra -Os ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS} LDFLAGS = ${LIBS}

6
slstatus.1
View file

@ -5,14 +5,14 @@ slstatus \- suckless status
.B slstatus .B slstatus
.RB [ \-dhov ] .RB [ \-dhov ]
.SH DESCRIPTION .SH DESCRIPTION
slstatus is a suckless and lightweight status monitor for window managers that use WM_NAME as statusbar (e.g. DWM) or any other status bars if they support reading/piping from slstatus. It is written in pure C without any extern programs being executed and only reads from files most of the time. slstatus is meant to be a better alternative to Bash scripts (inefficient) and Conky (bloated and written in C++). slstatus is a suckless and lightweight status monitor for window managers that use WM_NAME as statusbar (e.g. DWM) or any other status bars as long as they support reading from stdin. It is written in pure C without any extern programs being executed and only reads from files most of the time. slstatus is meant to be a better alternative to Bash scripts (inefficient) and Conky (bloated and written in C++).
.SH OPTIONS .SH OPTIONS
.TP .TP
.B \-d .B \-d
runs slstatus as daemon in background run slstatus as daemon in background
.TP .TP
.B \-h .B \-h
displays usage display help
.TP .TP
.B \-o .B \-o
output to console instead of WM_NAME output to console instead of WM_NAME

17
slstatus.c
View file

@ -1,4 +1,11 @@
/* See LICENSE file for copyright and license details. */ /*
* Copyright (C) 2016, drkhsh
* Copyright (C) 2016, Ali H. Fardan (Raiz) <raiz@firemail.cc>
* see LICENSE for copyright details
*/
#define _GNU_SOURCE
#define VERSION "2.0"
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <err.h> #include <err.h>
@ -88,10 +95,8 @@ smprintf(const char *fmt, ...)
va_end(ap); va_end(ap);
ret = malloc(++len); ret = malloc(++len);
if (ret == NULL) { if (ret == NULL)
warn("Malloc failed."); err(1, "malloc");
return "n/a";
}
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(ret, len, fmt, ap); vsnprintf(ret, len, fmt, ap);
@ -613,7 +618,7 @@ main(int argc, char *argv[])
oflag = 1; oflag = 1;
break; break;
case 'v': case 'v':
printf("%s version %s (c) 2016 slstatus engineers\n", argv0, VERSION); printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
return 0; return 0;
default: default:
usage(); usage();