rainlance/amiga-tz
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/amiga-tz.git synced 2025-12-07 14:54:57 +00:00
Code Releases Activity

some deconditionalization

Browse Source 
SCCS-file: strftime.c
SCCS-SID: 7.26
This commit is contained in:
Arthur David Olson
1994-08-20 17:09:40 -04:00
committed by Paul Eggert
parent a9a9cf9f69
commit 96ff4aa28d
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
strftime.c
View File

@ -5,11 +5,6 @@ static char elsieid[] = "%W%";
** Based on the UCB version with the ID appearing below. ** Based on the UCB version with the ID appearing below.
** This is ANSIish only when "multibyte character == plain character". ** This is ANSIish only when "multibyte character == plain character".
*/ */
#ifndef EGGERT
/*
** This is ANSIish only when time is treated identically in all locales.
*/
#endif /* !defined EGGERT */
#endif /* !defined NOID */ #endif /* !defined NOID */
#endif /* !defined lint */ #endif /* !defined lint */
@ -39,12 +34,10 @@ static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
#endif /* !defined LIBC_SCCS */ #endif /* !defined LIBC_SCCS */
#include "tzfile.h" #include "tzfile.h"
#ifdef EGGERT
#include "fcntl.h" #include "fcntl.h"
#if HAVE_SETLOCALE - 0 #if HAVE_SETLOCALE - 0
#include "locale.h" #include "locale.h"
#endif /* HAVE_SETLOCALE - 0 */ #endif /* HAVE_SETLOCALE - 0 */
#endif /* defined EGGERT */
struct lc_time_T { struct lc_time_T {
const char * mon[12]; const char * mon[12];
@ -454,10 +447,6 @@ static const struct lc_time_T *
_loc(ptloc) _loc(ptloc)
struct lc_time_T * ptloc; struct lc_time_T * ptloc;
{ {
#ifndef EGGERT
return &C_time_locale;
#endif /* !defined EGGERT */
#ifdef EGGERT
static const char locale_home[] = LOCALE_HOME; static const char locale_home[] = LOCALE_HOME;
static const char lc_time[] = "LC_TIME"; static const char lc_time[] = "LC_TIME";
static char * locale_buf; static char * locale_buf;
@ -507,14 +496,14 @@ struct lc_time_T * ptloc;
sizeof(locale_home) + namesize + sizeof(lc_time)) sizeof(locale_home) + namesize + sizeof(lc_time))
goto no_locale; goto no_locale;
(void) sprintf(filename, "%s/%s/%s", locale_home, name, lc_time); (void) sprintf(filename, "%s/%s/%s", locale_home, name, lc_time);
fd = open(filename, O_RDONLY, 0); fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
/* /*
** Old Sun systems have a different naming convention. ** Old Sun systems have a different naming convention.
*/ */
(void) sprintf(filename, "%s/%s/%s", locale_home, (void) sprintf(filename, "%s/%s/%s", locale_home,
lc_time, name); lc_time, name);
fd = open(filename, O_RDONLY, 0); fd = open(filename, O_RDONLY);
if (fd < 0) if (fd < 0)
goto no_locale; goto no_locale;
} }
@ -564,5 +553,4 @@ no_locale:
*ptloc = C_time_locale; *ptloc = C_time_locale;
locale_buf = locale_buf_C; locale_buf = locale_buf_C;
return ptloc; return ptloc;
#endif /* defined EGGERT */
} }