mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of short (< 4 character) checksums and a bug with parsing

Browse Source 
old-style custom layouts. Based on fix from Chris Johnsen.
This commit is contained in:
Nicholas Marriott
2013-03-10 23:41:59 +00:00
parent 2ac6501698
commit a060aa2bf0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
layout-custom.c
View File

@@ -63,7 +63,7 @@ layout_dump(struct window *w)
if (layout_append(w->layout_root, layout, sizeof layout) != 0) if (layout_append(w->layout_root, layout, sizeof layout) != 0)
return (NULL); return (NULL);
xasprintf(&out, "%4x,%s", layout_checksum(layout), layout); xasprintf(&out, "%04x,%s", layout_checksum(layout), layout);
return (out); return (out);
} }
@@ -206,11 +206,11 @@ layout_construct(struct layout_cell *lcparent, const char **layout)
{ {
struct layout_cell *lc, *lcchild; struct layout_cell *lc, *lcchild;
u_int sx, sy, xoff, yoff; u_int sx, sy, xoff, yoff;
const char *saved;
if (!isdigit((u_char) **layout)) if (!isdigit((u_char) **layout))
return (NULL); return (NULL);
if (sscanf(*layout, "%ux%u,%u,%u,%*u", &sx, &sy, &xoff, &yoff) != 4 && if (sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4)
sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4)
return (NULL); return (NULL);
while (isdigit((u_char) **layout)) while (isdigit((u_char) **layout))
@@ -231,9 +231,12 @@ layout_construct(struct layout_cell *lcparent, const char **layout)
while (isdigit((u_char) **layout)) while (isdigit((u_char) **layout))
(*layout)++; (*layout)++;
if (**layout == ',') { if (**layout == ',') {
saved = *layout;
(*layout)++; (*layout)++;
while (isdigit((u_char) **layout)) while (isdigit((u_char) **layout))
(*layout)++; (*layout)++;
if (**layout == 'x')
*layout = saved;
} }
lc = layout_create_cell(lcparent); lc = layout_create_cell(lcparent);