rainlance/amiga-tz
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/amiga-tz.git synced 2025-12-06 22:44:01 +00:00
Code Releases Activity

revert to 7.105

Browse Source 
SCCS-file: zic.c
SCCS-SID: 7.107
This commit is contained in:
Arthur David Olson
2002-04-02 09:57:44 -05:00
committed by Paul Eggert
parent c530b8cba4
commit 566ed8b711
1 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
zic.c
View File

@ -584,8 +584,6 @@ _("%s: More than one -L option specified\n"),
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
#define link(x,y) (-1) /* XXX */
static void
dolink(fromfile, tofile)
const char * const fromfile;
@ -622,51 +620,19 @@ const char * const tofile;
result = link(fromname, toname);
#if (HAVE_SYMLINK - 0)
/*
** If hard link fails but from file exists, try a symbolic link.
** We want as relative a link as possible to maximize chances
** of correct behavior when the link is part of an
** exported directory.
*/
if (result != 0 &&
access(fromname, F_OK) == 0 &&
!itsdir(fromname)) {
register char * t = toname;
register char * f = fromname;
register char * s;
register int n;
const char *s = tofile;
register char * symlinkcontents = NULL;
while ((s = strchr(s+1, '/')) != NULL)
symlinkcontents = ecatalloc(symlinkcontents, "../");
symlinkcontents = ecatalloc(symlinkcontents, fromfile);
while ((s = strchr(t, '/')) != NULL &&
strncmp(t, f, (n = (s - t) + 1)) == 0) {
t += n;
f += n;
}
/*
** f t desired symlink value
** /a/b/c /d/e/f eliminated just above
** a/b/c d/e/f ../../a/b/c
** a/b d/e/f ../../a/b
** a/b/c d/e ../a/b/c
** /a/b/c d/e/f /a/b/c
** a/b/c /d/e/f hard to handle well
*/
if (*f == '/')
s = ecpyalloc(f);
else {
s = NULL;
if (*t != '/') {
while (*t != '\0')
if (*t++ == '/')
s = ecatalloc(s, "../");
s = ecatalloc(s, f);
}
}
if (s != NULL) {
result = symlink(s, toname);
ifree(s);
result = symlink(symlinkcontents, toname);
if (result == 0)
warning(_("hard link failed, symbolic link used"));
}
ifree(symlinkcontents);
}
#endif
if (result != 0) {