mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

put a default known_hosts into conf

Browse Source
This commit is contained in:
okan 2012-12-17 23:54:57 +00:00
parent 75f65f399e
commit 479e9f769c
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calmwm.h
View File

@ -298,6 +298,7 @@ struct conf {
char *menucolor[CWM_COLOR_MENU_MAX]; char *menucolor[CWM_COLOR_MENU_MAX];
char termpath[MAXPATHLEN]; char termpath[MAXPATHLEN];
char lockpath[MAXPATHLEN]; char lockpath[MAXPATHLEN];
char known_hosts[MAXPATHLEN];
#define CONF_FONT "sans-serif:pixelsize=14:bold" #define CONF_FONT "sans-serif:pixelsize=14:bold"
char *font; char *font;
}; };

3
conf.c
View File

@ -193,6 +193,9 @@ conf_init(struct conf *c)
(void)strlcpy(c->termpath, "xterm", sizeof(c->termpath)); (void)strlcpy(c->termpath, "xterm", sizeof(c->termpath));
(void)strlcpy(c->lockpath, "xlock", sizeof(c->lockpath)); (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); c->font = xstrdup(CONF_FONT);
} }

11
kbfunc.c
View File

@ -33,7 +33,6 @@
#include "calmwm.h" #include "calmwm.h"
#define KNOWN_HOSTS ".ssh/known_hosts"
#define HASH_MARKER "|1|" #define HASH_MARKER "|1|"
extern char **cwm_argv; extern char **cwm_argv;
@ -325,17 +324,15 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg)
struct menu_q menuq; struct menu_q menuq;
FILE *fp; FILE *fp;
char *buf, *lbuf, *p; char *buf, *lbuf, *p;
char hostbuf[MAXHOSTNAMELEN], filename[MAXPATHLEN]; char hostbuf[MAXHOSTNAMELEN];
char cmd[256]; char cmd[256];
int l; int l;
size_t len; size_t len;
l = snprintf(filename, sizeof(filename), "%s/%s", homedir, KNOWN_HOSTS); if ((fp = fopen(Conf.known_hosts, "r")) == NULL) {
if (l == -1 || l >= sizeof(filename)) warn("kbfunc_ssh: %s", Conf.known_hosts);
return;
if ((fp = fopen(filename, "r")) == NULL)
return; return;
}
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
lbuf = NULL; lbuf = NULL;