summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ftpfs/ChangeLog5
-rw-r--r--ftpfs/ftpfs.c3
-rw-r--r--hostmux/ChangeLog5
-rw-r--r--hostmux/hostmux.c4
-rw-r--r--libnetfs/ChangeLog8
-rw-r--r--libnetfs/Makefile5
-rw-r--r--libnetfs/fsstubs.c12
-rw-r--r--libnetfs/io-version.c40
-rw-r--r--libnetfs/netfs.h8
-rw-r--r--nfs/ChangeLog6
-rw-r--r--nfs/main.c6
-rw-r--r--trans/ChangeLog5
-rw-r--r--trans/fakeroot.c2
-rw-r--r--usermux/ChangeLog5
-rw-r--r--usermux/usermux.c4
15 files changed, 103 insertions, 15 deletions
diff --git a/ftpfs/ChangeLog b/ftpfs/ChangeLog
index 0519676a..ba625b6c 100644
--- a/ftpfs/ChangeLog
+++ b/ftpfs/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
+ * ftpfs.c (netfs_server_name, netfs_server_version): New
+ variables.
+
2002-05-08 Roland McGrath <roland@frob.com>
* conn.c (ftpfs_get_ftp_conn): Cast to uintptr_t before void *.
diff --git a/ftpfs/ftpfs.c b/ftpfs/ftpfs.c
index 9ff8ef46..492df79e 100644
--- a/ftpfs/ftpfs.c
+++ b/ftpfs/ftpfs.c
@@ -32,6 +32,9 @@
#include "ftpfs.h"
+char *netfs_server_name = "ftpfs";
+char *netfs_server_version = HURD_VERSION;
+
const char *argp_program_version = STANDARD_HURD_VERSION (ftpfs);
static char *args_doc = "REMOTE_FS [SERVER]";
diff --git a/hostmux/ChangeLog b/hostmux/ChangeLog
index d2df93e7..064785d6 100644
--- a/hostmux/ChangeLog
+++ b/hostmux/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
+ * hostmux.c (netfs_server_name, netfs_server_version): New
+ variables.
+
2002-03-10 Neal H Walfield <neal@cs.uml.edu>
* mux.c (lookup_addrinfo): Renamed from lookup_hostent. Change HE
diff --git a/hostmux/hostmux.c b/hostmux/hostmux.c
index fd5bc748..b0a72693 100644
--- a/hostmux/hostmux.c
+++ b/hostmux/hostmux.c
@@ -1,6 +1,6 @@
/* Multiplexing filesystems by host
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2002 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
This file is part of the GNU Hurd.
@@ -30,6 +30,8 @@
const char *argp_program_version = STANDARD_HURD_VERSION (hostmux);
+char *netfs_server_name = "hostmux";
+char *netfs_server_version = HURD_VERSION;
int netfs_maxsymlinks = 25;
volatile struct mapped_time_value *hostmux_mapped_time;
diff --git a/libnetfs/ChangeLog b/libnetfs/ChangeLog
index 7153e149..18d0006d 100644
--- a/libnetfs/ChangeLog
+++ b/libnetfs/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
+ * io-version.c: New file.
+ * Makefile (IOSRCS): Add io-version.c.
+ * fsstubs.c (netfs_S_io_server_version): Function removed.
+ * netfs.h (netfs_server_name, netfs_server_version): New external
+ variables to be defined by the user.
+
2002-05-11 Roland McGrath <roland@frob.com>
* trans-callback.c (_netfs_translator_callback1_fn): Add an assert
diff --git a/libnetfs/Makefile b/libnetfs/Makefile
index 07abc737..27881676 100644
--- a/libnetfs/Makefile
+++ b/libnetfs/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 1995, 1996, 1997, 1999, 2001 Free Software Foundation
+# Copyright (C) 1995,96,97,99,2001,02 Free Software Foundation
# Written by Michael I. Bushnell.
#
# This file is part of the GNU Hurd.
@@ -36,7 +36,8 @@ IOSRCS= io-read.c io-readable.c io-seek.c io-write.c io-stat.c io-async.c \
io-set-all-openmodes.c io-get-openmodes.c io-set-some-openmodes.c \
io-clear-some-openmodes.c io-mod-owner.c io-get-owner.c io-select.c \
io-get-icky-async-id.c io-reauthenticate.c io-restrict-auth.c \
- io-duplicate.c iostubs.c io-identity.c io-revoke.c io-pathconf.c
+ io-duplicate.c iostubs.c io-identity.c io-revoke.c io-pathconf.c \
+ io-version.c
FSYSSRCS= fsys-syncfs.c fsys-getroot.c fsys-get-options.c fsys-set-options.c \
fsys-goaway.c fsysstubs.c
diff --git a/libnetfs/fsstubs.c b/libnetfs/fsstubs.c
index 415c62a5..caca504e 100644
--- a/libnetfs/fsstubs.c
+++ b/libnetfs/fsstubs.c
@@ -1,4 +1,4 @@
-/* Unimplemented rpcs from <hurd/fs.defs>
+>/* Unimplemented rpcs from <hurd/fs.defs>
Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
@@ -50,13 +50,3 @@ netfs_S_ifsock_getsockaddr (struct protid *user,
{
return EOPNOTSUPP;
}
-
-error_t
-netfs_S_io_server_version (struct protid *user,
- char *name,
- int *major,
- int *minor,
- int *edit)
-{
- return EOPNOTSUPP;
-}
diff --git a/libnetfs/io-version.c b/libnetfs/io-version.c
new file mode 100644
index 00000000..d38b194a
--- /dev/null
+++ b/libnetfs/io-version.c
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 1994, 1996, 2002 Free Software Foundation
+
+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 the GNU Hurd; see the file COPYING. If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+/* Written by Michael I. Bushnell. */
+
+#include <stdio.h>
+
+#include "netfs.h"
+#include "io_S.h"
+
+kern_return_t
+netfs_S_io_server_version (struct protid *cred,
+ char *server_name,
+ int *major,
+ int *minor,
+ int *edit)
+{
+ if (!cred)
+ return EOPNOTSUPP;
+
+ snprintf (server_name, sizeof (string_t), "%s %s",
+ netfs_server_name, netfs_server_version);
+ return 0;
+}
diff --git a/libnetfs/netfs.h b/libnetfs/netfs.h
index 0379ce91..9becea59 100644
--- a/libnetfs/netfs.h
+++ b/libnetfs/netfs.h
@@ -93,6 +93,14 @@ struct node
struct dirmod *dirmod_reqs;
};
+/* The user must define this variable. Set this to the name of the
+ filesystem server. */
+extern char *netfs_server_name;
+
+/* The user must define this variables. Set this to be the server
+ version number. */
+extern char *netfs_server_version;
+
/* The user must define this function. Make sure that NP->nn_stat is
filled with the most current information. CRED identifies the user
responsible for the operation. NP is locked. */
diff --git a/nfs/ChangeLog b/nfs/ChangeLog
index 07ab1cd0..0ddff51b 100644
--- a/nfs/ChangeLog
+++ b/nfs/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
+ * main.c: Include <version.h>.
+ (netfs_server_name, netfs_server_version, argp_program_version):
+ New variables.
+
2002-05-08 Roland McGrath <roland@frob.com>
* storage-info.c (netfs_file_get_storage_info): Cast %* arg to int.
diff --git a/nfs/main.c b/nfs/main.c
index c5a53cdb..48852062 100644
--- a/nfs/main.c
+++ b/nfs/main.c
@@ -30,6 +30,10 @@
#include <argp.h>
#include <argz.h>
#include <error.h>
+#include <version.h>
+
+char *netfs_server_name = "nfs";
+char *netfs_server_version = HURD_VERSION;
extern char *localhost ();
@@ -109,6 +113,8 @@ int write_size = DEFAULT_WRITE_SIZE;
#define __D(what) ___D(what)
#define _D(what) __D(DEFAULT_ ## what)
+const char *argp_program_version = STANDARD_HURD_VERSION (nfs);
+
/* Options usable both at startup and at runtime. */
static const struct argp_option common_options[] =
{
diff --git a/trans/ChangeLog b/trans/ChangeLog
index 491b6db4..6579056f 100644
--- a/trans/ChangeLog
+++ b/trans/ChangeLog
@@ -1,5 +1,10 @@
2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+ * fakeroot.c (netfs_server_name, netfs_server_version): New
+ variables.
+
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
* symlink.c: Include <argp.h> and <version.h>.
(argp_program_version, options, args_doc, doc, argp): New
variables.
diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index 20c34744..4e9bdd91 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -32,6 +32,8 @@
const char *argp_program_version = STANDARD_HURD_VERSION (fakeroot);
+char *netfs_server_name = "fakeroot";
+char *netfs_server_version = HURD_VERSION;
int netfs_maxsymlinks = 16; /* arbitrary */
struct netnode
diff --git a/usermux/ChangeLog b/usermux/ChangeLog
index 4e94e020..9fe094e2 100644
--- a/usermux/ChangeLog
+++ b/usermux/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-13 Marcus Brinkmann <marcus@gnu.org>
+
+ * usermux.c (netfs_server_name, netfs_server_version): New
+ variables.
+
2001-02-12 Marcus Brinkmann <marcus@gnu.org>
* usermux.c (options): Include <version.h>. Add global variable
diff --git a/usermux/usermux.c b/usermux/usermux.c
index 5dafb8de..209a868b 100644
--- a/usermux/usermux.c
+++ b/usermux/usermux.c
@@ -1,6 +1,6 @@
/* Multiplexing filesystems by user
- Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
This file is part of the GNU Hurd.
@@ -31,6 +31,8 @@
const char *argp_program_version = STANDARD_HURD_VERSION (usermux);
+char *netfs_server_name = "usermux";
+char *netfs_server_version = HURD_VERSION;
int netfs_maxsymlinks = 25;
volatile struct mapped_time_value *usermux_mapped_time;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 20:28:07 +0000