Module Name: src
Committed By: dholland
Date: Mon Nov 5 17:30:37 UTC 2012
Modified Files:
src/share/man/man9: namei.9 vnodeops.9
Log Message:
These two man pages contain complete cut and paste copies of struct
componentname and/or struct nameidata. Update the copies, for both
today's changes and a number of earlier changes too.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/share/man/man9/namei.9
cvs rdiff -u -r1.87 -r1.88 src/share/man/man9/vnodeops.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/namei.9
diff -u src/share/man/man9/namei.9:1.27 src/share/man/man9/namei.9:1.28
--- src/share/man/man9/namei.9:1.27 Thu Dec 2 12:54:13 2010
+++ src/share/man/man9/namei.9 Mon Nov 5 17:30:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: namei.9,v 1.27 2010/12/02 12:54:13 wiz Exp $
+.\" $NetBSD: namei.9,v 1.28 2012/11/05 17:30:37 dholland Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -85,8 +85,9 @@ struct nameidata {
/*
* Arguments to namei/lookup.
*/
- const char *ni_dirp; /* pathname pointer */
- enum uio_seg ni_segflg; /* location of pathname */
+ struct vnode *ni_startdir; /* starting dir, cwd if null */
+ struct pathbuf *ni_pathbuf; /* pathname container */
+ char *ni_pnbuf; /* extra pathname buffer ref (XXX) */
/*
* Arguments to lookup.
*/
@@ -100,9 +101,9 @@ struct nameidata {
/*
* Shared between namei and lookup/commit routines.
*/
- size_t ni_pathlen; /* remaining chars in path */
+ size_t ni_pathlen; /* remaining chars in path */
const char *ni_next; /* next location in pathname */
- u_long ni_loopcnt; /* count of symlinks encountered */
+ unsigned int ni_loopcnt; /* count of symlinks encountered */
/*
* Lookup parameters
*/
@@ -110,17 +111,15 @@ struct nameidata {
/*
* Arguments to lookup.
*/
- u_long cn_nameiop; /* namei operation */
- u_long cn_flags; /* flags to namei */
+ uint32_t cn_nameiop; /* namei operation */
+ uint32_t cn_flags; /* flags to namei */
kauth_cred_t cn_cred; /* credentials */
/*
* Shared between lookup and commit routines.
*/
- char *cn_pnbuf; /* pathname buffer */
const char *cn_nameptr; /* pointer to looked up name */
- long cn_namelen; /* length of looked up component */
- u_long cn_hash; /* hash value of looked up name */
- long cn_consume; /* chars to consume in lookup() */
+ size_t cn_namelen; /* length of looked up component */
+ size_t cn_consume; /* chars to consume in lookup() */
} ni_cnd;
};
.Ed
Index: src/share/man/man9/vnodeops.9
diff -u src/share/man/man9/vnodeops.9:1.87 src/share/man/man9/vnodeops.9:1.88
--- src/share/man/man9/vnodeops.9:1.87 Mon Oct 1 20:49:30 2012
+++ src/share/man/man9/vnodeops.9 Mon Nov 5 17:30:37 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: vnodeops.9,v 1.87 2012/10/01 20:49:30 wiz Exp $
+.\" $NetBSD: vnodeops.9,v 1.88 2012/11/05 17:30:37 dholland Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -297,10 +297,8 @@ struct componentname {
/*
* Shared between lookup and commit routines.
*/
- char *cn_pnbuf; /* pathname buffer */
const char *cn_nameptr; /* pointer to looked up name */
size_t cn_namelen; /* length of looked up component */
- u_long cn_hash; /* hash value of looked up name */
size_t cn_consume; /* chars to consume in lookup() */
};
.Ed
