diff options
Diffstat (limited to 'usr.sbin/zic/zdump.c')
| -rw-r--r-- | usr.sbin/zic/zdump.c | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/usr.sbin/zic/zdump.c b/usr.sbin/zic/zdump.c index 1058a84..3288211 100644 --- a/usr.sbin/zic/zdump.c +++ b/usr.sbin/zic/zdump.c @@ -1,6 +1,6 @@ #ifndef lint #ifndef NOID -static char elsieid[] = "@(#)zdump.c 7.24"; +static char elsieid[] = "@(#)zdump.c 7.20"; #endif /* !defined NOID */ #endif /* !defined lint */ @@ -68,11 +68,6 @@ static char elsieid[] = "@(#)zdump.c 7.24"; #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) #endif /* !defined isleap */ -#if HAVE_GETTEXT - 0 -#include "locale.h" /* for setlocale */ -#include "libintl.h" -#endif /* HAVE_GETTEXT - 0 */ - #ifndef GNUC_or_lint #ifdef lint #define GNUC_or_lint @@ -93,24 +88,6 @@ static char elsieid[] = "@(#)zdump.c 7.24"; #endif /* !defined GNUC_or_lint */ #endif /* !defined INITIALIZE */ -/* -** For the benefit of GNU folk... -** `_(MSGID)' uses the current locale's message library string for MSGID. -** The default is to use gettext if available, and use MSGID otherwise. -*/ - -#ifndef _ -#if HAVE_GETTEXT - 0 -#define _(msgid) gettext(msgid) -#else /* !(HAVE_GETTEXT - 0) */ -#define _(msgid) msgid -#endif /* !(HAVE_GETTEXT - 0) */ -#endif /* !defined _ */ - -#ifndef TZ_DOMAIN -#define TZ_DOMAIN "tz" -#endif /* !defined TZ_DOMAIN */ - extern char ** environ; extern int getopt(); extern char * optarg; @@ -145,13 +122,6 @@ char * argv[]; struct tm newtm; INITIALIZE(cuttime); -#if HAVE_GETTEXT - 0 - (void) setlocale(LC_MESSAGES, ""); -#ifdef TZ_DOMAINDIR - (void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR); -#endif /* defined(TEXTDOMAINDIR) */ - (void) textdomain(TZ_DOMAIN); -#endif /* HAVE_GETTEXT - 0 */ progname = argv[0]; vflag = 0; cutoff = NULL; @@ -162,7 +132,7 @@ char * argv[]; if (c != EOF || (optind == argc - 1 && strcmp(argv[optind], "=") == 0)) { (void) fprintf(stderr, -_("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"), +"%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n", argv[0], argv[0]); (void) exit(EXIT_FAILURE); } @@ -208,10 +178,9 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"), static char buf[MAX_STRING_LENGTH]; (void) strcpy(&fakeenv[0][3], argv[i]); - if (!vflag) { - show(argv[i], now, FALSE); + show(argv[i], now, FALSE); + if (!vflag) continue; - } /* ** Get lowest value of t. */ @@ -255,9 +224,9 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"), show(argv[i], t, TRUE); } if (fflush(stdout) || ferror(stdout)) { - (void) fprintf(stderr, _("%s: Error writing standard output "), + (void) fprintf(stderr, "%s: Error writing standard output ", argv[0]); - (void) perror(_("standard output")); + (void) perror("standard output"); (void) exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); |
