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

Check to see if the rootdir is the same as the current working directory.

Browse Source 
If it is, and the pathname was relative, do not separate the componenets
with a '/' character.

Obtained from:	TrustedBSD Project
This commit is contained in:
Christian S.J. Peron 2006-06-01 15:38:30 +00:00
parent bb0aa1a544
commit 7737a00f64
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/security/audit/audit_bsm_klib.c
View File

@ -489,10 +489,11 @@ canon_path(struct thread *td, char *path, char *cpath)
char *retbuf, *freebuf;
struct vnode *vnp;
struct filedesc *fdp;
int error, vfslocked;
int cisr, error, vfslocked;
fdp = td->td_proc->p_fd;
bufp = path;
cisr = 0;
FILEDESC_LOCK(fdp);
if (*(path) == '/') {
while (*(bufp) == '/')
@ -511,6 +512,7 @@ canon_path(struct thread *td, char *path, char *cpath)
}
} else {
vnp = fdp->fd_cdir; /* Prepend the current dir. */
cisr = (fdp->fd_rdir == fdp->fd_cdir);
vref(vnp);
bufp = path;
}
@ -527,8 +529,14 @@ canon_path(struct thread *td, char *path, char *cpath)
vn_lock(vnp, LK_EXCLUSIVE | LK_RETRY, td);
error = vn_fullpath(td, vnp, &retbuf, &freebuf);
if (error == 0) {
/* Copy and free buffer allocated by vn_fullpath(). */
snprintf(cpath, MAXPATHLEN, "%s/%s", retbuf, bufp);
/* Copy and free buffer allocated by vn_fullpath().
* If the current working directory was the same as
* the root directory, and the path was a relative
* pathname, do not separate the two components with
* the '/' character.
*/
snprintf(cpath, MAXPATHLEN, "%s%s%s", retbuf,
cisr ? "" : "/", bufp);
free(freebuf, M_TEMP);
} else
cpath[0] = '\0';