X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/32bb92453ac243264763fed4f77dbb7e36ed3763..a3cb24c438778a749767459900ad8ee6316cffdd:/slstatus.c?ds=inline diff --git a/slstatus.c b/slstatus.c index 2775788..6d2e89e 100644 --- a/slstatus.c +++ b/slstatus.c @@ -25,10 +25,7 @@ #include #include -#undef strlcat - -#include "extern/arg.h" -#include "extern/strlcat.h" +#include "arg.h" struct arg { char *(*func)(); @@ -811,9 +808,7 @@ main(int argc, char *argv[]) element = smprintf("%s", UNKNOWN_STR); warnx("Failed to format output"); } - if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string)) { - warnx("Output too long"); - } + strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1); free(res); free(element); }