qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check ignore windowname for truncation and provide user feedback during

Browse Source 
config parse; based on a discussion with Tiago Cunha.
This commit is contained in:
okan 2014-01-28 20:22:21 +00:00
parent 2d6c7c78d8
commit 0590f4c1fc
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cwm/calmwm.h
View File

@ -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.h,v 1.247 2014/01/22 21:48:27 okan Exp $
* $OpenBSD: calmwm.h,v 1.248 2014/01/28 20:22:21 okan Exp $
*/
#ifndef _CALMWM_H_
@ -528,7 +528,7 @@ void conf_cursor(struct conf *);
void conf_grab_kbd(Window);
void conf_grab_mouse(Window);
void conf_init(struct conf *);
void conf_ignore(struct conf *, const char *);
int conf_ignore(struct conf *, const char *);
void conf_screen(struct screen_ctx *);
void xev_process(void);

8
app/cwm/conf.c
View File

@ -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: conf.c,v 1.162 2014/01/23 17:13:38 okan Exp $
* $OpenBSD: conf.c,v 1.163 2014/01/28 20:22:21 okan Exp $
*/
#include <sys/param.h>
@ -73,16 +73,18 @@ conf_autogroup(struct conf *c, int no, const char *val)
TAILQ_INSERT_TAIL(&c->autogroupq, aw, entry);
}
void
int
conf_ignore(struct conf *c, const char *val)
{
struct winmatch *wm;
wm = xcalloc(1, sizeof(*wm));
(void)strlcpy(wm->title, val, sizeof(wm->title));
if (strlcpy(wm->title, val, sizeof(wm->title)) >= sizeof(wm->title))
return (0);
TAILQ_INSERT_TAIL(&c->ignoreq, wm, entry);
return (1);
}
static const char *color_binds[] = {

8
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.54 2014/01/28 00:42:20 okan Exp $ */
/* $OpenBSD: parse.y,v 1.55 2014/01/28 20:22:21 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -151,7 +151,11 @@ main : FONTNAME STRING {
free($3);
}
| IGNORE STRING {
conf_ignore(conf, $2);
if (!conf_ignore(conf, $2)) {
yyerror("ignore windowname too long");
free($2);
YYERROR;
}
free($2);
}
| BIND STRING string {