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

cvsimport

Browse Source 
* refs/heads/master:
  Replace fgetln(3) with POSIX getline(3); inspired by brynet and Ingo.
  fix a few WARNINGS (new sentence, new line and extraneous Pp macro) found with mandoc -Tlint
  from src, by espie@: no need to generate y.tab.h if nothing uses it, set YFLAGS to nothing
This commit is contained in:
Leah Neukirchen 2017-07-11 13:15:08 +02:00
commit 1ceb2dd795
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cwmrc.5
View File

@ -245,7 +245,6 @@ A special
keyword keyword
.Dq all .Dq all
can be used to unbind all buttons. can be used to unbind all buttons.
.Pp
.El .El
.Sh BIND FUNCTION LIST .Sh BIND FUNCTION LIST
.Bl -tag -width 23n -compact .Bl -tag -width 23n -compact
@ -325,12 +324,12 @@ Vertically maximize current window (gap + border honored).
Horizontally maximize current window (gap + border honored). Horizontally maximize current window (gap + border honored).
.It window-htile .It window-htile
Current window is placed at the top of the screen, maximized Current window is placed at the top of the screen, maximized
horizontally and resized to half of the vertical screen space. Other horizontally and resized to half of the vertical screen space.
windows in its group share remaining screen space. Other windows in its group share remaining screen space.
.It window-vtile .It window-vtile
Current window is placed on the left of the screen, maximized vertically Current window is placed on the left of the screen, maximized vertically
and resized to half of the horizontal screen space. Other windows in its and resized to half of the horizontal screen space.
group share remaining screen space. Other windows in its group share remaining screen space.
.It window-move .It window-move
Move current window. Move current window.
.It window-resize .It window-resize

19
kbfunc.c
View File

@ -468,6 +468,7 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
char path[PATH_MAX]; char path[PATH_MAX];
int l; int l;
size_t len; size_t len;
ssize_t slen;
TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
if (strcmp(cmd->name, "term") == 0) if (strcmp(cmd->name, "term") == 0)
@ -481,20 +482,16 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
} }
lbuf = NULL; lbuf = NULL;
while ((buf = fgetln(fp, &len))) { len = 0;
if (buf[len - 1] == '\n') while ((slen = getline(&lbuf, &len, fp)) != -1) {
buf[len - 1] = '\0';
else {
/* EOF without EOL, copy and add the NUL */
lbuf = xmalloc(len + 1);
(void)memcpy(lbuf, buf, len);
lbuf[len] = '\0';
buf = lbuf; buf = lbuf;
} if (buf[slen - 1] == '\n')
buf[slen - 1] = '\0';
/* skip hashed hosts */ /* skip hashed hosts */
if (strncmp(buf, HASH_MARKER, strlen(HASH_MARKER)) == 0) if (strncmp(buf, HASH_MARKER, strlen(HASH_MARKER)) == 0)
continue; continue;
for (p = buf; *p != ',' && *p != ' ' && p != buf + len; p++) { for (p = buf; *p != ',' && *p != ' ' && p != buf + slen; p++) {
/* do nothing */ /* do nothing */
} }
/* ignore badness */ /* ignore badness */
@ -504,6 +501,8 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
menuq_add(&menuq, NULL, "%s", hostbuf); menuq_add(&menuq, NULL, "%s", hostbuf);
} }
free(lbuf); free(lbuf);
if (ferror(fp))
err(1, "%s", path);
(void)fclose(fp); (void)fclose(fp);
menu: menu:
if ((mi = menu_filter(sc, &menuq, "ssh", NULL, (CWM_MENU_DUMMY), if ((mi = menu_filter(sc, &menuq, "ssh", NULL, (CWM_MENU_DUMMY),