d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make "install -l s[ar]" act like "ln -sfh" as intended. This fixes

Browse Source 
installation of symbolic links where the target is a link is to an
existing directory.
This commit is contained in:
Brooks Davis 2013-01-22 16:23:08 +00:00
parent aeff2fb371
commit f89d608184
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/xinstall/xinstall.c
View File

@ -336,8 +336,21 @@ main(int argc, char *argv[])
/* NOTREACHED */ /* NOTREACHED */
} }
no_target = stat(to_name = argv[argc - 1], &to_sb); to_name = argv[argc - 1];
no_target = stat(to_name, &to_sb);
if (!no_target && S_ISDIR(to_sb.st_mode)) { if (!no_target && S_ISDIR(to_sb.st_mode)) {
if (dolink & LN_SYMBOLIC) {
if (lstat(to_name, &to_sb) != 0)
err(EX_OSERR, "%s vanished", to_name);
if (S_ISLNK(to_sb.st_mode)) {
if (argc != 2) {
errno = ENOTDIR;
err(EX_USAGE, "%s", to_name);
}
install(*argv, to_name, fset, iflags);
exit(EX_OK);
}
}
for (; *argv != to_name; ++argv) for (; *argv != to_name; ++argv)
install(*argv, to_name, fset, iflags | DIRECTORY); install(*argv, to_name, fset, iflags | DIRECTORY);
exit(EX_OK); exit(EX_OK);