diff options
Diffstat (limited to 'libdiskfs/file-get-fs-opts.c')
| -rw-r--r-- | libdiskfs/file-get-fs-opts.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c index 662e7511..b3bca821 100644 --- a/libdiskfs/file-get-fs-opts.c +++ b/libdiskfs/file-get-fs-opts.c @@ -1,8 +1,7 @@ /* Get run-time file system options - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - - Written by Miles Bader <miles@gnu.ai.mit.edu> + Copyright (C) 1995,96,98,2002 Free Software Foundation, Inc. + Written by Miles Bader <miles@gnu.org> This file is part of the GNU Hurd. @@ -22,26 +21,33 @@ #include <errno.h> #include <string.h> +#include <argz.h> #include "priv.h" error_t diskfs_S_file_get_fs_options (struct protid *cred, - char **data, unsigned *data_len) + char **data, size_t *data_len) { error_t err; - char *argz; - size_t argz_len; + char *argz = 0; + size_t argz_len = 0; if (! cred) return EOPNOTSUPP; + err = argz_add (&argz, &argz_len, program_invocation_name); + if (err) + return err; + rwlock_reader_lock (&diskfs_fsys_lock); - err = diskfs_get_options (&argz, &argz_len); + err = diskfs_append_args (&argz, &argz_len); rwlock_reader_unlock (&diskfs_fsys_lock); if (! err) /* Move ARGZ from a malloced buffer into a vm_alloced one. */ - err = fshelp_return_malloced_buffer (argz, argz_len, data, data_len); + err = iohelp_return_malloced_buffer (argz, argz_len, data, data_len); + else + free (argz); return err; } |