1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
1999-03-25  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/README: Update from tzdata1999c and tzcode1999c.

	* timezone/africa: Update from tzdata1999c.
	* timezone/antarctica: Likewise.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/zone.tab: Likewise.

	* timezone/zic.c: Update from tzcode1999c.
This commit is contained in:
Andreas Schwab
1999-03-29 00:19:49 +00:00
parent 3c022f42db
commit b9f1792afb
11 changed files with 119 additions and 111 deletions

View File

@ -1,6 +1,6 @@
#ifndef lint
#ifndef NOID
static char elsieid[] = "@(#)zic.c 7.96";
static char elsieid[] = "@(#)zic.c 7.99";
#endif /* !defined NOID */
#endif /* !defined lint */
@ -563,12 +563,18 @@ _("%s: More than one -L option specified\n"),
/*
** Make links.
*/
for (i = 0; i < nlinks; ++i)
for (i = 0; i < nlinks; ++i) {
eat(links[i].l_filename, links[i].l_linenum);
dolink(links[i].l_from, links[i].l_to);
if (lcltime != NULL)
}
if (lcltime != NULL) {
eat("command line", 1);
dolink(lcltime, TZDEFAULT);
if (psxrules != NULL)
}
if (psxrules != NULL) {
eat("command line", 1);
dolink(psxrules, TZDEFRULES);
}
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
@ -605,12 +611,20 @@ const char * const tofile;
if (mkdirs(toname) != 0)
(void) exit(EXIT_FAILURE);
result = link(fromname, toname);
#if (HAVE_SYMLINK - 0)
if (result != 0) {
result = symlink(fromname, toname);
char *s = (char *) tofile;
register char * symlinkcontents = NULL;
while ((s = strchr(s+1, '/')) != NULL)
symlinkcontents = ecatalloc(symlinkcontents, "../");
symlinkcontents = ecatalloc(symlinkcontents, fromfile);
result = symlink(symlinkcontents, toname);
if (result == 0)
warning(_("hard link failed, symbolic link used"));
ifree(symlinkcontents);
}
#endif
if (result != 0) {