Deleted Added
full compact
kern_cons.c (116663) kern_cons.c (118094)
1/*
2 * Copyright (c) 1988 University of Utah.
3 * Copyright (c) 1991 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * the Systems Programming Group of the University of Utah Computer
8 * Science Department.

--- 25 unchanged lines hidden (view full) ---

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)cons.c 7.2 (Berkeley) 5/9/91
39 */
40
41#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1988 University of Utah.
3 * Copyright (c) 1991 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * the Systems Programming Group of the University of Utah Computer
8 * Science Department.

--- 25 unchanged lines hidden (view full) ---

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)cons.c 7.2 (Berkeley) 5/9/91
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/kern/tty_cons.c 116663 2003-06-22 02:54:33Z iedowse $");
42__FBSDID("$FreeBSD: head/sys/kern/tty_cons.c 118094 2003-07-27 17:04:56Z phk $");
43
44#include "opt_ddb.h"
45
46#include <sys/param.h>
47#include <sys/systm.h>
48#include <sys/conf.h>
49#include <sys/cons.h>
50#include <sys/fcntl.h>

--- 320 unchanged lines hidden (view full) ---

371 vn_close(vp, openflag, td->td_ucred, td);
372 }
373 if (cnd->cnd_name[0] == '\0') {
374 strlcpy(cnd->cnd_name, devtoname(cnd->cnd_cn->cn_dev),
375 sizeof(cnd->cnd_name));
376 }
377 snprintf(path, sizeof(path), "/dev/%s", cnd->cnd_name);
378 NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
43
44#include "opt_ddb.h"
45
46#include <sys/param.h>
47#include <sys/systm.h>
48#include <sys/conf.h>
49#include <sys/cons.h>
50#include <sys/fcntl.h>

--- 320 unchanged lines hidden (view full) ---

371 vn_close(vp, openflag, td->td_ucred, td);
372 }
373 if (cnd->cnd_name[0] == '\0') {
374 strlcpy(cnd->cnd_name, devtoname(cnd->cnd_cn->cn_dev),
375 sizeof(cnd->cnd_name));
376 }
377 snprintf(path, sizeof(path), "/dev/%s", cnd->cnd_name);
378 NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td);
379 error = vn_open(&nd, &openflag, 0);
379 error = vn_open(&nd, &openflag, 0, -1);
380 if (error == 0) {
381 NDFREE(&nd, NDF_ONLY_PNBUF);
382 VOP_UNLOCK(nd.ni_vp, 0, td);
383 if (nd.ni_vp->v_type == VCHR)
384 cnd->cnd_vp = nd.ni_vp;
385 else
386 vn_close(nd.ni_vp, openflag, td->td_ucred, td);
387 }

--- 282 unchanged lines hidden ---
380 if (error == 0) {
381 NDFREE(&nd, NDF_ONLY_PNBUF);
382 VOP_UNLOCK(nd.ni_vp, 0, td);
383 if (nd.ni_vp->v_type == VCHR)
384 cnd->cnd_vp = nd.ni_vp;
385 else
386 vn_close(nd.ni_vp, openflag, td->td_ucred, td);
387 }

--- 282 unchanged lines hidden ---