diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2008-06-05 00:07:06 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2008-06-05 00:07:06 +0000 |
| commit | 28eefaf4fd96e151ac227ced2fa879bf6a186446 (patch) | |
| tree | 26e856bd2f9767d70f5b792f4bf6d20cd4c09c9b /app | |
| parent | ad1940e0577e52814968320386d55efdf962e6a5 (diff) | |
actually honor termpath and lockpath if specified in cwmrc.
"now" oga@
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/conf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 7cd5d2b52..96dd723f7 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -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.35 2008/05/19 18:53:09 oga Exp $ + * $Id: conf.c,v 1.36 2008/06/05 00:07:05 okan Exp $ */ #include "headers.h" @@ -36,11 +36,11 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags) { /* "term" and "lock" have special meanings. */ - if (strcmp(label, "term") == 0) { - strlcpy(Conf.termpath, image, sizeof(Conf.termpath)); - } else if (strcmp(label, "lock") == 0) { - strlcpy(Conf.lockpath, image, sizeof(Conf.lockpath)); - } else { + if (strcmp(label, "term") == 0) + strlcpy(c->termpath, image, sizeof(c->termpath)); + else if (strcmp(label, "lock") == 0) + strlcpy(c->lockpath, image, sizeof(c->lockpath)); + else { struct cmd *cmd; XMALLOC(cmd, struct cmd); cmd->flags = flags; |