From accc49c458eb7c7dc3660cbe65b3b34b340dfeef Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 15 Sep 2005 22:12:39 +0000 Subject: 2005-09-15 Jeremy Katz * isys/imount.c (doPwMount): Make arguments for doPwMount simpler. Use a bitmask of flags and pass extra data like mount(2). Use flags for nfs and pass arguments onto nfsmount(). Kill some dead code. * isys/imount.c (doPwMount): Update prototype, add constants. * isys/isys.c (doMount): Update for new API. * loader2/cdinstall.c: Likewise. * loader2/driverdisk.c: Likewise. * loader2/hdinstall.c: Likewise. * loader2/loader.c: Likewise. * loader2/method.c: Likewise. * loader2/nfsinstall.c: Likewise. * loader2/usb.c: Likewise. --- isys/isys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'isys/isys.c') diff --git a/isys/isys.c b/isys/isys.c index c1aa8e934..ac16705cf 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -465,14 +465,19 @@ static PyObject * doUMount(PyObject * s, PyObject * args) { static PyObject * doMount(PyObject * s, PyObject * args) { char * fs, * device, * mntpoint; int rc; - int readOnly; - int bindMount; - int reMount; + int readOnly = 0; + int bindMount = 0; + int reMount = 0; + int flags = 0; if (!PyArg_ParseTuple(args, "sssiii", &fs, &device, &mntpoint, &readOnly, &bindMount, &reMount)) return NULL; - rc = doPwMount(device, mntpoint, fs, readOnly, 0, NULL, NULL, bindMount, reMount); + if (readOnly) flags |= IMOUNT_RDONLY; + if (bindMount) flags |= IMOUNT_BIND; + if (reMount) flags |= IMOUNT_REMOUNT; + + rc = doPwMount(device, mntpoint, fs, flags, NULL); if (rc == IMOUNT_ERR_ERRNO) PyErr_SetFromErrno(PyExc_SystemError); else if (rc) -- cgit