Module Name: src
Committed By: christos
Date: Sun Dec 31 03:29:18 UTC 2017
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_cmdline.c procfs_subr.c
procfs_vfsops.c
Log Message:
rename some "cmdline" stuff now that it is used to print environment too
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.29 -r1.30 src/sys/miscfs/procfs/procfs_cmdline.c
cvs rdiff -u -r1.110 -r1.111 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.99 -r1.100 src/sys/miscfs/procfs/procfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.73 src/sys/miscfs/procfs/procfs.h:1.74
--- src/sys/miscfs/procfs/procfs.h:1.73 Sat Dec 30 22:02:23 2017
+++ src/sys/miscfs/procfs/procfs.h Sat Dec 30 22:29:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.73 2017/12/31 03:02:23 christos Exp $ */
+/* $NetBSD: procfs.h,v 1.74 2017/12/31 03:29:18 christos Exp $ */
/*
* Copyright (c) 1993
@@ -208,7 +208,7 @@ int procfs_dostatus(struct lwp *, struct
struct uio *);
int procfs_domap(struct lwp *, struct proc *, struct pfsnode *,
struct uio *, int);
-int procfs_docmdline(struct lwp *, struct proc *, struct pfsnode *,
+int procfs_doprocargs(struct lwp *, struct proc *, struct pfsnode *,
struct uio *, int);
int procfs_domeminfo(struct lwp *, struct proc *, struct pfsnode *,
struct uio *);
Index: src/sys/miscfs/procfs/procfs_cmdline.c
diff -u src/sys/miscfs/procfs/procfs_cmdline.c:1.29 src/sys/miscfs/procfs/procfs_cmdline.c:1.30
--- src/sys/miscfs/procfs/procfs_cmdline.c:1.29 Sat Dec 30 22:02:23 2017
+++ src/sys/miscfs/procfs/procfs_cmdline.c Sat Dec 30 22:29:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_cmdline.c,v 1.29 2017/12/31 03:02:23 christos Exp $ */
+/* $NetBSD: procfs_cmdline.c,v 1.30 2017/12/31 03:29:18 christos Exp $ */
/*
* Copyright (c) 1999 Jaromir Dolecek <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_cmdline.c,v 1.29 2017/12/31 03:02:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_cmdline.c,v 1.30 2017/12/31 03:29:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_cmdli
#include <uvm/uvm_extern.h>
static int
-procfs_docmdline_helper(void *cookie, const void *src, size_t off, size_t len)
+procfs_doprocargs_helper(void *cookie, const void *src, size_t off, size_t len)
{
struct uio *uio = cookie;
char *buf = __UNCONST(src);
@@ -58,10 +58,10 @@ procfs_docmdline_helper(void *cookie, co
}
/*
- * code for returning process's command line arguments
+ * code for returning process's command line arguments/environment
*/
int
-procfs_docmdline(
+procfs_doprocargs(
struct lwp *curl,
struct proc *p,
struct pfsnode *pfs,
@@ -74,7 +74,7 @@ procfs_docmdline(
/* Don't allow writing. */
if (uio->uio_rw != UIO_READ)
- return (EOPNOTSUPP);
+ return EOPNOTSUPP;
/*
* Zombies don't have a stack, so we can't read their psstrings.
@@ -87,25 +87,22 @@ procfs_docmdline(
if (0 == uio->uio_offset) {
error = uiomove(msg, 1, uio);
if (error)
- return (error);
+ return error;
}
len = strlen(p->p_comm);
if (len >= uio->uio_offset) {
start = uio->uio_offset - 1;
error = uiomove(p->p_comm + start, len - start, uio);
if (error)
- return (error);
+ return error;
}
if (len + 2 >= uio->uio_offset) {
start = uio->uio_offset - 1 - len;
error = uiomove(msg + 1 + start, 2 - start, uio);
}
- return (error);
+ return error;
}
len = uio->uio_offset + uio->uio_resid;
-
- error = copy_procargs(p, oid, &len,
- procfs_docmdline_helper, uio);
- return error;
+ return copy_procargs(p, oid, &len, procfs_doprocargs_helper, uio);
}
Index: src/sys/miscfs/procfs/procfs_subr.c
diff -u src/sys/miscfs/procfs/procfs_subr.c:1.110 src/sys/miscfs/procfs/procfs_subr.c:1.111
--- src/sys/miscfs/procfs/procfs_subr.c:1.110 Sat Dec 30 22:02:23 2017
+++ src/sys/miscfs/procfs/procfs_subr.c Sat Dec 30 22:29:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_subr.c,v 1.110 2017/12/31 03:02:23 christos Exp $ */
+/* $NetBSD: procfs_subr.c,v 1.111 2017/12/31 03:29:18 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.110 2017/12/31 03:02:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.111 2017/12/31 03:29:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,11 +222,11 @@ procfs_rw(void *v)
break;
case PFScmdline:
- error = procfs_docmdline(curl, p, pfs, uio, KERN_PROC_ARGV);
+ error = procfs_doprocargs(curl, p, pfs, uio, KERN_PROC_ARGV);
break;
case PFSenviron:
- error = procfs_docmdline(curl, p, pfs, uio, KERN_PROC_ENV);
+ error = procfs_doprocargs(curl, p, pfs, uio, KERN_PROC_ENV);
break;
case PFSmeminfo:
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.99 src/sys/miscfs/procfs/procfs_vfsops.c:1.100
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.99 Sat Dec 30 22:02:23 2017
+++ src/sys/miscfs/procfs/procfs_vfsops.c Sat Dec 30 22:29:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.99 2017/12/31 03:02:23 christos Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.100 2017/12/31 03:29:18 christos Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.99 2017/12/31 03:02:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.100 2017/12/31 03:29:18 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -395,7 +395,7 @@ procfs_loadvnode(struct mount *mp, struc
case PFSstatus: /* /proc/N/status = -r--r--r-- */
case PFSstat: /* /proc/N/stat = -r--r--r-- */
case PFScmdline: /* /proc/N/cmdline = -r--r--r-- */
- case PFSenviron: /* /proc/N/cmdline = -r--r--r-- */
+ case PFSenviron: /* /proc/N/environ = -r--r--r-- */
case PFSemul: /* /proc/N/emul = -r--r--r-- */
case PFSmeminfo: /* /proc/meminfo = -r--r--r-- */
case PFScpustat: /* /proc/stat = -r--r--r-- */
