summaryrefslogtreecommitdiff
path: root/libnetfs
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-01-24 02:32:47 +0000
committerRoland McGrath <roland@gnu.org>1999-01-24 02:32:47 +0000
commit9da05e2ae5c8255d27abb61bea839ad3d208d543 (patch)
tree3585126618ce51373739b5e11746f63168755ee9 /libnetfs
parent63cc3a78e7bfeb9fd3ab3149e452347faa43a87b (diff)
1999-01-22 Roland McGrath <roland@baalperazim.frob.com>
* file-set-translator.c: Remove makedev, major, minor macro definition. * dir-lookup.c: Likewise.
Diffstat (limited to 'libnetfs')
-rw-r--r--libnetfs/dir-lookup.c84
-rw-r--r--libnetfs/file-set-translator.c42
2 files changed, 59 insertions, 67 deletions
diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
index b486a56a..b9baeb06 100644
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/*
+ Copyright (C) 1995, 96, 97, 98, 99 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -28,10 +28,6 @@
#include "callbacks.h"
#include "misc.h"
-/* XXX - Temporary hack; this belongs in a header file, probably types.h. */
-#define major(x) ((int)(((unsigned) (x) >> 8) & 0xff))
-#define minor(x) ((int)((x) & 0xff))
-
error_t
netfs_S_dir_lookup (struct protid *diruser,
char *filename,
@@ -55,18 +51,18 @@ netfs_S_dir_lookup (struct protid *diruser,
if (!diruser)
return EOPNOTSUPP;
-
+
create = (flags & O_CREAT);
excl = (flags & O_EXCL);
-
+
/* Skip leading slashes */
while (*filename == '/')
filename++;
-
+
*retry_port_type = MACH_MSG_TYPE_MAKE_SEND;
*do_retry = FS_RETRY_NORMAL;
*retry_name = '\0';
-
+
if (*filename == '\0')
{
/* Set things up in the state expected by the code from gotit: on. */
@@ -76,20 +72,20 @@ netfs_S_dir_lookup (struct protid *diruser,
netfs_nref (np);
goto gotit;
}
-
+
dnp = diruser->po->np;
mutex_lock (&dnp->lock);
np = 0;
-
+
netfs_nref (dnp); /* acquire a reference for later netfs_nput */
-
+
do
{
assert (!lastcomp);
-
+
/* Find the name of the next pathname component */
nextname = index (filename, '/');
-
+
if (nextname)
{
*nextname++ = '\0';
@@ -106,13 +102,13 @@ netfs_S_dir_lookup (struct protid *diruser,
else
lastcomp = 0;
}
- else
+ else
lastcomp = 1;
-
+
np = 0;
-
+
retry_lookup:
-
+
if ((dnp == netfs_root_node || dnp == diruser->po->shadow_root)
&& filename[0] == '.' && filename[1] == '.' && filename[2] == '\0')
if (dnp == diruser->po->shadow_root)
@@ -151,20 +147,20 @@ netfs_S_dir_lookup (struct protid *diruser,
else
/* Attempt a lookup on the next pathname component. */
error = netfs_attempt_lookup (diruser->user, dnp, filename, &np);
-
+
/* At this point, DNP is unlocked */
/* Implement O_EXCL flag here */
if (lastcomp && create && excl && !error)
error = EEXIST;
-
+
/* Create the new node if necessary */
if (lastcomp && create && error == ENOENT)
{
mode &= ~(S_IFMT | S_ISPARE | S_ISVTX);
mode |= S_IFREG;
mutex_lock (&dnp->lock);
- error = netfs_attempt_create_file (diruser->user, dnp,
+ error = netfs_attempt_create_file (diruser->user, dnp,
filename, mode, &np);
newnode = 1;
@@ -181,7 +177,7 @@ netfs_S_dir_lookup (struct protid *diruser,
/* All remaining errors get returned to the user */
if (error)
goto out;
-
+
error = netfs_validate_stat (np, diruser->user);
if (error)
goto out;
@@ -194,7 +190,7 @@ netfs_S_dir_lookup (struct protid *diruser,
|| fshelp_translated (&np->transbox)))
{
mach_port_t dirport;
-
+
/* A callback function for short-circuited translators.
S_ISLNK and S_IFSOCK are handled elsewhere. */
error_t short_circuited_callback1 (void *cookie1, void *cookie2,
@@ -213,7 +209,7 @@ netfs_S_dir_lookup (struct protid *diruser,
case S_IFCHR:
case S_IFBLK:
asprintf (argz, "%s%c%d%c%d",
- (S_ISCHR (np->nn_stat.st_mode)
+ (S_ISCHR (np->nn_stat.st_mode)
? _HURD_CHRDEV : _HURD_BLKDEV),
0, major (np->nn_stat.st_rdev),
0, minor (np->nn_stat.st_rdev));
@@ -231,13 +227,13 @@ netfs_S_dir_lookup (struct protid *diruser,
*uid = np->nn_stat.st_uid;
*gid = np->nn_stat.st_gid;
-
+
return 0;
}
-
+
/* Create an unauthenticated port for DNP, and then
unlock it. */
- newpi =
+ newpi =
netfs_make_protid (netfs_make_peropen (dnp, 0, diruser->po),
iohelp_create_iouser (make_idvec (),
make_idvec ()));
@@ -245,9 +241,9 @@ netfs_S_dir_lookup (struct protid *diruser,
mach_port_insert_right (mach_task_self (), dirport, dirport,
MACH_MSG_TYPE_MAKE_SEND);
ports_port_deref (newpi);
-
+
error = fshelp_fetch_root (&np->transbox, diruser->po,
- dirport,
+ dirport,
diruser->user,
lastcomp ? flags : 0,
((np->nn_stat.st_mode & S_IPTRANS)
@@ -268,18 +264,18 @@ netfs_S_dir_lookup (struct protid *diruser,
}
return error;
}
-
+
/* ENOENT means there was a hiccup, and the translator vanished
while NP was unlocked inside fshelp_fetch_root; continue as normal. */
error = 0;
}
-
+
if (S_ISLNK (np->nn_stat.st_mode)
&& !(lastcomp && (flags & (O_NOLINK|O_NOTRANS))))
{
size_t nextnamelen, newnamelen, linklen;
char *linkbuf;
-
+
/* Handle symlink interpretation */
if (nsymlinks++ > netfs_maxsymlinks)
{
@@ -288,15 +284,15 @@ netfs_S_dir_lookup (struct protid *diruser,
}
linklen = np->nn_stat.st_size;
-
+
nextnamelen = nextname ? strlen (nextname) + 1 : 0;
newnamelen = nextnamelen + linklen + 1;
linkbuf = alloca (newnamelen);
-
+
error = netfs_attempt_readlink (diruser->user, np, linkbuf);
if (error)
goto out;
-
+
if (nextname)
{
linkbuf[linklen] = '/';
@@ -304,7 +300,7 @@ netfs_S_dir_lookup (struct protid *diruser,
nextnamelen - 1);
}
linkbuf[nextnamelen + linklen] = '\0';
-
+
if (linkbuf[0] == '/')
{
/* Punt to the caller */
@@ -313,7 +309,7 @@ netfs_S_dir_lookup (struct protid *diruser,
strcpy (retry_name, linkbuf);
goto out;
}
-
+
filename = linkbuf;
if (lastcomp)
{
@@ -332,7 +328,7 @@ netfs_S_dir_lookup (struct protid *diruser,
/* Normal nodes here for next filename component */
filename = nextname;
netfs_nrele (dnp);
-
+
if (lastcomp)
dnp = 0;
else
@@ -355,19 +351,19 @@ netfs_S_dir_lookup (struct protid *diruser,
error = ENOTDIR;
goto out;
}
- }
+ }
error = netfs_check_open_permissions (diruser->user, np,
flags, newnode);
if (error)
goto out;
-
+
flags &= ~OPENONLY_STATE_MODES;
-
+
newpi = netfs_make_protid (netfs_make_peropen (np, flags, diruser->po),
iohelp_dup_iouser (diruser->user));
*retry_port = ports_get_right (newpi);
ports_port_deref (newpi);
-
+
out:
if (np)
netfs_nput (np);
@@ -375,5 +371,3 @@ netfs_S_dir_lookup (struct protid *diruser,
netfs_nrele (dnp);
return error;
}
-
-
diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c
index 685b5a02..50959286 100644
--- a/libnetfs/file-set-translator.c
+++ b/libnetfs/file-set-translator.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/*
+ Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -22,8 +22,6 @@
#include <hurd/paths.h>
#include <hurd/fsys.h>
-#define makedev(maj,min) ((((maj)&0xFF)<<8)+((min)&0xFF))
-
error_t
netfs_S_file_set_translator (struct protid *user,
int passive_flags, int active_flags,
@@ -37,16 +35,16 @@ netfs_S_file_set_translator (struct protid *user,
if (!user)
return EOPNOTSUPP;
-
+
if (!(passive_flags & FS_TRANS_SET) && !(active_flags & FS_TRANS_SET))
return 0;
-
+
if (passive && passive[passivelen - 1])
return EINVAL;
-
+
np = user->po->np;
mutex_lock (&np->lock);
-
+
if (active_flags & FS_TRANS_SET)
{
/* Validate--user must be owner */
@@ -57,12 +55,12 @@ netfs_S_file_set_translator (struct protid *user,
err = fshelp_isowner (&np->nn_stat, user->user);
if (err)
goto out;
-
+
err = fshelp_fetch_control (&np->transbox, &control);
if (err)
goto out;
-
- if (control != MACH_PORT_NULL
+
+ if (control != MACH_PORT_NULL
&& (active_flags & FS_TRANS_EXCL) == 0)
{
mutex_unlock (&np->lock);
@@ -83,7 +81,7 @@ netfs_S_file_set_translator (struct protid *user,
if (err)
goto out;
}
-
+
if (active_flags & FS_TRANS_SET)
{
err = fshelp_set_active (&np->transbox, active,
@@ -91,7 +89,7 @@ netfs_S_file_set_translator (struct protid *user,
if (err)
goto out;
}
-
+
if (passive_flags & FS_TRANS_SET)
{
mode_t newmode = 0;
@@ -110,12 +108,12 @@ netfs_S_file_set_translator (struct protid *user,
else if (!strcmp (passive, _HURD_IFSOCK))
newmode = S_IFSOCK;
}
-
+
switch (newmode)
{
int major, minor;
char *arg;
-
+
case S_IFBLK:
case S_IFCHR:
/* Find the device number from the arguments
@@ -128,7 +126,7 @@ netfs_S_file_set_translator (struct protid *user,
return EINVAL;
}
major = strtol (arg, 0, 0);
-
+
arg = arg + strlen (arg) + 1;
assert (arg < passive + passivelen);
if (arg == passive + passivelen)
@@ -137,13 +135,13 @@ netfs_S_file_set_translator (struct protid *user,
return EINVAL;
}
minor = strtol (arg, 0, 0);
-
+
err = netfs_attempt_mkdev (user->user, np,
newmode, makedev (major, minor));
if (err == EOPNOTSUPP)
goto fallback;
break;
-
+
case S_IFLNK:
arg = passive + strlen (passive) + 1;
assert (arg <= passive + passivelen);
@@ -152,7 +150,7 @@ netfs_S_file_set_translator (struct protid *user,
mutex_unlock (&np->lock);
return EINVAL;
}
-
+
err = netfs_attempt_mksymlink (user->user, np, arg);
if (err == EOPNOTSUPP)
goto fallback;
@@ -167,15 +165,15 @@ netfs_S_file_set_translator (struct protid *user,
if (err == EOPNOTSUPP)
goto fallback;
break;
-
+
case 0:
fallback:
- err = netfs_set_translator (user->user, np,
+ err = netfs_set_translator (user->user, np,
passive, passivelen);
break;
}
}
-
+
out:
mutex_unlock (&np->lock);
return err;