patched to work with uclibc

diff --git a/ChangeLog b/ChangeLog
index b889818c3c02c115d7c5846c58f5359558ba2a98..13ccc4266e9317388bad0511d0fc051c4b94c681 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes in 21.5
 not-yet-released
+       * Sven Dahl provides a patch for using psmisc with uclibc
 
 2003-11-28  gettextize  <bug-gnu-gettext@gnu.org>
 

diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index bd8eb29a5c53f3ef12381fc3327ba25f86496b48..07823d3f7c1c27442c8faa7b8066ab94e18245a5 100644 (file)
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -17,19 +17,19 @@
                       {
                         'm4_pattern_forbid' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_C_VOLATILE' => 1,
                         'AC_TYPE_OFF_T' => 1,
+                        'AC_C_VOLATILE' => 1,
                         'AC_FUNC_CLOSEDIR_VOID' => 1,
                         'AC_REPLACE_FNMATCH' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AC_FUNC_STAT' => 1,
-                        'AC_FUNC_WAIT3' => 1,
                         'AC_HEADER_TIME' => 1,
-                        'AC_FUNC_LSTAT' => 1,
-                        'AC_STRUCT_TM' => 1,
+                        'AC_FUNC_WAIT3' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_FUNC_GETMNTENT' => 1,
+                        'AC_STRUCT_TM' => 1,
+                        'AC_FUNC_LSTAT' => 1,
                         'AC_TYPE_MODE_T' => 1,
+                        'AC_FUNC_GETMNTENT' => 1,
                         'AC_FUNC_STRTOD' => 1,
                         'AC_CHECK_HEADERS' => 1,
                         'AC_FUNC_STRNLEN' => 1,
@@ -48,17 +48,17 @@
                         'AC_STRUCT_ST_BLOCKS' => 1,
                         'AC_TYPE_SIGNAL' => 1,
                         'AC_TYPE_UID_T' => 1,
-                        'AC_PROG_MAKE_SET' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AC_PROG_MAKE_SET' => 1,
                         'sinclude' => 1,
+                        'm4_pattern_allow' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AC_FUNC_STRERROR_R' => 1,
                         'AC_PROG_CC' => 1,
-                        'AC_DECL_SYS_SIGLIST' => 1,
                         'AC_FUNC_FORK' => 1,
-                        'AC_FUNC_STRCOLL' => 1,
+                        'AC_DECL_SYS_SIGLIST' => 1,
                         'AC_FUNC_VPRINTF' => 1,
+                        'AC_FUNC_STRCOLL' => 1,
                         'AC_PROG_YACC' => 1,
                         'AC_INIT' => 1,
                         'AC_STRUCT_TIMEZONE' => 1,
@@ -80,33 +80,33 @@
                         'AM_MAINTAINER_MODE' => 1,
                         'AC_FUNC_UTIME_NULL' => 1,
                         'AC_FUNC_SELECT_ARGTYPES' => 1,
-                        'AC_HEADER_STAT' => 1,
                         'AC_FUNC_STRFTIME' => 1,
-                        'AC_PROG_CPP' => 1,
+                        'AC_HEADER_STAT' => 1,
                         'AC_C_INLINE' => 1,
-                        'AC_PROG_LEX' => 1,
-                        'AC_C_CONST' => 1,
+                        'AC_PROG_CPP' => 1,
                         'AC_TYPE_PID_T' => 1,
+                        'AC_C_CONST' => 1,
+                        'AC_PROG_LEX' => 1,
                         'AC_CONFIG_FILES' => 1,
                         'include' => 1,
                         'AC_FUNC_SETVBUF_REVERSED' => 1,
                         'AC_PROG_INSTALL' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AC_CHECK_LIB' => 1,
                         'AC_FUNC_OBSTACK' => 1,
+                        'AC_CHECK_LIB' => 1,
                         'AC_FUNC_MALLOC' => 1,
                         'AC_FUNC_GETGROUPS' => 1,
                         'AC_FUNC_GETLOADAVG' => 1,
                         'AH_OUTPUT' => 1,
                         'AC_FUNC_FSEEKO' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_FUNC_MKTIME' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
                         'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_FUNC_MKTIME' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_HEADER_SYS_WAIT' => 1,
-                        'AC_PROG_LN_S' => 1,
                         'AC_FUNC_MEMCMP' => 1,
+                        'AC_PROG_LN_S' => 1,
                         'm4_include' => 1,
                         'AC_HEADER_DIRENT' => 1,
                         'AC_CHECK_FUNCS' => 1

diff --git a/config.h.in b/config.h.in
index 55af3d6419f7c1a846b2a876314e61e1fb796e26..fc233771169457a31432e1a36e1062d7bb6ff941 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,154 +1,238 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
+/* 
+   Define to 1 if translation of program messages
+   to the user's native language is requested. */
 #undef ENABLE_NLS
 
-/* Use Security-Enhanced Linux features */
+/* 
+   Use Security-Enhanced Linux features */
 #undef FLASK_LINUX
 
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
+/* 
+   Define if the GNU dcgettext() function is already
+   present or preinstalled. */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
+/* 
+   Define to 1 if you have the <dirent.h>
+   header file, and it defines `DIR'. */
 #undef HAVE_DIRENT_H
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
+/* 
+   Define to 1 if you have the <dlfcn.h>
+   header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <fcntl.h> header file. */
+/* 
+   Define to 1 if you have the <fcntl.h>
+   header file. */
 #undef HAVE_FCNTL_H
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
+/* 
+   Define if the GNU gettext() function is already
+   present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define if you have the iconv() function. */
+/* 
+   Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* 
+   Define to 1 if you have the <inttypes.h>
+   header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <limits.h> header file. */
+/* 
+   Define to 1 if you have the <limits.h>
+   header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the <memory.h> header file. */
+/* 
+   Define to 1 if you have the <memory.h>
+   header file. */
 #undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* 
+   Define to 1 if you have the <ndir.h>
+   header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
-/* Define to 1 if you have the <stdint.h> header file. */
+/* 
+   Define to 1 if you have the <stdint.h>
+   header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
+/* 
+   Define to 1 if you have the <stdlib.h>
+   header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strdup' function. */
+/* 
+   Define to 1 if you have the `strdup'
+   function. */
 #undef HAVE_STRDUP
 
-/* Define to 1 if you have the `strerror' function. */
+/* 
+   Define to 1 if you have the `strerror'
+   function. */
 #undef HAVE_STRERROR
 
-/* Define to 1 if you have the <strings.h> header file. */
+/* 
+   Define to 1 if you have the <strings.h>
+   header file. */
 #undef HAVE_STRINGS_H
 
-/* Define to 1 if you have the <string.h> header file. */
+/* 
+   Define to 1 if you have the <string.h>
+   header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strtoul' function. */
+/* 
+   Define to 1 if you have the `strtoul'
+   function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
+/* 
+   Define to 1 if `st_rdev' is member of
+   `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
-   `HAVE_STRUCT_STAT_ST_RDEV' instead. */
+/* 
+   Define to 1 if your `struct stat' has
+   `st_rdev'. Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' instead. */
 #undef HAVE_ST_RDEV
 
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
+/* 
+   Define to 1 if you have the <sys/dir.h>
+   header file, and it defines `DIR'. */
 #undef HAVE_SYS_DIR_H
 
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* 
+   Define to 1 if you have the <sys/ioctl.h>
+   header file. */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
+/* 
+   Define to 1 if you have the <sys/ndir.h>
+   header file, and it defines `DIR'. */
 #undef HAVE_SYS_NDIR_H
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
+/* 
+   Define to 1 if you have the <sys/stat.h>
+   header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/types.h> header file. */
+/* 
+   Define to 1 if you have the <sys/types.h>
+   header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the <termcap.h> header file. */
+/* 
+   Define to 1 if you have the <termcap.h>
+   header file. */
 #undef HAVE_TERMCAP_H
 
-/* Define to 1 if you have the <unistd.h> header file. */
+/* 
+   Define to 1 if you have the <unistd.h>
+   header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if ino_t type is int */
+/* 
+   Define to 1 if ino_t type is int
+   */
 #undef INO_T_IS_INT
 
-/* Define to 1 if ino_t type is long long */
+/* 
+   Define to 1 if ino_t type is long
+   long */
 #undef INO_T_IS_LONG_LONG
 
-/* Name of package */
+/* 
+   Name of package */
 #undef PACKAGE
 
-/* Define to the address where bug reports for this package should be sent. */
+/* 
+   Define to the address where bug reports for
+   this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
-/* Define to the full name of this package. */
+/* 
+   Define to the full name of this package.
+   */
 #undef PACKAGE_NAME
 
-/* Define to the full name and version of this package. */
+/* 
+   Define to the full name and version of
+   this package. */
 #undef PACKAGE_STRING
 
-/* Define to the one symbol short name of this package. */
+/* 
+   Define to the one symbol short name of
+   this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the version of this package. */
+/* 
+   Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* The size of a `ino_t', as computed by sizeof. */
+/* 
+   The size of a `ino_t', as computed by
+   sizeof. */
 #undef SIZEOF_INO_T
 
-/* The size of a `int', as computed by sizeof. */
+/* 
+   The size of a `int', as computed by
+   sizeof. */
 #undef SIZEOF_INT
 
-/* The size of a `long', as computed by sizeof. */
+/* 
+   The size of a `long', as computed by
+   sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of a `long long', as computed by sizeof. */
+/* 
+   The size of a `long long', as computed
+   by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* Define to 1 if you have the ANSI C header files. */
+/* 
+   Define to 1 if you have the ANSI
+   C header files. */
 #undef STDC_HEADERS
 
-/* Version number of package */
+/* 
+   Version number of package */
 #undef VERSION
 
-/* Number of bits in a file offset, on hosts where this is settable. */
+/* 
+   Number of bits in a file offset, on
+   hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Define for large files, on AIX-style hosts. */
+/* 
+   Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define to empty if `const' does not conform to ANSI C. */
+/* 
+   Define to empty if `const' does not conform
+   to ANSI C. */
 #undef const
 
-/* Define to `int' if <sys/types.h> doesn't define. */
+/* 
+   Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* 
+   Define to `int' if <sys/types.h> does not define.
+   */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* 
+   Define to `unsigned' if <sys/types.h> does not define.
+   */
 #undef size_t
 
-/* Define to `int' if <sys/types.h> doesn't define. */
+/* 
+   Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t

diff --git a/src/fuser.c b/src/fuser.c
index 11df77781030c0abe0daad27bc6e59edcba8400f..75e482673f79a2180e558d74daef1e4b864c78ef 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -31,9 +31,13 @@
 #include <linux/kdev_t.h>      /* for MKDEV */
 #include <linux/major.h>       /* for LOOP_MAJOR */
 #endif
+#ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
 #define _(String) gettext (String)
+#else
+#define _(String) (String)
+#endif
 
 #include "comm.h"
 #include "loop.h"         /* for loop_info */
@@ -1007,9 +1011,11 @@ main (int argc, char **argv)
   no_files = 1;
 
   /* Setup the i18n */
+#ifdef ENABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   if (argc < 2)
     usage ();

diff --git a/src/killall.c b/src/killall.c
index 4bc08503cb3c9f538f4a490992a3bd2594da1e5c..ddf9c097e6d68dcef86ce0e8abcc8fd2b8f4d6b5 100644 (file)
--- a/src/killall.c
+++ b/src/killall.c
@@ -25,9 +25,13 @@
 #include <selinux/fs_secure.h>
 #include <selinux/ss.h>
 #endif /*FLASK_LINUX*/
+#ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
 #define _(String) gettext (String)
+#else
+#define _(String) (String)
+#endif
 
 #include "comm.h"
 #include "signals.h"
@@ -467,9 +471,11 @@ main (int argc, char **argv)
   sig_num = SIGTERM;
 
   /* Setup the i18n */
+#ifdef ENABLE_NLS
   setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
   opterr = 0;
 #ifdef FLASK_LINUX

diff --git a/src/pstree.c b/src/pstree.c
index 0b6696164eaee572b34f4e05fa8ac6afafc990b6..abb3090e566d300cd513095bc6298d5efc7e9072 100644 (file)
--- a/src/pstree.c
+++ b/src/pstree.c
@@ -18,12 +18,16 @@
 #include <termios.h>
 #include <termcap.h>
 #include <langinfo.h>
-#include <locale.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#ifdef ENABLE_NLS
+#include <locale.h>
 #include <libintl.h>
 #define _(String) gettext (String)
+#else
+#define _(String) (String)
+#endif
 
 #include "comm.h"
 
@@ -762,7 +766,9 @@ main (int argc, char **argv)
   highlight = 0;
   pw = NULL;
   
+#ifdef ENABLE_NLS
   setlocale(LC_ALL, "");
+#endif
   
   if ( (tmpstr = strrchr(argv[0],'/'))) {
     tmpstr++;