stv0g/lib9p
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Integrate (slightly modified) pull request #1 from ailispaw.

Browse source 
Pull request was originally issued in xhyve
repo: https://github.com/jceel/xhyve/pull/1
This commit is contained in:
Jakub Klama 2016-02-03 10:02:01 +01:00
parent 23ad660dd0
commit 7be3e0b914
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
backend/fs.c
View file

@ -536,9 +536,16 @@ fs_remove(void *softc, struct l9p_request *req)
return;
}
if (unlink(file->name) != 0) {
l9p_respond(req, errno);
return;
if (S_ISDIR(st.st_mode)) {
if (rmdir(file->name) != 0) {
l9p_respond(req, errno);
return;
}
} else {
if (unlink(file->name) != 0) {
l9p_respond(req, errno);
return;
}
}
l9p_respond(req, 0);
@ -683,15 +690,8 @@ fs_wstat(void *softc, struct l9p_request *req)
}
}
if (l9stat->n_uid != (uid_t)~0) {
if (lchown(file->name, l9stat->n_uid, (gid_t)-1) != 0) {
l9p_respond(req, errno);
return;
}
}
if (l9stat->n_gid != (uid_t)~0) {
if (lchown(file->name, (uid_t)-1, l9stat->n_gid) != 0) {
if (req->lr_conn->lc_version >= L9P_2000U) {
if (lchown(file->name, l9stat->n_uid, l9stat->n_gid) != 0) {
l9p_respond(req, errno);
return;
}