chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
libsystemd-terminal
/
subterm.c
diff --git
a/src/libsystemd-terminal/subterm.c
b/src/libsystemd-terminal/subterm.c
index 7c119ac58aa02eb4e96953bde9c48d5be66af40a..983a2a14abd74bacbb232396597b1a6eff2b2ea0 100644
(file)
--- a/
src/libsystemd-terminal/subterm.c
+++ b/
src/libsystemd-terminal/subterm.c
@@
-26,7
+26,6
@@
* parent TTY. Think of this like what "GNU-screen" does.
*/
* parent TTY. Think of this like what "GNU-screen" does.
*/
-#include <assert.h>
#include <errno.h>
#include <stdarg.h>
#include <stdbool.h>
#include <errno.h>
#include <stdarg.h>
#include <stdbool.h>
@@
-161,16
+160,14
@@
static int output_write(Output *o, const void *buf, size_t size) {
_printf_(3,0)
static int output_vnprintf(Output *o, size_t max, const char *format, va_list args) {
_printf_(3,0)
static int output_vnprintf(Output *o, size_t max, const char *format, va_list args) {
- char buf[
4096
];
+ char buf[
max
];
int r;
assert_return(o, -EINVAL);
assert_return(format, -EINVAL);
int r;
assert_return(o, -EINVAL);
assert_return(format, -EINVAL);
- assert_return(max <=
sizeof(buf)
, -EINVAL);
+ assert_return(max <=
4096
, -EINVAL);
- r = vsnprintf(buf, max, format, args);
- if (r > (ssize_t)max)
- r = max;
+ r = MIN(vsnprintf(buf, max, format, args), (int) max);
return output_write(o, buf, r);
}
return output_write(o, buf, r);
}