diff --git a/src/dwm.c b/src/dwm.c index c2bc83c..676d939 100644 --- a/src/dwm.c +++ b/src/dwm.c @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -276,16 +275,8 @@ static void (*handler[LASTEvent])(XEvent*) = { #include "dwm/layouts.c" #include "dwm/xerror.c" -int dwm_main(int argc, char *argv[]) +int dwm_main() { - if (argc == 2 && !strcmp("-v", argv[1])) { - die("polytreewm-"VERSION); - } - - if (argc != 1) { - die("usage: polytreewm [-v]"); - } - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) { fputs("warning: no locale support\n", stderr); } diff --git a/src/dwm.h b/src/dwm.h index 051fdfe..988888b 100644 --- a/src/dwm.h +++ b/src/dwm.h @@ -1,6 +1,6 @@ #ifndef _DWM_H #define _DWM_H -int dwm_main(int argc, char *argv[]); +int dwm_main(); #endif // _DWM_H diff --git a/src/main.c b/src/main.c index 85001c1..86e54f9 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,32 @@ #include "dwm.h" +#include +#include +#include +#include + +static void die(const char *fmt, ...); + int main(int argc, char *argv[]) { + if (argc == 2 && strcmp(argv[1], "-v") == 0) { + die("polytreewm-"VERSION); + } + + if (argc != 1) { + die("usage: polytreewm [-v]"); + } + return dwm_main(argc, argv); } + +void die(const char *const fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fputc('\n', stderr); + + exit(EXIT_FAILURE); +}