diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ChangeLog | 9 | ||||
| -rw-r--r-- | utils/mount.c | 5 | ||||
| -rw-r--r-- | utils/settrans.c | 11 |
3 files changed, 19 insertions, 6 deletions
diff --git a/utils/ChangeLog b/utils/ChangeLog index 5a56b1c9..560391ca 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,12 @@ +2001-01-17 Neal H Walfield <neal@cs.uml.edu> + + * mount.c (do_mount): Conform to new fshelp_start_translator + semantics. + + * settrans.c (main): Conform to new fshelp_start_translator + semantics therby allowing us to print the pid of the an + active translator. + 2001-01-08 Marcus Brinkmann <marcus@gnu.org> * storeread.c (main): Change type of addr to store_offset_t, diff --git a/utils/mount.c b/utils/mount.c index 75610bc6..ea8b419b 100644 --- a/utils/mount.c +++ b/utils/mount.c @@ -284,7 +284,8 @@ do_mount (struct fs *fs, int remount) /* The callback to start_translator opens NODE as a side effect. */ error_t open_node (int flags, mach_port_t *underlying, - mach_msg_type_name_t *underlying_type) + mach_msg_type_name_t *underlying_type, + task_t task, void *cookie) { node = file_name_lookup (fs->mntent.mnt_dir, flags | O_NOTRANS, 0666); @@ -331,7 +332,7 @@ do_mount (struct fs *fs, int remount) /* Now we have a translator command line argz in FSOPTS. */ explain ("settrans -a"); - err = fshelp_start_translator (open_node, fsopts, + err = fshelp_start_translator (open_node, NULL, fsopts, fsopts, fsopts_len, timeout, &active_control); /* If ERR is due to a problem opening the translated node, we print diff --git a/utils/settrans.c b/utils/settrans.c index 408849a3..3145b49c 100644 --- a/utils/settrans.c +++ b/utils/settrans.c @@ -29,6 +29,7 @@ #include <error.h> #include <argz.h> #include <hurd/fshelp.h> +#include <hurd/process.h> #include <version.h> const char *argp_program_version = STANDARD_HURD_VERSION (settrans); @@ -170,11 +171,13 @@ main(int argc, char *argv[]) /* The callback to start_translator opens NODE as a side effect. */ error_t open_node (int flags, mach_port_t *underlying, - mach_msg_type_name_t *underlying_type) + mach_msg_type_name_t *underlying_type, + task_t task, void *cookie) { if (pause) { - fprintf (stderr, "Pausing..."); + fprintf (stderr, "Translator pid: %d\nPausing...", + task2pid (task)); getchar (); } @@ -190,8 +193,8 @@ main(int argc, char *argv[]) return 0; } - err = fshelp_start_translator (open_node, argz, argz, argz_len, timeout, - &active_control); + err = fshelp_start_translator (open_node, NULL, argz, argz, argz_len, + timeout, &active_control); if (err) /* If ERR is due to a problem opening the translated node, we print that name, otherwise, the name of the translator. */ |