Module Name: src
Committed By: hannken
Date: Sat Jul 23 14:28:28 UTC 2011
Modified Files:
src/sys/dev/putter: putter.c
src/tests/include: t_paths.c
Log Message:
putter_fop_stat(): set st_mode to S_IFCHR.
Fixes PR #44807: something broken in stat(2).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.6 -r1.7 src/tests/include/t_paths.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/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.31 src/sys/dev/putter/putter.c:1.32
--- src/sys/dev/putter/putter.c:1.31 Sun Feb 6 14:29:25 2011
+++ src/sys/dev/putter/putter.c Sat Jul 23 14:28:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.31 2011/02/06 14:29:25 haad Exp $ */
+/* $NetBSD: putter.c,v 1.32 2011/07/23 14:28:28 hannken Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.31 2011/02/06 14:29:25 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.32 2011/07/23 14:28:28 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -420,6 +420,7 @@
st->st_ctimespec = st->st_birthtimespec = pi->pi_btime;
st->st_uid = kauth_cred_geteuid(fp->f_cred);
st->st_gid = kauth_cred_getegid(fp->f_cred);
+ st->st_mode = S_IFCHR;
KERNEL_UNLOCK_ONE(NULL);
return 0;
}
Index: src/tests/include/t_paths.c
diff -u src/tests/include/t_paths.c:1.6 src/tests/include/t_paths.c:1.7
--- src/tests/include/t_paths.c:1.6 Mon Jul 11 17:51:48 2011
+++ src/tests/include/t_paths.c Sat Jul 23 14:28:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_paths.c,v 1.6 2011/07/11 17:51:48 njoly Exp $ */
+/* $NetBSD: t_paths.c,v 1.7 2011/07/23 14:28:28 hannken Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_paths.c,v 1.6 2011/07/11 17:51:48 njoly Exp $");
+__RCSID("$NetBSD: t_paths.c,v 1.7 2011/07/23 14:28:28 hannken Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -160,9 +160,6 @@
if ((paths[i].flags & PATH_DEV) != 0) {
- if (strcmp(paths[i].path, _PATH_BPF) == 0)
- atf_tc_expect_fail("PR lib/44807");
-
ATF_CHECK(S_ISBLK(m) != 0 || S_ISCHR(m) != 0);
ATF_CHECK((paths[i].flags & PATH_DIR) == 0);
