head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q2:1.1.0.22
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.20
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.18
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.16
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.14
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.12
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.10
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.8
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.6
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.4
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.2
	pkgsrc-2009Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.08.19.08.13.49;	author obache;	state dead;
branches;
next	1.1;

1.1
date	2009.11.26.12.30.12;	author obache;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove scim-bridge, integraged into scim-1.4.14 as scim-im-agent.
@
text
@$NetBSD: patch-ae,v 1.1 2009/11/26 12:30:12 obache Exp $

--- agent/scim-bridge-agent-accept-listener.cpp.orig	2009-04-19 03:42:18.000000000 +0000
+++ agent/scim-bridge-agent-accept-listener.cpp
@@@@ -30,6 +30,10 @@@@
 #include <sys/types.h>
 #include <sys/un.h>
 
+#ifndef SUN_LEN
+#define SUN_LEN(x) (sizeof(*(x)) - sizeof((x)->sun_path +  strlen ((x)->sun_path))
+#endif
+
 #include "scim-bridge-output.h"
 #include "scim-bridge-path.h"
 
@@@@ -111,7 +115,7 @@@@ retval_t ScimBridgeAgentAcceptListenerIm
     const int MAX_TRIAL = 5;
     for (int i = 0; i < MAX_TRIAL; ++i) {
         scim_bridge_pdebugln (8, "Pinging for the another agent process...");
-        if (connect (socket_fd, (struct sockaddr*)&socket_addr, sizeof (socket_addr.sun_family) + strlen (socket_addr.sun_path))) {
+        if (connect (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr))) {
             if (i == MAX_TRIAL - 1) {
                 scim_bridge_pdebugln (6, "It seems like there is no other agent for the old socket.");
                 break;
@@@@ -163,7 +167,7 @@@@ retval_t ScimBridgeAgentAcceptListenerIm
         return RETVAL_FAILED;
     }
     
-    if (bind (socket_fd, (struct sockaddr*)&socket_addr, strlen (socket_addr.sun_path) + sizeof (socket_addr.sun_family)) != 0) {
+    if (bind (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr)) != 0) {
         scim_bridge_perrorln ("Cannot bind the socket: %s", strerror (errno));
         close (socket_fd);
         socket_fd = -1;
@


1.1
log
@* adjust short option as described in long option and source code (patch-af)
* fixes unportable, broken socket connect/bind (patch-ae, patch-ag)

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@