continuing with msgcat.c stuff

.github/workflows/codeql.yml

@@ -77,10 +77,11 @@ jobs:
               echo "linuxbrew not found in its usual location"; \
             fi
             if test -x "$(which brew)"; then \
-              echo "attempting to use $(which brew) to install kmod"; \
+              echo "attempting to use $(which brew) to install stuff"; \
               brew install kmod || echo "failed to install kmod with $(which brew)"; \
+              brew install util-linux || echo "brew failed to install util-linux"; \
             else \
-              echo "skipping attempting to use Homebrew to install kmod"; \
+              echo "skipping attempting to use Homebrew to install stuff"; \
             fi
             ;;
           macos*)

configure.ac

@@ -274,8 +274,8 @@ AC_CHECK_HEADERS([_types/_nl_item.h \
                   OS.h alloc.h assert.h bits/libc-lock.h cdefs.h \
                   float.h fshelp.h fstab.h \
                   fts.h ftw.h gnu-versions.h iconv.h io.h iostream.h \
-                  lcrypt.h libcharset.h libintl.h \
-                  libio/iolibio.h libio/libioP.h limits.h locale.h \
+                  lcrypt.h libcharset.h libintl.h libio/iolibio.h \
+                  libio/libioP.h libkern/OSByteOrder.h limits.h locale.h \
                   mach/mach.h machine/endian.h malloc.h malloc/malloc.h \
                   memcopy.h memrchr.h mm.h mntent.h mnttab.h module.h \
                   netdb.h nl_types.h os2.h process.h ptms.h publib.h \

msgcat.c

@@ -72,8 +72,14 @@ __FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.49 2005/02/01 16:04:55 phantom
 # if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 #  warning "msgcat.c expects <machine/endian.h> to be included."
 # endif /* __GNUC__ && !__STRICT_ANSI__ */
-#endif /* HAVE_XLOCALE_H */
-#include <libkern/OSByteOrder.h>
+#endif /* HAVE_MACHINE_ENDIAN_H */
+#if defined(HAVE_LIBKERN_OSBYTEORDER_H) || __has_include(<libkern/OSByteOrder.h>)
+# include <libkern/OSByteOrder.h>
+#else
+# if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#  warning "msgcat.c expects <libkern/OSByteOrder.h> to be included."
+# endif /* __GNUC__ && !__STRICT_ANSI__ */
+#endif /* HAVE_LIBKERN_OSBYTEORDER_H */
 #include "un-namespace.h"
 
 #include "msgcat.h"
@@ -98,7 +104,8 @@ static void     __nls_free_resources(MCCatT *, int);
 nl_catd
 catopen(__const char *name, int type)
 {
-	int             spcleft, saverr;
+	size_t          spcleft;
+	int             saverr;
 	char            path[PATH_MAX];
 	char            *base, *cptr, *pathP;
 	char            *cptr1, *plang;