diff options
| -rw-r--r-- | conf.c | 4 | ||||
| -rw-r--r-- | parse.y | 9 |
2 files changed, 5 insertions, 8 deletions
@@ -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. * - * $Id: conf.c,v 1.40 2008/06/15 02:47:46 oga Exp $ + * $Id: conf.c,v 1.41 2008/06/16 19:09:48 mk Exp $ */ #include "headers.h" @@ -171,7 +171,7 @@ conf_init(struct conf *c) strlcpy(c->termpath, "xterm", sizeof(c->termpath)); strlcpy(c->lockpath, "xlock", sizeof(c->lockpath)); - c->DefaultFontName = DEFAULTFONTNAME; + c->DefaultFontName = xstrdup(DEFAULTFONTNAME); } void @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.12 2008/06/15 02:47:46 oga Exp $ */ +/* $OpenBSD: parse.y,v 1.13 2008/06/16 19:09:48 mk Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -100,11 +100,8 @@ yesno : YES { $$ = 1; } ; main : FONTNAME STRING { - if (conf->DefaultFontName != NULL && - conf->DefaultFontName != DEFAULTFONTNAME) - free(conf->DefaultFontName); - conf->DefaultFontName = xstrdup($2); - free($2); + free(conf->DefaultFontName); + conf->DefaultFontName = $2; } | STICKY yesno { if ($2 == 0) |