Move cmd line args handling to "src/main.c"

This commit is contained in:
Alex Kotov 2021-11-21 06:37:38 +05:00
parent 199910811c
commit 2bf31b4f7e
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
3 changed files with 28 additions and 11 deletions

View File

@ -11,7 +11,6 @@
#include <locale.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -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);
}

View File

@ -1,6 +1,6 @@
#ifndef _DWM_H
#define _DWM_H
int dwm_main(int argc, char *argv[]);
int dwm_main();
#endif // _DWM_H

View File

@ -1,6 +1,32 @@
#include "dwm.h"
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
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);
}