Module Name: src
Committed By: apb
Date: Fri Oct 19 16:49:21 UTC 2012
Modified Files:
src/sys/sys: param.h ttycom.h
Log Message:
Welcome to NetBSD-6.99.14
In struct ptmget, used for ioctl TIOCPTMGET and TIOCPTSNAME,
increase the size of the cn and sn members from char[16]
to char[PATH_MAX]. 16 chars is just not enough for reasonable things
like "/dev.amd64/pts/1234" or "/chroot/dev/pts/1234".
To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 src/sys/sys/param.h
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/ttycom.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.421 src/sys/sys/param.h:1.422
--- src/sys/sys/param.h:1.421 Sat Oct 13 17:54:40 2012
+++ src/sys/sys/param.h Fri Oct 19 16:49:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.421 2012/10/13 17:54:40 dholland Exp $ */
+/* $NetBSD: param.h,v 1.422 2012/10/19 16:49:21 apb Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 699001300 /* NetBSD 6.99.13 */
+#define __NetBSD_Version__ 699001400 /* NetBSD 6.99.14 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
Index: src/sys/sys/ttycom.h
diff -u src/sys/sys/ttycom.h:1.19 src/sys/sys/ttycom.h:1.20
--- src/sys/sys/ttycom.h:1.19 Sat Sep 24 00:05:39 2011
+++ src/sys/sys/ttycom.h Fri Oct 19 16:49:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ttycom.h,v 1.19 2011/09/24 00:05:39 christos Exp $ */
+/* $NetBSD: ttycom.h,v 1.20 2012/10/19 16:49:21 apb Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -39,6 +39,7 @@
#ifndef _SYS_TTYCOM_H_
#define _SYS_TTYCOM_H_
+#include <sys/syslimits.h>
#include <sys/ioccom.h>
/*
@@ -57,12 +58,12 @@ struct winsize {
unsigned short ws_ypixel; /* vertical size, pixels */
};
-/* ptmget, for /dev/ptm pty getting ioctl PTMGET */
+/* ptmget, for /dev/ptm pty getting ioctl TIOCPTMGET, and for TIOCPTSNAME */
struct ptmget {
int cfd;
int sfd;
- char cn[16];
- char sn[16];
+ char cn[PATH_MAX];
+ char sn[PATH_MAX];
};
#define _PATH_PTMDEV "/dev/ptm"
