diff -dru psmisc-21.2/src/fuser.c psmisc-21.2.fjo/src/fuser.c --- psmisc-21.2/src/fuser.c Fri Sep 27 12:58:54 2002 +++ psmisc-21.2.fjo/src/fuser.c Mon Apr 28 11:35:35 2003 @@ -27,18 +27,17 @@ #include #include #include -#ifdef __linux__ -#include /* for MKDEV */ -#include /* for LOOP_MAJOR */ -#endif #include #include -#define _(String) gettext (String) +#define _(String) String #include "comm.h" #include "loop.h" /* for loop_info */ #include "signals.h" +#define MINORBITS 8 +#define MAJOR(dev) ((unsigned int) ((dev) >> MINORBITS)) +#define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi)) #define PROC_BASE "/proc" #define UID_UNKNOWN -1 @@ -979,11 +978,6 @@ sig_number = SIGKILL; name_space = name_spaces; no_files = 1; - - /* Setup the i18n */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); if (argc < 2) usage (); diff -dru psmisc-21.2/src/killall.c psmisc-21.2.fjo/src/killall.c --- psmisc-21.2/src/killall.c Thu Sep 5 00:22:39 2002 +++ psmisc-21.2.fjo/src/killall.c Mon Apr 28 11:35:53 2003 @@ -26,7 +26,7 @@ #endif /*FLASK_LINUX*/ #include #include -#define _(String) gettext (String) +#define _(String) String #include "comm.h" #include "signals.h" @@ -459,11 +459,6 @@ name = *argv; pidof = strcmp (name, "killall"); sig_num = SIGTERM; - - /* Setup the i18n */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); opterr = 0; while ( (optc = getopt_long_only(argc,argv,"egilqs:vwS:c:V",options,NULL)) != EOF) { diff -dru psmisc-21.2/src/pstree.c psmisc-21.2.fjo/src/pstree.c --- psmisc-21.2/src/pstree.c Fri Sep 27 13:44:17 2002 +++ psmisc-21.2.fjo/src/pstree.c Mon Apr 28 11:36:25 2003 @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -851,14 +850,6 @@ } if (optind != argc) usage (); - if (sym == &sym_ascii) { - /* - * If the locale's charset is UTF-8, automatically - * use the UTF-8 symbols - */ - if (!strcmp(nl_langinfo(CODESET), "UTF-8")) - sym = &sym_utf; - } read_proc (); for (current = find_proc (highlight); current; current = current->parent) current->highlight = 1;