diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index 9d2bf6e86fe..ac52818ecf4 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include "vcoda.h" #include diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c index f9bf03f5f4b..9c541199e73 100644 --- a/sys/coda/coda_namecache.c +++ b/sys/coda/coda_namecache.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University @@ -76,6 +72,9 @@ * The latter has no zapping functions, so probably not. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c index ef237c47e4a..1574912e8c5 100644 --- a/sys/coda/coda_psdev.c +++ b/sys/coda/coda_psdev.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -52,6 +48,10 @@ /* These routines are the device entry points for Venus. */ +#include +__FBSDID("$FreeBSD$"); + + extern int coda_nc_initialized; /* Set if cache has been initialized */ #include diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c index 53c43464e3f..36df51dc851 100644 --- a/sys/coda/coda_subr.c +++ b/sys/coda/coda_subr.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * - */ - + */ /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -55,6 +51,9 @@ * 4. coda_cacheprint (under DEBUG) prints names with vnode/cnode address */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c index 66a0b19d0c0..f1eac626fa3 100644 --- a/sys/coda/coda_venus.c +++ b/sys/coda/coda_venus.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index f25738fb076..4c03a6cea60 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -44,6 +40,9 @@ * M. Satyanarayanan. */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c index a94cd06d942..a27f0b12ad5 100644 --- a/sys/coda/coda_vnops.c +++ b/sys/coda/coda_vnops.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University @@ -45,6 +41,9 @@ * M. Satyanarayanan. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 14f9aebdd02..fe789bedc7f 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -37,10 +37,11 @@ * SUCH DAMAGE. * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -714,6 +715,28 @@ linprocfs_doproccmdline(PFS_FILL_ARGS) return (0); } +/* + * Filler function for proc/pid/environ + */ +static int +linprocfs_doprocenviron(PFS_FILL_ARGS) +{ + sbuf_printf(sb, "doprocenviron\n%c", '\0'); + + return (0); +} + +/* + * Filler function for proc/pid/maps + */ +static int +linprocfs_doprocmaps(PFS_FILL_ARGS) +{ + sbuf_printf(sb, "doprocmaps\n%c", '\0'); + + return (0); +} + /* * Filler function for proc/net/dev */ @@ -831,8 +854,16 @@ linprocfs_init(PFS_INIT_ARGS) dir = pfs_create_dir(root, "pid", NULL, NULL, PFS_PROCDEP); pfs_create_file(dir, "cmdline", &linprocfs_doproccmdline, NULL, NULL, PFS_RD); + + pfs_create_file(dir, "environ", &linprocfs_doprocenviron, + NULL, NULL, PFS_RD); + pfs_create_link(dir, "exe", &procfs_doprocfile, NULL, &procfs_notsystem, 0); + + pfs_create_file(dir, "maps", &linprocfs_doprocmaps, + NULL, NULL, PFS_RD); + pfs_create_file(dir, "mem", &procfs_doprocmem, &procfs_attr, &procfs_candebug, PFS_RDWR|PFS_RAW); pfs_create_file(dir, "stat", &linprocfs_doprocstat, diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 5736bc393b7..d61483ad5ad 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index bb1c28fb326..de5fb008858 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -1,7 +1,5 @@ -/* $FreeBSD$ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ - /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,6 +35,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ + +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include "opt_mac.h" diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 9b69fdc004b..d99e05f3d57 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 4f9527719e3..27992294d49 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index 9d908745888..ce1a708ee57 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index ab0abec51ab..cf113ea236d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 09b98a30e27..ba2b4600737 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a521048b4df..a8d81284e44 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + /* XXX we use functions that might not exist. */ #include "opt_compat.h" #include "opt_inet6.h" diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index ad8d8d925ba..3b873f8833d 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_mac.h" #include diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 94ecc47d24b..aecdf73ea81 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -24,10 +24,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index 3059e897ad5..39dbfcd1e10 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 5bd8c15fa35..25e31bc0573 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -27,9 +27,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c index fd9ab262a1d..34e8e1ce3dd 100644 --- a/sys/compat/pecoff/imgact_pecoff.c +++ b/sys/compat/pecoff/imgact_pecoff.c @@ -1,6 +1,3 @@ -/* $NetBSD$ */ -/* $FreeBSD$ */ - /* * Copyright (c) 2000 Masaru OKI * Copyright (c) 1994, 1995, 1998 Scott Bartram @@ -43,6 +40,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c index 9d2bf6e86fe..ac52818ecf4 100644 --- a/sys/fs/coda/coda_fbsd.c +++ b/sys/fs/coda/coda_fbsd.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include "vcoda.h" #include diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c index f9bf03f5f4b..9c541199e73 100644 --- a/sys/fs/coda/coda_namecache.c +++ b/sys/fs/coda/coda_namecache.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University @@ -76,6 +72,9 @@ * The latter has no zapping functions, so probably not. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index ef237c47e4a..1574912e8c5 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -52,6 +48,10 @@ /* These routines are the device entry points for Venus. */ +#include +__FBSDID("$FreeBSD$"); + + extern int coda_nc_initialized; /* Set if cache has been initialized */ #include diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c index 53c43464e3f..36df51dc851 100644 --- a/sys/fs/coda/coda_subr.c +++ b/sys/fs/coda/coda_subr.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * - */ - + */ /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -55,6 +51,9 @@ * 4. coda_cacheprint (under DEBUG) prints names with vnode/cnode address */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c index 66a0b19d0c0..f1eac626fa3 100644 --- a/sys/fs/coda/coda_venus.c +++ b/sys/fs/coda/coda_venus.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index f25738fb076..4c03a6cea60 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1989 Carnegie-Mellon University @@ -44,6 +40,9 @@ * M. Satyanarayanan. */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index a94cd06d942..a27f0b12ad5 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -1,5 +1,4 @@ /* - * * Coda: an Experimental Distributed File System * Release 3.1 * @@ -27,10 +26,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD$ - * */ - /* * Mach Operating System * Copyright (c) 1990 Carnegie-Mellon University @@ -45,6 +41,9 @@ * M. Satyanarayanan. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include