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

Fix getcwd. It must return the length of the path including the terminating 0.

Browse Source 
While I'm here, fix style and debug printf.

Fix derived from patch by: Darryl Okahata <darrylo@sr.hp.com>
This commit is contained in:
Marcel Moolenaar 1999-09-17 08:35:08 +00:00
parent f35e5d0ef0
commit 13d9e61a67
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=51348
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/compat/linux/linux_file.c
View File

@ -855,14 +855,27 @@ linux_link(struct proc *p, struct linux_link_args *args)
int
linux_getcwd(struct proc *p, struct linux_getcwd_args *args)
{
struct __getcwd_args bsd;
struct __getcwd_args bsd;
caddr_t sg;
int error, len;
#ifdef DEBUG
printf("Linux-emul(%d): getcwd(%p, %ld)\n",
p->p_pid, args->buf, args->bufsize);
printf("Linux-emul(%ld): getcwd(%p, %ld)\n", (long)p->p_pid,
args->buf, args->bufsize);
#endif
bsd.buf = args->buf;
bsd.buflen = args->bufsize;
return __getcwd(p, &bsd);
sg = stackgap_init();
bsd.buf = stackgap_alloc(&sg, SPARE_USRSPACE);
bsd.buflen = SPARE_USRSPACE;
error = __getcwd(p, &bsd);
if (!error) {
len = strlen(bsd.buf) + 1;
if (len <= args->bufsize) {
p->p_retval[0] = len;
error = copyout(bsd.buf, args->buf, len);
}
else
error = ERANGE;
}
return (error);
}

25
sys/i386/linux/linux_file.c
View File

@ -855,14 +855,27 @@ linux_link(struct proc *p, struct linux_link_args *args)
int
linux_getcwd(struct proc *p, struct linux_getcwd_args *args)
{
struct __getcwd_args bsd;
struct __getcwd_args bsd;
caddr_t sg;
int error, len;
#ifdef DEBUG
printf("Linux-emul(%d): getcwd(%p, %ld)\n",
p->p_pid, args->buf, args->bufsize);
printf("Linux-emul(%ld): getcwd(%p, %ld)\n", (long)p->p_pid,
args->buf, args->bufsize);
#endif
bsd.buf = args->buf;
bsd.buflen = args->bufsize;
return __getcwd(p, &bsd);
sg = stackgap_init();
bsd.buf = stackgap_alloc(&sg, SPARE_USRSPACE);
bsd.buflen = SPARE_USRSPACE;
error = __getcwd(p, &bsd);
if (!error) {
len = strlen(bsd.buf) + 1;
if (len <= args->bufsize) {
p->p_retval[0] = len;
error = copyout(bsd.buf, args->buf, len);
}
else
error = ERANGE;
}
return (error);
}