Initial revision

4 files changed, 233 insertions, 0 deletions

diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c
new file mode 100644
index 00000000..9844801e
--- /dev/null
+++ b/libdiskfs/file-get-fs-opts.c
@@ -0,0 +1,51 @@
+/* Get run-time file system options
+
+   Copyright (C) 1995 Free Software Foundation, Inc.
+
+   Written by Miles Bader <miles@gnu.ai.mit.edu>
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify 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, 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include <errno.h>
+
+#include "priv.h"
+
+error_t
+diskfs_S_file_get_fs_options (struct protid *cred,
+			      char **data, unsigned *data_len)
+{
+  error_t err;
+  char *argz;
+
+  if (!cred)
+    return EOPNOTSUPP;
+
+  rwlock_reader_lock (&diskfs_fsys_lock);
+  err = diskfs_get_options (&argz, data_len);
+  rwlock_reader_unlock (&diskfs_fsys_lock);
+
+  if (!err)
+    /* Move ARGZ from a malloced buffer into a vm_alloced one.  */
+    {
+      err = vm_allocate (mach_task_self (), (vm_address_t *)data, data_len, 1);
+      if (!err)
+	bcopy (argz, *data, *data_len);
+      free (argz);
+    }
+
+  return err;
+}
diff --git a/libdiskfs/init-completed.c b/libdiskfs/init-completed.c
new file mode 100644
index 00000000..cbb94e3b
--- /dev/null
+++ b/libdiskfs/init-completed.c
@@ -0,0 +1,32 @@
+/* Function called when we're done initializing at boot time
+
+   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+
+   Written by Miles Bader <miles@gnu.ai.mit.edu>
+
+   This program is free software; you can redistribute it and/or
+   modify 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.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include <stdio.h>
+
+#include <hurd/startup.h>
+
+#include "diskfs.h"
+
+/* Called by diskfs_start_bootstrap, after the filesystem has a normal 
+   environment (complete with auth and proc ports). */
+void
+diskfs_init_completed ()
+{
+}
diff --git a/libdiskfs/machdev.c b/libdiskfs/machdev.c
new file mode 100644
index 00000000..786bf0ab
--- /dev/null
+++ b/libdiskfs/machdev.c
@@ -0,0 +1,92 @@
+/* Get mach device info
+
+   Copyright (C) 1995 Free Software Foundation, Inc.
+
+   Written by Miles Bader <miles@gnu.ai.mit.edu>
+
+   This program is free software; you can redistribute it and/or
+   modify 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.
+
+   This program 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include <stdio.h>
+
+#include <device/device.h>
+
+#include "priv.h"
+
+/* Returns a send right to for the mach device called NAME, and returns it in
+   PORT.  Other values returned are START, the first valid offset, SIZE, the
+   the number of blocks after START, and BLOCK_SIZE, the units in which the
+   device is addressed.
+
+   The device is opened for reading, and if the diskfs global variable
+   DISKFS_READ_ONLY is false, writing.
+
+   If NAME cannot be opened and this is a bootstrap filename, the user will
+   be prompted for new names until a valid one is found.  */
+error_t
+diskfs_get_mach_device (char *name,
+			mach_port_t *port,
+			off_t *start, off_t *size, size_t *block_size)
+{
+  error_t err = 0;
+
+  do
+    {
+      mach_port_t dev_master;
+      
+      err = get_privileged_ports (0, &dev_master);
+      if (err)
+	return err;
+
+      err = device_open (dev_master, 
+			 (diskfs_readonly ? 0 : D_WRITE) | D_READ,
+			 name, port);
+
+      if (err == D_NO_SUCH_DEVICE && diskfs_boot_flags)
+	/* If this is a bootstrap filesystem, prompt the user to give us
+	   another name rather than just crashing.  */
+	{
+	  char *line = 0;
+	  size_t linesz = 0;
+	  ssize_t len;
+
+	  printf ("Cannot open device %s\n", name);
+	  printf ("Open instead: ");
+	  fflush (stdout);
+	  len = getline (&line, &linesz, stdin);
+	  if (len > 2)
+	    name = line;
+	}
+
+      mach_port_deallocate (mach_task_self (), dev_master);
+    }
+  while (err == D_NO_SUCH_DEVICE && diskfs_boot_flags);
+
+  if (!err)
+    {
+      unsigned sizes_len = DEV_GET_SIZE_COUNT;
+      size_t sizes[DEV_GET_SIZE_COUNT];
+
+      err = device_get_status (*port, DEV_GET_SIZE, sizes, &sizes_len);
+      assert (sizes_len == DEV_GET_SIZE_COUNT);
+
+      *start = 0;
+      *size = sizes[DEV_GET_SIZE_DEVICE_SIZE];
+      *block_size = sizes[DEV_GET_SIZE_RECORD_SIZE];
+      if (*block_size > 1)
+	*size /= *block_size;
+    }
+
+  return err;
+}
diff --git a/libdiskfs/opts-get.c b/libdiskfs/opts-get.c
new file mode 100644
index 00000000..3d84b372
--- /dev/null
+++ b/libdiskfs/opts-get.c
@@ -0,0 +1,58 @@
+/* Get run-time options
+
+   Copyright (C) 1995 Free Software Foundation, Inc.
+
+   Written by Miles Bader <miles@gnu.ai.mit.edu>
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify 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, 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#include "priv.h"
+
+error_t
+diskfs_get_options (char **argz, unsigned *argz_len)
+{
+  extern int diskfs_sync_interval;
+
+  void append_opt (char *str)
+    {
+      unsigned old_end = *argz_len;
+      *argz_len += strlen (str) + 1;
+      *argz = realloc (*argz, *argz_len);
+      strcpy (*argz + old_end, str);;
+    }
+
+  *argz = 0;
+  *argz_len = 0;
+
+  if (diskfs_readonly)
+    append_opt ("--readonly");
+  else
+    append_opt ("--writable");
+
+  if (diskfs_synchronous)
+    append_opt ("--sync");
+  else if (diskfs_sync_interval == 0)
+    append_opt ("--nosync");
+  else
+    {
+      char buf[80];
+      sprintf (buf, "--sync=%d", diskfs_sync_interval);
+      append_opt (buf);
+    }
+
+  return 0;
+}