/[pkgs]/devel/Canna/Canna-oldsock.patch
ViewVC logotype

Contents of /devel/Canna/Canna-oldsock.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Mon Sep 26 09:29:14 2005 UTC (4 years, 1 month ago) by tagoh
Branch: MAIN
CVS Tags: F-12-split, Canna-3_7p3-16_fc5, Canna-3_7p3-16_fc6, Canna-3_7p3-16_fc7, F-7-split, Canna-3_7p3-21_fc8, Canna-3_7p3-20_fc8, Canna-3_7p3-14_fc5, Canna-3_7p3-19_fc8, FC-5-split, Canna-3_7p3-26_fc11, Canna-3_7p3-18_fc7, Canna-3_7p3-13, F-10-split, Canna-3_7p3-27_fc11, F-11-split, Canna-3_7p3-17_fc7, Canna-3_7p3-28_fc12, F-9-split, FC-6-split, Canna-3_7p3-15_fc5, F-8-split, Canna-3_7p3-23_fc9, Canna-3_7p3-25_fc10, Canna-3_7p3-24_fc9, Canna-3_7p3-22_fc9, HEAD
File MIME type: text/x-patch 
auto-import Canna-3.7p3-13 on branch devel from Canna-3.7p3-13.src.rpm
1 diff -ruN Canna37p1.orig/lib/RKC/wconvert.c Canna37p1/lib/RKC/wconvert.c
2 --- Canna37p1.orig/lib/RKC/wconvert.c 2003-09-24 23:50:40.000000000 +0900
3 +++ Canna37p1/lib/RKC/wconvert.c 2004-04-30 19:10:18.762882047 +0900
4 @@ -150,8 +150,25 @@
5 if ((ServerFD = socket((int) addr->sa_family, SOCK_STREAM, 0)) >= 0){
6 if( try_connect( ServerFD, addr, sizeof unaddr ) < 0 ) {
7 close( ServerFD ) ;
8 - return( -1 ) ;
9 + ServerFD = -1;
10 + }
11 + }
12 + if (ServerFD < 0) {
13 + /* for the backward compatibility */
14 +#define OLD_IR_UNIX_PATH "/tmp/.iroha_unix/IROHA"
15 +
16 + if (number)
17 + sprintf (unaddr.sun_path, "%s:%d", OLD_IR_UNIX_PATH, number);
18 + else
19 + strcpy (unaddr.sun_path, OLD_IR_UNIX_PATH);
20 +
21 + if ((ServerFD = socket ((int) addr->sa_family, SOCK_STREAM, 0)) >= 0) {
22 + if (try_connect (ServerFD, addr, sizeof (unaddr)) < 0) {
23 + close (ServerFD);
24 + return -1;
25 + }
26 }
27 +#undef OLD_IR_UNIX_PATH
28 }
29 return( ServerFD ) ;
30 }
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2