lib: add _PATH_TMP fallback

- cleanup header of the file
- fix fileutils.c warnings
- add _PATH_TMP fallback

Addresses: https://github.com/karelzak/util-linux/issues/931
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/pathnames.h b/include/pathnames.h
index ae098036989af3b121a2da562563a039cf7ee43a..97815e5f35124d1d496199a959576be50857825c 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -1,7 +1,6 @@
 /*
- * Vaguely based on
- *     @(#)pathnames.h 5.3 (Berkeley) 5/9/89
- * This code is in the public domain.
+ * No copyright is claimed.  This code is in the public domain; do with
+ * it what you wish.
  */
 #ifndef PATHNAMES_H
 #define PATHNAMES_H
@@ -64,6 +63,10 @@
 #define _PATH_SHADOW_PASSWD    "/etc/shadow"
 #define _PATH_SHELLS           "/etc/shells"
 
+#ifndef _PATH_TMP
+# define _PATH_TMP             "/tmp/"
+#endif
+
 #ifndef _PATH_BTMP
 # define _PATH_BTMP            "/var/log/btmp"
 #endif

diff --git a/lib/strutils.c b/lib/strutils.c
index 6e013f3a1a55ff9a5d06f38839b4a44e83de2d6e..84d2a1d7b11b5ea9dbcf80fbdd7d9e6541e1e91d 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -18,6 +18,7 @@
 #include "nls.h"
 #include "strutils.h"
 #include "bitops.h"
+#include "pathnames.h"
 
 static int STRTOXX_EXIT_CODE = EXIT_FAILURE;
 
@@ -1013,6 +1014,7 @@ int skip_fline(FILE *fp)
 }
 
 #ifdef TEST_PROGRAM_STRUTILS
+#include <stdio.h>
 
 static int test_strutils_sizes(int argc, char *argv[])
 {