From b03783efad9e488935bb81e57aca3b3c76bc498a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 16 Feb 2009 19:01:16 +0000 Subject: [PATCH] strdup() not necessary here. --- server-msg.c | 4 ++-- tty-term.c | 5 +---- tty.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/server-msg.c b/server-msg.c index 27fe5a3b..decafe8b 100644 --- a/server-msg.c +++ b/server-msg.c @@ -1,4 +1,4 @@ -/* $Id: server-msg.c,v 1.63 2009-02-11 17:50:35 nicm Exp $ */ +/* $Id: server-msg.c,v 1.64 2009-02-16 19:01:16 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -200,7 +200,7 @@ server_msg_fn_identify(struct hdr *hdr, struct client *c) c->cwd = xstrdup(data.cwd); data.tty[(sizeof data.tty) - 1] = '\0'; - tty_init(&c->tty, data.tty, xstrdup(term)); + tty_init(&c->tty, data.tty, term); if (data.flags & IDENTIFY_UTF8) c->tty.flags |= TTY_UTF8; if (data.flags & IDENTIFY_256COLOURS) diff --git a/tty-term.c b/tty-term.c index ea970f47..8405bfc7 100644 --- a/tty-term.c +++ b/tty-term.c @@ -1,4 +1,4 @@ -/* $Id: tty-term.c,v 1.14 2009-02-12 00:18:05 nicm Exp $ */ +/* $Id: tty-term.c,v 1.15 2009-02-16 19:01:16 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -218,9 +218,6 @@ tty_term_find(char *name, int fd, char **cause) for (i = 0; i < NTTYCODE; i++) { ent = &tty_term_codes[i]; -// if (ent->code == TTYC_CSR)/*XXX*/ -// continue; - code = &term->codes[ent->code]; code->type = TTYCODE_NONE; switch (ent->type) { diff --git a/tty.c b/tty.c index 3c3d3565..d5ebdc20 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.77 2009-02-13 19:45:16 nicm Exp $ */ +/* $Id: tty.c,v 1.78 2009-02-16 19:01:16 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -245,7 +245,7 @@ tty_close(struct tty *tty, int no_stop) if (!no_stop) tty_stop_tty(tty); - + tty_term_free(tty->term); tty_keys_free(tty);