From 933e73facc338fb81f1f72af416ea57fbf439a2f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 6 Mar 1995 03:00:08 +0000 Subject: Sun Mar 5 19:40:13 1995 Roland McGrath * locale/localeinfo.h: Rewritten for new locale system, using locale data files and with interface. * locale/setlocale.c: Rewritten to use locale data files. * langinfo.h: New file. * locale/langinfo.h: New file. * locale/nl_langinfo.c: New file. * locale/loadlocale.c: New file. * locale/lc-ctype.c: New file. * locale/lc-messages.c: New file. * locale/lc-monetary.c: New file. * locale/lc-numeric.c: New file. * locale/lc-time.c: New file. * locale/categories.def: New file. * locale/Makefile (headers): Remove localeinfo.h. (distribute): New variable; put localeinfo.h here, and categories.def. (routines): Add loadlocale. (categories): New variable. (aux): Use that to get C-category and lc-category. * ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum. * locale/C-ctype.c, locale/C-messages.c: New files. * locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Default "C" locale data updated for new locale system. * locale/C-collate.c: File removed. * locale/C-ctype_ct.c: File removed. * locale/C-ctype_mb.c: File removed. * locale/C-response.c: File removed. * locale/localeconv.c: Use _NL_CURRENT macro to access locale data. * stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c, stdlib/strtod.c, time/asctime.c, time/strftime.c: Include ../locale/localeinfo.h and use _NL_CURRENT macro to access locale data. * time/localtime.c: Don't include . * time/tzset.c: Don't use locale items for default TZ value or "GMT" string (use "UTC"). * stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if WIDTH>0; update DONE. * malloc/malloc.c (morecore): Fix last change to calculate by blocks instead of bytes. --- time/tzset.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'time/tzset.c') diff --git a/time/tzset.c b/time/tzset.c index e4d5209e88..3eac151f22 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -17,7 +17,6 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include -#include #include #include #include @@ -111,22 +110,21 @@ DEFUN_VOID(__tzset) tz = NULL; } - if (tz == NULL || *tz == '\0') - tz = _time_info->tz; if (tz == NULL || *tz == '\0') { __tzfile_read((char *) NULL); if (!__use_tzfile) { - size_t len = strlen(_time_info->ut0) + 1; + const char UTC[] = "UTC"; + size_t len = sizeof UTC; tz_rules[0].name = (char *) malloc(len); if (tz_rules[0].name == NULL) return; tz_rules[1].name = (char *) malloc(len); if (tz_rules[1].name == NULL) return; - memcpy((PTR) tz_rules[0].name, _time_info->ut0, len); - memcpy((PTR) tz_rules[1].name, _time_info->ut0, len); + memcpy ((PTR) tz_rules[0].name, UTC, len); + memcpy ((PTR) tz_rules[1].name, UTC, len); tz_rules[0].type = tz_rules[1].type = J0; tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0; tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0; @@ -139,7 +137,7 @@ DEFUN_VOID(__tzset) return; } - /* Clear out old state and reset to unnamed GMT. */ + /* Clear out old state and reset to unnamed UTC. */ memset (tz_rules, 0, sizeof tz_rules); tz_rules[0].name = tz_rules[1].name = (char *) ""; @@ -165,7 +163,7 @@ DEFUN_VOID(__tzset) tz += l; - /* Figure out the standard offset from GMT. */ + /* Figure out the standard offset from UTC. */ if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit(*tz))) return; -- cgit v1.2.3