Add a configtest flag (-n).
based on a diff from Sascha Paunovic.
This commit is contained in:
parent
93ac77f595
commit
7d83c3f6e3
@ -15,7 +15,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*
|
||||
* $OpenBSD: calmwm.c,v 1.109 2018/02/09 19:54:54 okan Exp $
|
||||
* $OpenBSD: calmwm.c,v 1.110 2019/02/25 18:07:48 okan Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -55,7 +55,7 @@ main(int argc, char **argv)
|
||||
{
|
||||
char *display_name = NULL;
|
||||
char *fallback;
|
||||
int ch, xfd;
|
||||
int ch, xfd, nflag = 0;
|
||||
struct pollfd pfd[1];
|
||||
|
||||
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
|
||||
@ -66,7 +66,7 @@ main(int argc, char **argv)
|
||||
|
||||
fallback = u_argv(argv);
|
||||
Conf.wm_argv = u_argv(argv);
|
||||
while ((ch = getopt(argc, argv, "c:d:v")) != -1) {
|
||||
while ((ch = getopt(argc, argv, "c:d:nv")) != -1) {
|
||||
switch (ch) {
|
||||
case 'c':
|
||||
free(Conf.conf_file);
|
||||
@ -75,6 +75,9 @@ main(int argc, char **argv)
|
||||
case 'd':
|
||||
display_name = optarg;
|
||||
break;
|
||||
case 'n':
|
||||
nflag = 1;
|
||||
break;
|
||||
case 'v':
|
||||
Conf.debug++;
|
||||
break;
|
||||
@ -90,8 +93,13 @@ main(int argc, char **argv)
|
||||
if (signal(SIGHUP, sighdlr) == SIG_ERR)
|
||||
err(1, "signal");
|
||||
|
||||
if (parse_config(Conf.conf_file, &Conf) == -1)
|
||||
if (parse_config(Conf.conf_file, &Conf) == -1) {
|
||||
warnx("error parsing config file");
|
||||
if (nflag)
|
||||
return 1;
|
||||
}
|
||||
if (nflag)
|
||||
return 0;
|
||||
|
||||
xfd = x_init(display_name);
|
||||
cwm_status = CWM_RUNNING;
|
||||
@ -219,7 +227,7 @@ usage(void)
|
||||
{
|
||||
extern char *__progname;
|
||||
|
||||
(void)fprintf(stderr, "usage: %s [-v] [-c file] [-d display]\n",
|
||||
(void)fprintf(stderr, "usage: %s [-nv] [-c file] [-d display]\n",
|
||||
__progname);
|
||||
exit(1);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
.\" $OpenBSD: cwm.1,v 1.63 2019/02/22 19:40:33 okan Exp $
|
||||
.\" $OpenBSD: cwm.1,v 1.64 2019/02/25 18:07:48 okan Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
|
||||
.\"
|
||||
@ -14,7 +14,7 @@
|
||||
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
.\"
|
||||
.Dd $Mdocdate: February 22 2019 $
|
||||
.Dd $Mdocdate: February 25 2019 $
|
||||
.Dt CWM 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -23,7 +23,7 @@
|
||||
.Sh SYNOPSIS
|
||||
.\" For a program: program [-abc] file ...
|
||||
.Nm cwm
|
||||
.Op Fl v
|
||||
.Op Fl nv
|
||||
.Op Fl c Ar file
|
||||
.Op Fl d Ar display
|
||||
.Sh DESCRIPTION
|
||||
@ -48,6 +48,9 @@ however,
|
||||
will continue to process the rest of the configuration file.
|
||||
.It Fl d Ar display
|
||||
Specify the display to use.
|
||||
.It Fl n
|
||||
Configtest mode.
|
||||
Only check the configuration file for validity.
|
||||
.It Fl v
|
||||
Verbose mode.
|
||||
Multiple
|
||||
|
Loading…
Reference in New Issue
Block a user