diff options
| author | okan <okan> | 2012-12-17 23:54:57 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-12-17 23:54:57 +0000 |
| commit | 479e9f769c5a822da49ec60cd7ceb533e1739527 (patch) | |
| tree | bb0d00aa4d0aa07b65fd68995135d0e803c1b735 | |
| parent | 75f65f399e2cfc0fd73f6ae9f68e60313cfdd7e5 (diff) | |
| download | cwm-479e9f769c5a822da49ec60cd7ceb533e1739527.tar.gz cwm-479e9f769c5a822da49ec60cd7ceb533e1739527.tar.xz cwm-479e9f769c5a822da49ec60cd7ceb533e1739527.zip | |
put a default known_hosts into conf
| -rw-r--r-- | calmwm.h | 1 | ||||
| -rw-r--r-- | conf.c | 3 | ||||
| -rw-r--r-- | kbfunc.c | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/calmwm.h b/calmwm.h index 87be644..256ce9e 100644 --- a/calmwm.h +++ b/calmwm.h @@ -298,6 +298,7 @@ struct conf { char *menucolor[CWM_COLOR_MENU_MAX]; char termpath[MAXPATHLEN]; char lockpath[MAXPATHLEN]; + char known_hosts[MAXPATHLEN]; #define CONF_FONT "sans-serif:pixelsize=14:bold" char *font; }; diff --git a/conf.c b/conf.c index 9bdea9b..d1cbbf8 100644 --- a/conf.c +++ b/conf.c @@ -193,6 +193,9 @@ conf_init(struct conf *c) (void)strlcpy(c->termpath, "xterm", sizeof(c->termpath)); (void)strlcpy(c->lockpath, "xlock", sizeof(c->lockpath)); + (void)snprintf(c->known_hosts, sizeof(c->known_hosts), "%s/%s", + homedir, ".ssh/known_hosts"); + c->font = xstrdup(CONF_FONT); } diff --git a/kbfunc.c b/kbfunc.c index d62867d..452ca0a 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -33,7 +33,6 @@ #include "calmwm.h" -#define KNOWN_HOSTS ".ssh/known_hosts" #define HASH_MARKER "|1|" extern char **cwm_argv; @@ -325,17 +324,15 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg) struct menu_q menuq; FILE *fp; char *buf, *lbuf, *p; - char hostbuf[MAXHOSTNAMELEN], filename[MAXPATHLEN]; + char hostbuf[MAXHOSTNAMELEN]; char cmd[256]; int l; size_t len; - l = snprintf(filename, sizeof(filename), "%s/%s", homedir, KNOWN_HOSTS); - if (l == -1 || l >= sizeof(filename)) - return; - - if ((fp = fopen(filename, "r")) == NULL) + if ((fp = fopen(Conf.known_hosts, "r")) == NULL) { + warn("kbfunc_ssh: %s", Conf.known_hosts); return; + } TAILQ_INIT(&menuq); lbuf = NULL; |