ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/path: improve debug message on redirect 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-05-29 12:41:48 +02:00
parent fda0e2cf04
commit eb4a75afd9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/path.c
View File

@ -274,7 +274,6 @@ int ul_path_access(struct path_cxt *pc, int mode, const char *path)
&& pc->redirect_on_enoent
&& pc->redirect_on_enoent(pc, path, &dir) == 0)
rc = faccessat(dir, path, mode, 0);
return rc;
}
@ -298,18 +297,19 @@ int ul_path_open(struct path_cxt *pc, int flags, const char *path)
fd = open(path, flags);
DBG(CXT, ul_debug("opening '%s'", path));
} else {
int fdx;
int dir = ul_path_get_dirfd(pc);
if (dir < 0)
return dir;
fd = openat(dir, path, flags);
fdx = fd = openat(dir, path, flags);
if (fd < 0 && errno == ENOENT
&& pc->redirect_on_enoent
&& pc->redirect_on_enoent(pc, path, &dir) == 0)
fd = openat(dir, path, flags);
DBG(CXT, ul_debugobj(pc, "opening '%s'", path));
DBG(CXT, ul_debugobj(pc, "opening '%s'%s", path, fdx != fd ? " [redirected]" : ""));
}
return fd;
}