 @@ -1,26 +1,26 @@
-/*	$NetBSD: zic.c,v 1.63 2016/10/07 15:29:42 christos Exp $	*/
+/*	$NetBSD: zic.c,v 1.64 2016/10/07 19:47:16 kre Exp $	*/
 /*
 ** This file is in the public domain, so clarified as of
 ** 2006-07-17 by Arthur David Olson.
 */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.63 2016/10/07 15:29:42 christos Exp $");
+__RCSID("$NetBSD: zic.c,v 1.64 2016/10/07 19:47:16 kre Exp $");
 #endif /* !defined lint */
 #include "private.h"
 #include "locale.h"
 #include "tzfile.h"
 #include <stdarg.h>
 #include <unistd.h>
 #include <util.h>
 #define	ZIC_VERSION_PRE_2013 '2'
 #define	ZIC_VERSION	'3'
 @@ -766,26 +766,64 @@ namecheck(const char *name)
 				 ? _("file name '%s' contains byte '%c'")
 				 : _("file name '%s' contains byte '\\%o'")),
 				name, c);
+		}
 		if (c == '/') {
 			if (!componentcheck(name, component, cp))
 			  return false;
 			component = cp + 1;
+		}
+	}
 	return componentcheck(name, component, cp);
+}
 /* Create symlink contents suitable for symlinking FROM to TO, as a
    freshly allocated string.  FROM should be a relative file name, and
    is relative to the global variable DIRECTORY.  TO can be either
    relative or absolute.  */
 static char *
 relname(char const *from, char const *to)
+{
   size_t i, taillen, dotdotetcsize;
   size_t dir_len = 0, dotdots = 0, linksize = SIZE_MAX;
   char const *f = from;
   char *result = NULL;
   if (*to == '/') {
     /* Make F absolute too.  */
     size_t len = strlen(directory);
     bool needslash = len && directory[len - 1] != '/';
     linksize = len + needslash + strlen(from) + 1;
     f = result = emalloc(linksize);
     strcpy(result, directory);
     result[len] = '/';
     strcpy(result + len + needslash, from);
+  }
   for (i = 0; f[i] && f[i] == to[i]; i++)
     if (f[i] == '/')
       dir_len = i + 1;
   for (; f[i]; i++)
     dotdots += f[i] == '/' && f[i - 1] != '/';
   taillen = i - dir_len;
   dotdotetcsize = 3 * dotdots + taillen + 1;
   if (dotdotetcsize <= linksize) {
     if (!result)
       result = emalloc(dotdotetcsize);
     for (i = 0; i < dotdots; i++)
       memcpy(result + 3 * i, "../", 3);
     memmove(result + 3 * dotdots, f + dir_len, taillen + 1);
+  }
   return result;
+}
 static void
 dolink(char const *fromfield, char const *tofield, bool staysymlink)
+{
 	int fromisdir;
 	bool todirs_made = false;
 	int link_errno;
 	/*
 	** We get to be careful here since
 	** there's a fair chance of root running us.
 	*/
 	fromisdir = itsdir(fromfield);
 	if (fromisdir) {
 @@ -802,50 +840,35 @@ dolink(char const *fromfield, char const
 	  char const *e = strerror(errno);
 	  fprintf(stderr, _("%s: Can't remove %s/%s: %s\n"),
 	    progname, directory, tofield, e);
 	  exit(EXIT_FAILURE);
+	}
 	link_errno = (staysymlink ? ENOTSUP
 		      : link(fromfield, tofield) == 0 ? 0 : errno);
 	if (link_errno == ENOENT && !todirs_made) {
 	  mkdirs(tofield, true);
 	  todirs_made = true;
 	  link_errno = link(fromfield, tofield) == 0 ? 0 : errno;
+	}
 	if (link_errno != 0) {
-	  const char *s = fromfield;
+	  bool absolute = *fromfield == '/';
-	  const char *t;
+	  char *linkalloc = absolute ? NULL : relname(fromfield, tofield);
-	  char *p;
+	  char const *contents = absolute ? fromfield : linkalloc;
-	  size_t dotdots = 0;
+	  int symlink_errno = symlink(contents, tofield) == 0 ? 0 : errno;
 	  char *symlinkcontents;
 	  int symlink_errno;
 	  do
 	    t = s;
 	  while ((s = strchr(s, '/'))
 		 && strncmp(fromfield, tofield, ++s - fromfield) == 0);
 	  for (s = tofield + (t - fromfield); *s; s++)
 	    dotdots += *s == '/';
 	  symlinkcontents = emalloc(3 * dotdots + strlen(t) + 1);
 	  for (p = symlinkcontents; dotdots-- != 0; p += 3)
 	    memcpy(p, "../", 3);
 	  strcpy(p, t);
 	  symlink_errno = symlink(symlinkcontents, tofield) == 0 ? 0 : errno;
 	  if (symlink_errno == ENOENT && !todirs_made) {
 	    mkdirs(tofield, true);
-	    symlink_errno = symlink(symlinkcontents, tofield) == 0 ? 0 : errno;
+	    symlink_errno = symlink(contents, tofield) == 0 ? 0 : errno;
+	  }
-	  free(symlinkcontents);
+	  free(linkalloc);
 	  if (symlink_errno == 0) {
 	    if (link_errno != ENOTSUP)
 	      warning(_("symbolic link used because hard link failed: %s"),
 		      strerror(link_errno));
 	  } else {
 	    FILE *fp, *tp;
 	    int c;
 	    fp = fopen(fromfield, "rb");
 	    if (!fp) {
 	      char const *e = strerror(errno);
 	      fprintf(stderr, _("%s: Can't read %s/%s: %s\n"),
 		      progname, directory, fromfield, e);
 	      exit(EXIT_FAILURE);