 @@ -1,14 +1,14 @@
-/*	$NetBSD: xinstall.c,v 1.111 2009/06/08 21:58:44 yamt Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.112 2009/07/25 11:45:58 gson Exp $	*/
 /*
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -36,27 +36,27 @@
 #define HAVE_STRUCT_STAT_ST_FLAGS 1
 #endif
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.111 2009/06/08 21:58:44 yamt Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.112 2009/07/25 11:45:58 gson Exp $");
 #endif
 #endif /* not lint */
 #define __MKTEMP_OK__	/* All uses of mktemp have been checked */
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 @@ -408,28 +408,27 @@ parseid(char *name, id_t *id)
 /*
  * do_link --
  *	make a hard link, obeying dorename if set
  *	return -1 on failure
  */
 int
 do_link(char *from_name, char *to_name)
+{
 	char tmpl[MAXPATHLEN];
 	int ret;
 	if (dorename) {
-		(void)snprintf(tmpl, sizeof(tmpl), "%s/inst.XXXXXX",
+		(void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name);
 		    xdirname(to_name));
 		/* This usage is safe. */
 		if (mktemp(tmpl) == NULL)
 			err(1, "%s: mktemp", tmpl);
 		ret = link(from_name, tmpl);
 		if (ret == 0) {
 			ret = rename(tmpl, to_name);
 			/* If rename has posix semantics, then the temporary
 			 * file may still exist when from_name and to_name point
 			 * to the same file, so unlink it unconditionally.
 			 */
 			(void)unlink(tmpl);
+		}
 		return (ret);
 @@ -438,28 +437,27 @@ do_link(char *from_name, char *to_name)
+}
 /*
  * do_symlink --
  *	make a symbolic link, obeying dorename if set
  *	exit on failure
  */
 void
 do_symlink(char *from_name, char *to_name)
+{
 	char tmpl[MAXPATHLEN];
 	if (dorename) {
-		(void)snprintf(tmpl, sizeof(tmpl), "%s/inst.XXXXXX",
+		(void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name);
 		    xdirname(to_name));
 		/* This usage is safe. */
 		if (mktemp(tmpl) == NULL)
 			err(1, "%s: mktemp", tmpl);
 		if (symlink(from_name, tmpl) == -1)
 			err(1, "symlink %s -> %s", from_name, tmpl);
 		if (rename(tmpl, to_name) == -1) {
 			/* remove temporary link before exiting */
 			(void)unlink(tmpl);
 			err(1, "%s: rename", to_name);
+		}
 	} else {
 		if (symlink(from_name, to_name) == -1)
 @@ -658,28 +656,27 @@ install(char *from_name, char *to_name,
+	}
 	/*
 	 * Unlink now... avoid ETXTBSY errors later.  Try and turn
 	 * off the append/immutable bits -- if we fail, go ahead,
 	 * it might work.
 	 */
 #if ! HAVE_NBTOOL_CONFIG_H
 	if (stat(to_name, &to_sb) == 0 &&
 	    to_sb.st_flags & (NOCHANGEBITS))
 		(void)chflags(to_name, to_sb.st_flags & ~(NOCHANGEBITS));
 #endif
 	if (dorename) {
-		(void)snprintf(tmpl, sizeof(tmpl), "%s/inst.XXXXXX",
+		(void)snprintf(tmpl, sizeof(tmpl), "%s.inst.XXXXXX", to_name);
 		    xdirname(to_name));
 		oto_name = to_name;
 		to_name = tmpl;
 	} else {
 		oto_name = NULL;	/* pacify gcc */
 		if (dobackup)
 			backup(to_name);
 		else
 			(void)unlink(to_name);
+	}
 	if (dolink) {
 		makelink(from_name, dorename ? oto_name : to_name);
 		return;