diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2013-03-25 11:35:30 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2013-03-25 11:35:30 +0000 |
| commit | e0961dfdf4e0f87d002771144d74a67ffc21945a (patch) | |
| tree | acfb92db3dbe5dacdce25ffd1c25ad353c8a6e66 | |
| parent | 446fb0cb9cd8e664639a204023b2e09f5f6aa6fb (diff) | |
| download | rtmux-e0961dfdf4e0f87d002771144d74a67ffc21945a.tar.gz rtmux-e0961dfdf4e0f87d002771144d74a67ffc21945a.tar.bz2 rtmux-e0961dfdf4e0f87d002771144d74a67ffc21945a.zip | |
Fix handling of short (< 4 character) checksums and a bug with parsing
old-style custom layouts. Based on fix from Chris Johnsen.
| -rw-r--r-- | layout-custom.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/layout-custom.c b/layout-custom.c index dbbb8c14..c9cf49c2 100644 --- a/layout-custom.c +++ b/layout-custom.c @@ -63,7 +63,7 @@ layout_dump(struct window *w) if (layout_append(w->layout_root, layout, sizeof layout) != 0) return (NULL); - xasprintf(&out, "%4x,%s", layout_checksum(layout), layout); + xasprintf(&out, "%04x,%s", layout_checksum(layout), layout); return (out); } @@ -206,11 +206,11 @@ layout_construct(struct layout_cell *lcparent, const char **layout) { struct layout_cell *lc, *lcchild; u_int sx, sy, xoff, yoff; + const char *saved; if (!isdigit((u_char) **layout)) return (NULL); - if (sscanf(*layout, "%ux%u,%u,%u,%*u", &sx, &sy, &xoff, &yoff) != 4 && - sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4) + if (sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4) return (NULL); while (isdigit((u_char) **layout)) @@ -231,9 +231,12 @@ layout_construct(struct layout_cell *lcparent, const char **layout) while (isdigit((u_char) **layout)) (*layout)++; if (**layout == ',') { + saved = *layout; (*layout)++; while (isdigit((u_char) **layout)) (*layout)++; + if (**layout == 'x') + *layout = saved; } lc = layout_create_cell(lcparent); |