emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

escape.c: Fix missing nl_langinfo on certain configs

Browse Source 
nl_langinfo and CODESET are undefined in a musl system. Instead of
uncondionally including langinfo.h, this change includes include/nls.h
which has the tests and work-arounds for systems that don't have these
features. This is similar to how other programs within procps include
langinfo.h via nls.h

References:
 procps-ng/procps!130

Signed-off-by: Craig Small <csmall@dropbear.xyz>
This commit is contained in:
Issam E. Maghni 2021-04-24 11:46:48 +10:00 committed by Craig Small
parent 71764980c3
commit 6c36ab4fc7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proc/escape.c
View File

@ -18,13 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <langinfo.h>
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "escape.h" #include "escape.h"
#include "readproc.h" #include "readproc.h"
#include "nls.h"
#define SECURE_ESCAPE_ARGS(dst, bytes) do { \ #define SECURE_ESCAPE_ARGS(dst, bytes) do { \
if ((bytes) <= 0) return 0; \ if ((bytes) <= 0) return 0; \