head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.26
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.24
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.22
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.20
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.18
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.16
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.14
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.12
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.10
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.8
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.6
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.4
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.2
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.2.0.36
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.34
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.32
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.30
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.28
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.26
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.24
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.22
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.20
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.18
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.16
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.14
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.12
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.10
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2
	netbsd-1-5-PATCH001:1.2;
locks; strict;
comment	@# @;


1.3
date	2007.05.20.17.28.22;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2000.11.27.10.59.20;	author rh;	state Exp;
branches;
next	1.1;

1.1
date	2000.11.11.02.07.57;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove gnome-libs from pkgsrc. All its dependencies were already removed.
@
text
@$NetBSD: patch-aq,v 1.2 2000/11/27 10:59:20 rh Exp $

--- zvt/gnome-pty-helper.c.orig	Sat Mar 18 08:57:13 2000
+++ zvt/gnome-pty-helper.c
@@@@ -115,14 +115,20 @@@@
 #endif
 #endif /* CMSG_DATA */
 
-#define CONTROLLEN (sizeof (struct cmsghdr)  + sizeof (int))
+#ifndef CMSG_SPACE
+#include <machine/param.h>
+#define CMSG_SPACE(l)   (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l))
+#define CMSG_LEN(l)     (ALIGN(sizeof(struct cmsghdr)) + (l))
+#endif
 
-static struct cmsghdr *cmptr;
+#define	FD_LEN	(sizeof(int) * 1)
+
+static void *cmptr;
 
 static int
 init_msg_pass ()
 {
-	cmptr = malloc (CONTROLLEN);
+	cmptr = malloc (CMSG_SPACE(FD_LEN));
 
 	if (cmptr)
 		return 0;
@@@@ -135,22 +141,26 @@@@
 {
         struct iovec  iov[1];
         struct msghdr msg;
+	struct cmsghdr *cmp;
         char          buf [1];
 
 	iov [0].iov_base = buf;
 	iov [0].iov_len  = 1;
 
+	memset(&msg, 0, sizeof(msg));
 	msg.msg_iov        = iov;
 	msg.msg_iovlen     = 1;
 	msg.msg_name       = NULL;
 	msg.msg_namelen    = 0;
 	msg.msg_control    = (caddr_t) cmptr;
-	msg.msg_controllen = CONTROLLEN;
+	msg.msg_controllen = CMSG_LEN(FD_LEN);
 		
-	cmptr->cmsg_level = SOL_SOCKET;
-	cmptr->cmsg_type  = SCM_RIGHTS;
-	cmptr->cmsg_len   = CONTROLLEN;
-	*(int *)CMSG_DATA (cmptr) = fd;
+	memset(cmptr, 0, CMSG_SPACE(FD_LEN));
+	cmp = CMSG_FIRSTHDR(&msg);
+	cmp->cmsg_level = SOL_SOCKET;
+	cmp->cmsg_type  = SCM_RIGHTS;
+	cmp->cmsg_len   = CMSG_LEN(FD_LEN);
+	*(int *)CMSG_DATA (cmp) = fd;
 
 	if (sendmsg (client_fd, &msg, 0) != 1)
 		return -1;
@


1.2
log
@Fix CMSG* macros for systems that do not define CMSG_LEN and CMSG space to
make gnome-libs compile again under NetBSD-1.4.x.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Fix file descriptor passing in zvt, as per regress/sys/kern/unfdpass.
This makes gnome-terminal actually work on PowerPC...
@
text
@d3 3
a5 3
--- zvt/gnome-pty-helper.c.orig	Sat Mar 18 07:57:13 2000
+++ zvt/gnome-pty-helper.c	Sat Nov 11 01:59:16 2000
@@@@ -115,14 +115,14 @@@@
d10 5
a14 1
+#define	FD_LEN	(sizeof(int) * 1)
d17 2
d29 1
a29 1
@@@@ -135,22 +135,26 @@@@
@