diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-29 17:06:04 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-29 17:06:04 +0000 |
| commit | beaf220f394984c97395b079eab260b225ee5378 (patch) | |
| tree | 50cc25e8e8f01622ec95d99a075338e3cca617b1 | |
| parent | Merge branch 'drag-and-drop' (diff) | |
tiocswinsz: fix compilation error on e.g. ppc64
On some platforms, TIOCSWINSZ has a very large value, >
0x80000000.
On some platforms, the `request` argument to `ioctl(3)` is an `int`.
For platforms where both of the above is true, gcc will warn (and
error out if compiled with `-Werror`) on:
ioctl(fd, TIOCSWINSZ, ...)
To silence this warning, we need to cast `TIOCSWINSZ` to an
integer.
However, doing this on platforms where `request` is an `unsigned long`
will result in `TIOCSWINSZ` being sign-extended (and thus we end up
with an invalid value).
It seems that casting to `unsigned int` works in both cases; it
silences the long -> int conversion warning, while also preserving the
correct value in all cases.
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | render.c | 2 | ||||
| -rw-r--r-- | terminal.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fdb6d97d..dd0a2ee7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,9 @@ * XCursor shape in CSD corners when window is tiled. * Error handling when processing keyboard input (maybe https://codeberg.org/dnkl/foot/issues/171). +* Compilation error _"overflow in conversion from long 'unsigned int' + to 'int' changes value... "_ seen on platforms where the `request` + argument in `ioctl(3)` is an `int` (for example: linux/ppc64). ### Security @@ -2206,7 +2206,7 @@ maybe_resize(struct terminal *term, int width, int height, bool force) term->margins.left, term->margins.right, term->margins.top, term->margins.bottom); /* Signal TIOCSWINSZ */ - if (term->ptmx >= 0 && ioctl(term->ptmx, TIOCSWINSZ, + if (term->ptmx >= 0 && ioctl(term->ptmx, (unsigned int)TIOCSWINSZ, &(struct winsize){ .ws_row = term->rows, .ws_col = term->cols, @@ -928,7 +928,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, goto close_fds; } - if (ioctl(ptmx, TIOCSWINSZ, + if (ioctl(ptmx, (unsigned int)TIOCSWINSZ, &(struct winsize){.ws_row = 24, .ws_col = 80}) < 0) { LOG_ERRNO("failed to set initial TIOCSWINSZ"); |
