diff options
Diffstat (limited to 'libdiskfs/dir-mkfile.c')
| -rw-r--r-- | libdiskfs/dir-mkfile.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/libdiskfs/dir-mkfile.c b/libdiskfs/dir-mkfile.c index cdfe6e31..914b18fe 100644 --- a/libdiskfs/dir-mkfile.c +++ b/libdiskfs/dir-mkfile.c @@ -1,5 +1,5 @@ -/* - Copyright (C) 1994, 1995, 1996 Free Software Foundation +/* libdiskfs implementation of fs.defs: dir_mkfile + Copyright (C) 1994,95,96,97,2002 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. -The GNU Hurd is distributed in the hope that it will be useful, +The GNU Hurd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -34,7 +34,8 @@ diskfs_S_dir_mkfile (struct protid *cred, struct node *dnp, *np; error_t err; struct protid *newpi; - + struct peropen *newpo; + if (!cred) return EOPNOTSUPP; if (diskfs_check_readonly ()) @@ -46,14 +47,14 @@ diskfs_S_dir_mkfile (struct protid *cred, mutex_unlock (&dnp->lock); return ENOTDIR; } - err = diskfs_access (dnp, S_IWRITE, cred); + err = fshelp_access (&dnp->dn_stat, S_IWRITE, cred->user); if (err) { mutex_unlock (&dnp->lock); return err; } - - mode &= ~(S_IFMT | S_ISPARE | S_ISVTX); + + mode &= ~(S_IFMT | S_ISPARE | S_ISVTX | S_ITRANS); mode |= S_IFREG; err = diskfs_create_node (dnp, 0, mode, &np, cred, 0); mutex_unlock (&dnp->lock); @@ -66,13 +67,17 @@ diskfs_S_dir_mkfile (struct protid *cred, if (err) return err; - - flags &= (O_READ | O_WRITE | O_EXEC); - err = diskfs_create_protid (diskfs_make_peropen (np, flags, - cred->po->dotdotport), - cred->uids, cred->nuids, - cred->gids, cred->ngids, - &newpi); + + flags &= ~OPENONLY_STATE_MODES; /* These bits are all meaningless here. */ + + err = diskfs_make_peropen (np, flags, cred->po, &newpo); + if (! err) + { + err = diskfs_create_protid (newpo, cred->user, &newpi); + if (err) + diskfs_release_peropen (newpo); + } + if (! err) { *newnode = ports_get_right (newpi); @@ -84,5 +89,3 @@ diskfs_S_dir_mkfile (struct protid *cred, return err; } - - |