From bef0f49eff0eb113e551b7cf1f552364f8d805c7 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sun, 4 Apr 2021 13:37:50 +1000 Subject: machdev: Pass argv through to _hurd_init Message-Id: <20210404033750.143411-1-damien@zamaudio.com> --- libmachdev/trivfs_server.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libmachdev/trivfs_server.c') diff --git a/libmachdev/trivfs_server.c b/libmachdev/trivfs_server.c index 60711348..1c5d53ad 100644 --- a/libmachdev/trivfs_server.c +++ b/libmachdev/trivfs_server.c @@ -76,12 +76,14 @@ static char *devnode; /* Startup and shutdown notifications management */ struct port_class *machdev_shutdown_notify_class; - static void arrange_shutdown_notification (void); /* Our parent's task, if applicable */ static task_t parent_task; +/* Our argument vector */ +static char **machdev_argv; + static void install_as_translator (mach_port_t bootport) { @@ -315,7 +317,7 @@ trivfs_S_fsys_init (struct trivfs_control *fsys, portarray[INIT_PORT_AUTH] = authhandle; portarray[INIT_PORT_CRDIR] = root; portarray[INIT_PORT_CWDIR] = root; - _hurd_init (0, NULL, portarray, INIT_PORT_MAX, NULL, 0); + _hurd_init (0, machdev_argv, portarray, INIT_PORT_MAX, NULL, 0); /* Mark us as important. */ proc = getproc (); @@ -434,8 +436,8 @@ resume_bootstrap_server(mach_port_t server_task, const char *server_name) } int -machdev_trivfs_init(mach_port_t bootstrap_resume_task, const char *name, const char *path, - mach_port_t *bootstrap) +machdev_trivfs_init(int argc, char **argv, mach_port_t bootstrap_resume_task, + const char *name, const char *path, mach_port_t *bootstrap) { mach_port_t mybootstrap = MACH_PORT_NULL; port_bucket = ports_create_bucket (); @@ -445,6 +447,7 @@ machdev_trivfs_init(mach_port_t bootstrap_resume_task, const char *name, const c trivfs_protid_class, 0, &control); *bootstrap = MACH_PORT_NULL; + machdev_argv = argv; task_get_bootstrap_port (mach_task_self (), &mybootstrap); if (mybootstrap) -- cgit v1.2.3