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

install: re-check failed mkdir for EEXIST

Browse Source 
Since the code stats and mkdirs in 2 separate steps, it is possible that
the directory will be created in the meantime by something else (e.g.
concurrent install).[1]

While here alter the code to properly report stat failure, previously it
would always claim it was mkdir which failed.

Noted by: royger [1]
MFC after:	1 week
This commit is contained in:
Mateusz Guzik 2014-09-23 11:41:09 +00:00
parent 5a66f6b3c4
commit 6e633f7297
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=272026
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1263,13 +1263,18 @@ install_dir(char *path)
if (!*p || (p != path && *p == '/')) {
ch = *p;
*p = '\0';
if (stat(path, &sb)) {
if (errno != ENOENT || mkdir(path, 0755) < 0) {
again:
if (stat(path, &sb) < 0) {
if (errno != ENOENT)
err(EX_OSERR, "stat %s", path);
if (mkdir(path, 0755) < 0) {
if (errno == EEXIST)
goto again;
err(EX_OSERR, "mkdir %s", path);
/* NOTREACHED */
} else if (verbose)
}
if (verbose)
(void)printf("install: mkdir %s\n",
path);
path);
} else if (!S_ISDIR(sb.st_mode))
errx(EX_OSERR, "%s exists but is not a directory", path);
if (!(*p = ch))