kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ln: Tweak append logic.

Browse source 
If the target is "." or ends in "/" or "/.", we always want to append
the source's basename, even in the Fflag case.

MFC after:	never
Relnotes:	yes
Sponsored by:	Klara, Inc.
Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D49842
This commit is contained in:
Dag-Erling Smørgrav 2025-04-15 19:57:52 +02:00
parent 7622e2d21a
commit 8ce85300c7
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
bin/ln/ln.c
View file

@ -212,6 +212,13 @@ samedirent(const char *path1, const char *path2)
return sb1.st_dev == sb2.st_dev && sb1.st_ino == sb2.st_ino;
}
/*
* Create a link to source. If target is a directory (and some additional
* conditions apply, see comments within) the link will be created within
* target and have the basename of source. Otherwise, the link will be
* named target. If isdir is true, target has already been determined to
* be a directory; otherwise, we will check, if needed.
*/
static int
linkit(const char *source, const char *target, bool isdir)
{
@ -221,7 +228,7 @@ linkit(const char *source, const char *target, bool isdir)
struct stat sb;
const char *p;
int ch, first;
bool exists;
bool append, exists;
if (!sflag) {
/* If source doesn't exist, quit now. */
@ -238,14 +245,27 @@ linkit(const char *source, const char *target, bool isdir)
}
/*
* If the target is a directory (and not a symlink if hflag),
* append the source's name, unless Fflag is set.
* Append a slash and the source's basename if:
* - the target is "." or ends in "/" or "/.", or
* - the target is a directory (and not a symlink if hflag) and
* Fflag is not set
*/
if (!Fflag && (isdir ||
(lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
(!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode)))) {
if ((p = strrchr(target, '/')) == NULL)
p = target;
else
p++;
append = false;
if (p[0] == '\0' || (p[0] == '.' && p[1] == '\0')) {
append = true;
} else if (!Fflag) {
if (isdir || (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) ||
(!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) {
append = true;
}
}
if (append) {
if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) ||
(p = basename(bbuf)) == NULL ||
(p = basename(bbuf)) == NULL /* can't happen */ ||
snprintf(path, sizeof(path), "%s/%s", target, p) >=
(ssize_t)sizeof(path)) {
errno = ENAMETOOLONG;

6
bin/ln/tests/ln_test.sh
View file

@ -170,11 +170,15 @@ sfF_flag_head()
}
sfF_flag_body()
{
atf_check mkdir A B C
atf_check mkdir A B C D D/A
atf_check ln -sF A C
atf_check_symlink_to A C
atf_check ln -sfF B C
atf_check_symlink_to B C
atf_check ln -sfF A D/
atf_check_symlink_to A D/A
atf_check ln -sfF ../A .
atf_check_symlink_to ../A A
}
atf_test_case s_flag