[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.68 by root, Mon Jan 14 10:12:13 2008 UTC

…		…
14	my $PNGNQ = "@PNGNQ@";	14	my $PNGNQ = "@PNGNQ@";
15		15
16	use Getopt::Long;	16	use Getopt::Long;
17	use Coro::Event;	17	use Coro::Event;
18	use AnyEvent;	18	use AnyEvent;
		19	use YAML ();
		20	use JSON::XS ();
19	use IO::AIO ();	21	use IO::AIO ();
20	use File::Temp;	22	use File::Temp;
21	use Crossfire;	23	use Deliantra;
22	use Coro;	24	use Coro;
23	use Coro::AIO;	25	use Coro::AIO;
		26	use Coro::Util;
24	use POSIX ();	27	use POSIX ();
25	use Digest::MD5;
26	use Carp;	28	use Carp;
		29	use Coro::Channel;
27	use Coro::Storable; $Storable::canonical = 1;	30	use Coro::Storable; $Storable::canonical = 1;
28		31
29	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	32	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30		33
31	sub usage {	34	sub usage {
…		…
95	if (!-f "$path/regions") {	98	if (!-f "$path/regions") {
96	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";	99	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
97	exit 1 unless $FORCE;	100	exit 1 unless $FORCE;
98	}	101	}
99		102
100	system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"	103	system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
		104	"$path/.", "$DATADIR/maps/.",
		105	"--exclude", "CVS", "--exclude", "/world-precomposed",
		106	"--delete", "--delete-excluded"
101	and die "map installation failed.\n";	107	and die "map installation failed.\n";
102		108
103	print "maps installed successfully.\n";	109	print "maps installed successfully.\n";
104	}	110	}
105		111
…		…
113	our $NFILE;	119	our $NFILE;
114	our $PATH;	120	our $PATH;
115		121
116	our $QUANTIZE = "+dither -colorspace RGB -colors 256";	122	our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117		123
118	our (@png, @trs, @arc, @res); # files we are interested in	124	our $c_arc = new Coro::Channel;
		125	our $c_trs = new Coro::Channel;
		126	our $c_res = new Coro::Channel;
		127
		128	our @c_png;
119		129
120	sub commit_png($$$) {	130	sub commit_png($$$) {
121	my ($name, $data, $T) = @_;	131	my ($name, $data, $T) = @_;
122		132
123	$FACEINFO{$name}{"data$T"} = $data;	133	$FACEINFO{$name}{"data$T"} = $data;
124	}	134	}
125		135
126	sub process_png {	136	sub process_png {
127	while (@png) {	137	while (@c_png) {
128	my ($path, $delete) = @{pop @png};	138	my ($path, $delete) = @{pop @c_png};
129		139
130	my $png;	140	my $png;
131	aio_lstat $path;	141	aio_lstat $path;
132	my ($size, $mtime) = (stat _)[7,9];	142	my ($size, $mtime) = (stat _)[7,9];
133		143
…		…
164	if ($w % $T \|\| $h % $T) {	174	if ($w % $T \|\| $h % $T) {
165	warn "$path: weird png size ($w $h), skipping.\n";	175	warn "$path: weird png size ($w $h), skipping.\n";
166	next;	176	next;
167	}	177	}
168		178
		179	(my $base = $stem) =~ s/^.*\///;
		180
		181	my $fi = $FACEINFO{$base};
		182	unless ($fi) {
		183	#warn "$path: <$base> not referenced by any archetype, skipping.\n";
		184	#next;
		185	}
		186
		187	my $arc = $fi->{arc} \|\| { };
		188
169	unless ($path =~ /~$/) {	189	unless ($path =~ /~$/) {
170	# possibly enlarge	190	# possibly enlarge
171	if (0 > aio_stat "$stem.64x64.png") {	191	if (0 > aio_stat "$stem.64x64.png") {
172	my $other = "$stem.64x64.png~";	192	my $other = "$stem.64x64.png~";
173		193
174	if (0 > aio_lstat $other or (-M _) > (-M $path)) {	194	if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175	my $wrap = 0; # for the time being
176	fork_sub {	195	fork_sub {
		196	my $CROP;
		197	my $SRC = "png:\Q$path\E";
		198
		199	my $is_floor = $arc->{is_floor};
		200	my $is_wall = 0;
		201
		202	my ($wall_pfx, $wall_dir, $wall_sfx);
		203
		204	if (
		205	!$is_floor
		206	&& !$arc->{alive}
		207	&& $arc->{move_block} eq "all"
		208	&& $path =~ /^(._)([0-9A-F])(\.x11.\.png)$/
		209	) {
		210	($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
		211
		212	unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
		213	$is_wall = 1;
		214	}
		215	}
		216
		217	if ($is_wall \|\| $is_floor) {
		218	# add a 4px border and add other images around it
		219	$CROP = "-shave 8x8 +repage";
		220
		221	$w += 8;
		222	$h += 8;
		223
		224	$SRC = "-size ${w}x${h} xc:transparent";
		225	$SRC .= " png:\Q$path\E -geometry +4+4 -composite";
		226
		227	# 8 surrounding images
		228	for (
		229	# x y b r0 r1
		230	[-1, -1, 0, 6],
		231	[ 0, -1, 1, 10, 14],
		232	[+1, -1, 0, 12],
		233
		234	[-1, 0, 8, 5, 7],
		235	#
		236	[+1, 0, 2, 5, 13],
		237
		238	[-1, +1, 0, 3],
		239	[ 0, +1, 4, 10, 11],
		240	[+1, +1, 0, 9],
		241	) {
		242	my ($x, $y, $d, $r0, $r1) = @$_;
		243
		244	my $tile = $is_floor ? $path
		245	: $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
		246	: die;
		247
		248	$SRC .= sprintf " png:%s -geometry %+d%+d -composite",
		249	"\Q$tile",
		250	$x * ($w - 8) + 4,
		251	$y * ($h - 8) + 4;
		252	}
		253	}
		254
177	system "convert png:\Q$path\E -depth 8 rgba:-"	255	system "convert -depth 8 $SRC rgba:-"
178	. "\| $exec_prefix/bin/cfhq2xa $w $h $wrap"	256	. "\| $exec_prefix/bin/cfhq2xa $w $h 0"
179	. "\| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"	257	. "\| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180	and die "convert/hq2xa pipeline error: status $? ($!)";	258	and die "convert/cfhq2xa pipeline error: status $? ($!)";
181	system $OPTIPNG, "-i0", "-q", "$other~";	259	system $OPTIPNG, "-i0", "-q", "$other~";
182	die "$other~ has zero size, aborting." unless -s "$other~";	260	die "$other~ has zero size, aborting." unless -s "$other~";
183	rename "$other~", $other;	261	rename "$other~", $other;
184	};	262	};
185	}	263	}
186		264
187	push @png, [$other, !$CACHE];	265	push @c_png, [$other, !$CACHE];
188	}	266	}
189		267
190	# possibly scale down	268	# possibly scale down
191	if (0 > aio_stat "$stem.32x32.png") {	269	if (0 > aio_stat "$stem.32x32.png") {
192	my $other = "$stem.32x32.png~";	270	my $other = "$stem.32x32.png~";
…		…
217	rename "$other~", $other;	295	rename "$other~", $other;
218	};	296	};
219	}	297	}
220		298
221	#warn "scaled down $path to $other\n";#d#	299	#warn "scaled down $path to $other\n";#d#
222	push @png, [$other, !$CACHE];	300	push @c_png, [$other, !$CACHE];
223	}	301	}
224	}	302	}
225		303
226	(my $face = $stem) =~ s/^.*\///;	304	(my $face = $stem) =~ s/^.*\///;
227		305
…		…
288	aio_unlink $path if $delete;	366	aio_unlink $path if $delete;
289	}	367	}
290	}	368	}
291		369
292	sub process_arc {	370	sub process_arc {
293	while (@arc) {	371	while (my $job = $c_arc->get) {
294	my ($dir, $file) = @{pop @arc};	372	my ($dir, $file) = @$job;
295		373
296	my $arc;	374	my $arc;
297	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/	375	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298		376
299	my $arc = read_arch "$dir/$file";	377	my $arc = read_arch "$dir/$file";
…		…
351	facings => $facings,	429	facings => $facings,
352	frames => \@frames,	430	frames => \@frames,
353	};	431	};
354	}	432	}
355		433
356	for my $face ($o->{face} \|\| (), @{$anim \|\| []}) {	434	for ($o->{face} \|\| (), @{$anim \|\| []}) {
357	next if $face =~ /^facings\s\|^blank.x11$\|^empty.x11$/;	435	next if /^facings\s/;
358		436
		437	my $face = $_;
		438	$face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
		439
359	my $info = $FACEINFO{$face} \|\|= {};	440	my $info = $FACEINFO{$face} \|\|= { };
		441	$info->{arc} = $o;
		442
		443	next if $face =~ /^blank.x11$\|^empty.x11$/;
360		444
361	$info->{visibility} = $visibility if defined $visibility;	445	$info->{visibility} = $visibility if defined $visibility;
362	$info->{magicmap} = $magicmap if defined $magicmap;	446	$info->{magicmap} = $magicmap if defined $magicmap;
363	}	447	}
364		448
365	if (my $smooth = delete $o->{smoothface}) {	449	if (my $smooth = delete $o->{smoothface}) {
366	my %kv =split /\s+/, $smooth;	450	my %kv = split /\s+/, $smooth;
367	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support	451	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368	while (my ($face, $smooth) = each %kv) {	452	while (my ($face, $smooth) = each %kv) {
		453	$FACEINFO{$smooth}{arc} = $o;
		454
369	$FACEINFO{$face}{smooth} = $smooth;	455	$FACEINFO{$face}{smooth} = $smooth;
370	$FACEINFO{$face}{smoothlevel} = $level;	456	$FACEINFO{$face}{smoothlevel} = $level;
371	}	457	}
372	}	458	}
373	}	459	}
374	}	460	}
375	}	461	}
376	}	462	}
377		463
378	sub process_trs {	464	sub process_trs {
379	while (@trs) {	465	while (my $job = $c_trs->get) {
380	my ($dir, $file) = @{pop @trs};	466	my ($dir, $file) = @$job;
381	my $path = "$dir/$file";	467	my $path = "$dir/$file";
382		468
383	my $trs;	469	my $trs;
384	if (0 > aio_load $path, $trs) {	470	if (0 > aio_load $path, $trs) {
385	warn "$path: $!, skipping.\n";	471	warn "$path: $!, skipping.\n";
…		…
388		474
389	$TRS .= $trs;	475	$TRS .= $trs;
390	}	476	}
391	}	477	}
392		478
		479	my %FILECACHE;
		480
		481	sub load_cached($;$) {
		482	unless (exists $FILECACHE{$_[0]}) {
		483	my $data;
		484	if (0 < aio_load $_[0], $data) {
		485	if ($_[1]) {
		486	$data = eval { $_[1]->($data) };
		487	warn "$_[0]: $@" if $@;
		488	}
		489	}
		490
		491	$FILECACHE{$_[0]} = $data;
		492	}
		493
		494	$FILECACHE{$_[0]}
		495	}
		496
393	sub process_res {	497	sub process_res {
394	while (@res) {	498	while (my $job = $c_res->get) {
395	my ($dir, $file, $type) = @{pop @res};	499	my ($dir, $file, $type) = @$job;
396		500
397	my $data;	501	my $data;
398	aio_load "$dir/$file", $data;	502	aio_load "$dir/$file", $data;
399		503
400	my $copyright;	504	my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
401	aio_load "$dir/copyright", $copyright;	505
		506	utf8::decode $dir;
		507	utf8::decode $file;
		508
		509	# a meta file for resources is now mandatory
		510	unless (exists $meta->{$file}) {
		511	warn "skipping $dir/$file\n" if $VERBOSE >= 3;
		512	next;
		513	}
		514
		515	$meta = {
		516	%{ $meta->{"" } \|\| {} },
		517	%{ $meta->{$file} \|\| {} },
		518	};
		519
		520	if ($meta->{license} =~ s/^#//) {
		521	$meta->{license} = ({
		522	"pd" => "Public Domain",
		523	"gpl" => "GNU General Public License, version 3.0 or any later",
		524	"cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
		525	"cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
		526	"cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
		527	})->{$meta->{license}}
		528	\|\| warn "$dir/$file: license tag '$meta->{license}' not found.";
		529	}
402		530
403	$file =~ s/\.res$//;	531	$file =~ s/\.res$//;
404	$file =~ /\.([^.]+)$/	532	$file =~ s/\.(ogg\|wav\|jpg\|png)$//;
405	or next;
406		533
407	substr $dir, 0, 1 + length $PATH, "";	534	substr $dir, 0, 1 + length $PATH, "";
408		535
		536	if (my $filter = $meta->{cfutil_filter}) {
		537	if ($filter eq "yaml2json") {
		538	$data = JSON::XS::encode_json YAML::Load $data;
		539	} elsif ($filter eq "json2json") {
		540	$data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
		541	} elsif ($filter eq "perl2json") {
		542	$data = eval $data; die if $@;
		543	$data = JSON::XS::encode_json $data;
		544	} else {
		545	warn "$dir/$file: unknown filter $filter, skipping\n";
		546	}
		547	}
		548
409	$RESOURCE{"$dir/$file"} = {	549	$RESOURCE{"$dir/$file"} = {
410	type => $type,	550	type => (exists $meta->{type} ? delete $meta->{type} : $type),
411	copyright => $copyright,
412	data => $data,	551	data => $data,
413	chksum => Digest::MD5::md5 $data,	552	%$meta ? (meta => $meta) : (),
414	};	553	};
415	}	554	}
416	}	555	}
417		556
418	sub find_files;	557	sub find_files;
…		…
429	my $dir = $path;	568	my $dir = $path;
430	substr $dir, 0, 1 + length $PATH, "";	569	substr $dir, 0, 1 + length $PATH, "";
431		570
432	for my $file (@$nondirs) {	571	for my $file (@$nondirs) {
433	if ($dir =~ /^music(?:\/\|$)/) {	572	if ($dir =~ /^music(?:\/\|$)/) {
434	push @res, [$path, $file, 3] # FT_MUSIC	573	$c_res->put ([$path, $file, 3]) # FT_MUSIC
435	if $file =~ /\.(ogg)$/;	574	if $file =~ /\.(ogg)$/;
436		575
437	} elsif ($dir =~ /^sounds(?:\/\|$)/) {	576	} elsif ($dir =~ /^sound(?:\/\|$)/) {
438	push @res, [$path, $file, 5] # FT_SOUND	577	$c_res->put ([$path, $file, 5]) # FT_SOUND
439	if $file =~ /\.(wav\|ogg)$/;	578	if $file =~ /\.(wav\|ogg)$/;
440		579
441	} elsif ($dir =~ /^res(?:\/\|$)/) {	580	} elsif ($dir =~ /^res(?:\/\|$)/) {
442	push @res, [$path, $file, 0] # FT_FACE
443	if $file =~ /\.(jpg\|png)$/;	581	if ($file =~ /\.(jpg\|png)$/) {
444	push @res, [$path, $file, 7] # FT_RSRC	582	$c_res->put ([$path, $file, 0]) # FT_FACE
445	if $file =~ /\.(res)$/;	583	} elsif ($file =~ /\.(res)$/) {
		584	$c_res->put ([$path, $file, 6]) # FT_RSRC
		585	} else {
		586	$c_res->put ([$path, $file, undef]);
		587	}
446		588
447	} elsif ($file =~ /\.png$/) {	589	} elsif ($file =~ /\.png$/) {
448	push @png, ["$path/$file", 0];	590	push @c_png, ["$path/$file", 0];
449		591
450	} elsif ($file =~ /\.trs$/) {	592	} elsif ($file =~ /\.trs$/) {
451	push @trs, [$path, $file];	593	$c_trs->put ([$path, $file]);
452		594
453	} elsif ($file =~ /\.arc$/) {	595	} elsif ($file =~ /\.arc$/) {
454	push @arc, [$path, $file];	596	$c_arc->put ([$path, $file]);
455		597
456	} else {	598	} else {
457	warn "ignoring $path/$file\n" if $VERBOSE >= 3;	599	warn "ignoring $path/$file\n" if $VERBOSE >= 3;
458	}	600	}
459	}	601	}
…		…
478	if (!-d "$path/treasures") {	620	if (!-d "$path/treasures") {
479	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";	621	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
480	exit 1 unless $FORCE;	622	exit 1 unless $FORCE;
481	}	623	}
482		624
		625	print "scanning files...\n" if $VERBOSE;
		626
483	find_files $path;	627	find_files $path;
		628
		629	my @a_arc = map +(async \&process_arc), 1..2;
		630	my @a_res = map +(async \&process_res), 1..2;
		631	my @a_trs = map +(async \&process_trs), 1..2;
		632
484	IO::AIO::flush;	633	IO::AIO::flush;
485		634
486	$_->join for (	635	$c_res->put (undef) for @a_res;
		636	$c_arc->put (undef) for @a_arc;
		637	$c_trs->put (undef) for @a_trs;
		638
		639	print "start file scan, arc, res processing...\n" if $VERBOSE;
		640
		641	$_->join for @a_arc; # need to parse all archetypes before png processing
		642
		643	print "end arc, start png processing...\n" if $VERBOSE;
		644
487	# four png crunchers work fine for my 2x smp machine	645	# four png crunchers work fine for my 2x smp machine
488	(async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),	646	my @a_png = map +(async \&process_png), 1..4;
489	(async \&process_trs), (async \&process_trs),
490	(async \&process_arc), (async \&process_arc),
491	(async \&process_res), (async \&process_res),
492	);
493		647
		648	$_->join for (@a_trs, @a_res, @a_png);
		649
		650	print "scanning done, processing results...\n" if $VERBOSE;
494	{	651	{
495	# remove path prefix from editor_folder	652	# remove path prefix from editor_folder
496	substr $_->{editor_folder}, 0, 1 + length $path, ""	653	substr $_->{editor_folder}, 0, 1 + length $path, ""
497	for values %ARC;	654	for values %ARC;
498		655
		656	print "resolving inheritance tree...\n" if $VERBOSE;
499	# resolve inherit	657	# resolve inherit
500	while () {	658	while () {
501	my $progress;	659	my $progress;
502	my $loop;	660	my $loop;
503		661
…		…
529	}	687	}
530		688
531	# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit	689	# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
532	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;	690	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;
533		691
		692	print "writing archetypes...\n" if $VERBOSE;
534	open my $fh, ">:utf8", "$DATADIR/archetypes~"	693	open my $fh, ">:utf8", "$DATADIR/archetypes~"
535	or die "$DATADIR/archetypes~: $!";	694	or die "$DATADIR/archetypes~: $!";
536	print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];	695	print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
537	}	696	}
538		697
539	{	698	{
		699	print "writing treasures...\n" if $VERBOSE;
540	open my $fh, ">:utf8", "$DATADIR/treasures~"	700	open my $fh, ">:utf8", "$DATADIR/treasures~"
541	or die "$DATADIR/treasures~: $!";	701	or die "$DATADIR/treasures~: $!";
542	print $fh $TRS;	702	print $fh $TRS;
543	}	703	}
544		704
545	{	705	{
		706	print "processing facedata...\n" if $VERBOSE;
546	while (my ($k, $v) = each %FACEINFO) {	707	while (my ($k, $v) = each %FACEINFO) {
547	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";	708	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
548	length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";	709	length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
549		710
550	length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";	711	length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
551	#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";	712	#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
552		713
553	$v->{chksum32} = Digest::MD5::md5 $v->{data32};
554	$v->{chksum64} = Digest::MD5::md5 $v->{data64};
555
556	if (my $magicmap = $v->{magicmap}) {	714	if (my $magicmap = $v->{magicmap}) {
557	$magicmap =~ y/A-Z_\-/a-z/d;	715	$magicmap =~ y/A-Z_\-/a-z/d;
558	$v->{magicmap} = $COLOR{$magicmap};	716	$v->{magicmap} = $COLOR{$magicmap};
559	}	717	}
560	}
561		718
		719	delete $v->{arc};
		720	}
		721
		722	print "writing facedata...\n" if $VERBOSE;
562	open my $fh, ">:perlio", "$DATADIR/facedata~"	723	open my $fh, ">:perlio", "$DATADIR/facedata~"
563	or die "$DATADIR/facedata~: $!";	724	or die "$DATADIR/facedata~: $!";
564		725
565	print $fh freeze {	726	print $fh freeze {
566	version => 2,	727	version => 2,
567	faceinfo => \%FACEINFO,	728	faceinfo => \%FACEINFO,
568	animinfo => \%ANIMINFO,	729	animinfo => \%ANIMINFO,
569	resource => \%RESOURCE,	730	resource => \%RESOURCE,
570	};	731	};
571	}	732	}
		733
		734	print "committing files...\n" if $VERBOSE;
572		735
573	for (qw(archetypes facedata treasures)) {	736	for (qw(archetypes facedata treasures)) {
574	chmod 0644, "$DATADIR/$_~";	737	chmod 0644, "$DATADIR/$_~";
575	rename "$DATADIR/$_~", "$DATADIR/$_"	738	rename "$DATADIR/$_~", "$DATADIR/$_"
576	or die "$DATADIR/$_: $!";	739	or die "$DATADIR/$_: $!";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC vs. Revision 1.68 by root, Mon Jan 14 10:12:13 2008 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.68 by root, Mon Jan 14 10:12:13 2008 UTC