ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.121 by root, Fri Sep 29 00:56:05 2006 UTC vs.
Revision 1.125 by root, Wed Oct 18 12:53:45 2006 UTC

15package CFPlus; 15package CFPlus;
16 16
17use Carp (); 17use Carp ();
18 18
19BEGIN { 19BEGIN {
20 $VERSION = '0.52'; 20 $VERSION = '0.53';
21 21
22 use XSLoader; 22 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
24} 24}
25 25
60 s/&/&/g; 60 s/&/&/g;
61 s/>/>/g; 61 s/>/>/g;
62 s/</&lt;/g; 62 s/</&lt;/g;
63 63
64 $_ 64 $_
65}
66
67sub socketpipe() {
68 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
69 or die "cannot establish bidiretcional pipe: $!\n";
70
71 ($fh1, $fh2)
72}
73
74sub background(&) {
75 my ($cb) = @_;
76
77 my ($fh_r, $fh_w) = CFPlus::socketpipe;
78
79 my $pid = fork;
80
81 if (defined $pid && !$pid) {
82 local $SIG{__DIE__};
83
84 open STDOUT, ">&", $fh_w;
85 open STDERR, ">&", $fh_w;
86 close $fh_r;
87 close $fh_w;
88
89 $| = 1;
90
91 eval { $cb->() };
92
93 if ($@) {
94 my $msg = $@;
95 $msg =~ s/\n+/\n/;
96 warn "FATAL: $msg";
97 CFPlus::_exit 1;
98 }
99
100 # win32 is fucked up, of course. exit will clean stuff up,
101 # which destroys our database etc. _exit will exit ALL
102 # forked processes, because of the dreaded fork emulation.
103 CFPlus::_exit 0;
104 }
105
106 close $fh_w;
107
108 my $buffer;
109
110 Event->io (fd => $fh_r, poll => 'r', cb => sub {
111 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
112 $_[0]->w->cancel;
113 $buffer .= "done\n";
114 }
115
116 while ($buffer =~ s/^(.*)\n//) {
117 my $line = $1;
118 $line =~ s/\s+$//;
119 utf8::decode $line;
120 ::message ({
121 markup => "editor($pid): " . CFPlus::asxml $line,
122 });
123 }
124 });
65} 125}
66 126
67package CFPlus::Database; 127package CFPlus::Database;
68 128
69our @ISA = BerkeleyDB::Btree::; 129our @ISA = BerkeleyDB::Btree::;
136 $::CFG->{VERSION} = $::VERSION; 196 $::CFG->{VERSION} = $::VERSION;
137 197
138 open my $fh, ">:utf8", $file 198 open my $fh, ">:utf8", $file
139 or return; 199 or return;
140 print $fh to_json $::CFG; 200 print $fh to_json $::CFG;
201}
202
203sub http_proxy {
204 my @proxy = win32_proxy_info;
205
206 if (@proxy) {
207 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
208 } elsif (exists $ENV{http_proxy}) {
209 $ENV{http_proxy}
210 } else {
211 ()
212 }
213}
214
215sub set_proxy {
216 my $proxy = http_proxy
217 or return;
218
219 $ENV{http_proxy} = $proxy;
141} 220}
142 221
143our $DB_ENV; 222our $DB_ENV;
144our $DB_STATE; 223our $DB_STATE;
145 224

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines