Skip to content

Commit

Permalink
Use setlocale at program initialisation.
Browse files Browse the repository at this point in the history
Patch from Arnaldo Carvalho de Melo.
  • Loading branch information
philb committed Apr 8, 2001
1 parent bcc9d70 commit d07aec8
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 11 deletions.
6 changes: 4 additions & 2 deletions arp.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* NET-3 Networking Distribution for the LINUX operating
* system.
*
* Version: $Id: arp.c,v 1.19 2000/12/19 00:34:27 ecki Exp $
* Version: $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
*
* Maintainer: Bernd 'eckes' Eckenfels, <[email protected]>
*
Expand Down Expand Up @@ -44,6 +44,7 @@
*990101 {1.85} Bernd Eckenfels fixed usage and return codes
*990105 (1.86) Phil Blundell: don't ignore EINVAL in arp_set
*991121 (1.87) Bernd Eckenfels: yes --device has a mandatory arg
*010404 (1.88) Arnaldo Carvalho de Melo: use setlocale
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Expand Down Expand Up @@ -79,7 +80,7 @@
#define FEATURE_ARP
#include "lib/net-features.h"

char *Release = RELEASE, *Version = "arp 1.87 (1999-11-21)";
char *Release = RELEASE, *Version = "arp 1.88 (2001-04-04)";

int opt_n = 0; /* do not resolve addresses */
int opt_N = 0; /* use symbolic names */
Expand Down Expand Up @@ -655,6 +656,7 @@ int main(int argc, char **argv)
};

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
4 changes: 3 additions & 1 deletion hostname.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*960218 {1.96} Bernd Eckenfels : netinet/in.h added
*980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
*20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
*20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Expand All @@ -46,7 +47,7 @@
#include <netdnet/dn.h>
#endif

char *Release = RELEASE, *Version = "hostname 1.99 (2000-02-13)";
char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";

static char *program_name;
static int opt_v;
Expand Down Expand Up @@ -280,6 +281,7 @@ int main(int argc, char **argv)
{0, 0, 0, 0}
};
#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
4 changes: 3 additions & 1 deletion ifconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* that either displays or sets the characteristics of
* one or more of the system's networking interfaces.
*
* Version: $Id: ifconfig.c,v 1.46 2001/04/01 14:50:24 pb Exp $
* Version: $Id: ifconfig.c,v 1.47 2001/04/08 17:05:05 pb Exp $
*
* Author: Fred N. van Kempen, <[email protected]>
* and others. Copyright 1993 MicroWalt Corporation
Expand All @@ -22,6 +22,7 @@
* 10/1998 - Andi Kleen. Use interface list primitives.
* 20001008 - Bernd Eckenfels, Patch from RH for setting mtu
* (default AF was wrong)
* 20010404 - Arnaldo Carvalho de Melo, use setlocale
*/

#define DFLT_AF "inet"
Expand Down Expand Up @@ -250,6 +251,7 @@ int main(int argc, char **argv)
#endif

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
1 change: 1 addition & 0 deletions intl.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Dummy header for libintl.h */

#if I18N
#include <locale.h>
#undef __OPTIMIZE__
#include <libintl.h>
#define _(String) gettext((String))
Expand Down
6 changes: 5 additions & 1 deletion ipmaddr.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
*
* Authors: Alexey Kuznetsov, <[email protected]>
*
* Changes: Arnaldo Carvalho de Melo <[email protected]>
* 20010404 - use setlocale
*
*/

#include <stdio.h>
Expand Down Expand Up @@ -42,7 +45,7 @@ int filter_family;
#define DELADDR 2

char *Release = RELEASE,
*Version = "ipmaddr 1.0",
*Version = "ipmaddr 1.1",
*Signature = "Alexey Kuznetsov, <[email protected]>";

static void version(void)
Expand Down Expand Up @@ -388,6 +391,7 @@ int main(int argc, char **argv)
char *basename;

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
2 changes: 2 additions & 0 deletions iptunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Rani Assaf <[email protected]> 980929: resolve addresses
* Rani Assaf <[email protected]> 980930: do not allow key for ipip/sit
* Bernd Eckenfels 990715: add linux/types.h (not clean but solves missing __u16
* Arnaldo Carvalho de Melo 20010404: use setlocale
*/

#include <stdio.h>
Expand Down Expand Up @@ -581,6 +582,7 @@ int main(int argc, char **argv)
char *basename;

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
6 changes: 4 additions & 2 deletions netstat.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* NET-3 Networking Distribution for the LINUX operating
* system.
*
* Version: $Id: netstat.c,v 1.41 2001/04/01 15:04:43 pb Exp $
* Version: $Id: netstat.c,v 1.42 2001/04/08 17:05:05 pb Exp $
*
* Authors: Fred Baumgarten, <[email protected]>
* Fred N. van Kempen, <[email protected]>
Expand Down Expand Up @@ -57,6 +57,7 @@
* Tuan Hoang added IGMP support for IPv4 and IPv6
*
*990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one()
*20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
Expand Down Expand Up @@ -121,7 +122,7 @@ typedef enum {
#define FEATURE_NETSTAT
#include "lib/net-features.h"

char *Release = RELEASE, *Version = "netstat 1.40 (2001-04-01)", *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang and others";
char *Release = RELEASE, *Version = "netstat 1.41 (2001-04-08)", *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang and others";


#define E_READ -1
Expand Down Expand Up @@ -1548,6 +1549,7 @@ int main
};

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
1 change: 1 addition & 0 deletions plipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ int main(int argc, char **argv)
char **spp;

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
6 changes: 4 additions & 2 deletions rarp.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* that maintains the kernel's RARP cache. It is derived
* from Fred N. van Kempen's arp command.
*
* Version: $Id: rarp.c,v 1.5 1999/01/05 20:53:02 philip Exp $
* Version: $Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
*
* Usage: rarp -d hostname Delete entry
* rarp -s hostname ethernet_address Add entry
Expand All @@ -13,6 +13,7 @@
* Rewritten: Phil Blundell <[email protected]> 1997-08-03
* gettext instead of catgets: Arnaldo Carvalho de Melo <[email protected]> 1998-06-29
* 1998-01-01 Bernd Eckenfels reorganised usage()
* 2001-04-04 Arnaldo Carvalho de Melo - use setlocale
*
*/

Expand Down Expand Up @@ -42,7 +43,7 @@

static char no_rarp_message[] = N_("This kernel does not support RARP.\n");

static char version_string[] = RELEASE "\nrarp 1.02 (1998-06-30)\n";
static char version_string[] = RELEASE "\nrarp 1.03 (2001-04-04)\n";

static struct hwtype *hardware = NULL;

Expand Down Expand Up @@ -208,6 +209,7 @@ int main(int argc, char **argv)
int fd;

#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down
6 changes: 4 additions & 2 deletions route.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* route This file contains an implementation of the command
* that manages the IP routing table in the kernel.
*
* Version: $Id: route.c,v 1.7 2000/12/19 00:26:16 ecki Exp $
* Version: $Id: route.c,v 1.8 2001/04/08 17:05:05 pb Exp $
*
* Maintainer: Bernd 'eckes' Eckenfels, <[email protected]>
*
Expand Down Expand Up @@ -33,6 +33,7 @@
*960823 {x.xx} Frank Strauss: INET6 stuff
*980629 {1.95} Arnaldo Carvalho de Melo: gettext instead of catgets
*990101 {1.96} Bernd Eckenfels: fixed usage and FLAG_CACHE Output
*20010404 {1.97} Arnaldo Carvalho de Melo: use setlocale
*
*/
#include <sys/types.h>
Expand Down Expand Up @@ -65,7 +66,7 @@
#define FEATURE_ROUTE
#include "lib/net-features.h" /* needs some of the system includes above! */

char *Release = RELEASE, *Version = "route 1.96 (1999-01-01)";
char *Release = RELEASE, *Version = "route 1.97 (2001-04-04)";

int opt_n = 0; /* numerical output flag */
int opt_v = 0; /* debugging output flag */
Expand Down Expand Up @@ -123,6 +124,7 @@ int main(int argc, char **argv)
char *progname;
int options;
#if I18N
setlocale (LC_ALL, "");
bindtextdomain("net-tools", "/usr/share/locale");
textdomain("net-tools");
#endif
Expand Down

0 comments on commit d07aec8

Please sign in to comment.