Thread: [Lxr-commits] CVS: lxr genxref,1.40,1.41
Brought to you by:
ajlittoz
From: Malcolm B. <mb...@us...> - 2009-04-22 15:17:08
|
Update of /cvsroot/lxr/lxr In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18381 Modified Files: genxref Log Message: Fix bug 1691407: genxref binary file detection flawed. Added magic.mime file in lib/ and make MMagic use it. Index: genxref =================================================================== RCS file: /cvsroot/lxr/lxr/genxref,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- genxref 21 Apr 2009 16:07:39 -0000 1.40 +++ genxref 22 Apr 2009 15:16:57 -0000 1.41 @@ -74,7 +74,7 @@ $index = new LXR::Index($config->dbname, O_RDWR | O_CREAT); die "Can't create Index " . $config->dbname if !defined($index); -our $filetype = new File::MMagic(); +our $filetype = new File::MMagic(-f 'lib/magic.mime'? ('lib/magic.mime') : ()); our %binaryfiles; my @versions; @@ -155,14 +155,9 @@ if ($config->glimpsedir and $config->glimpseindex) { - # Make sure the directory that the glimpse results go into - # already exists as glimpse won't work if the directory does - # not exist - die $config->glimpsedir . " does not exist" - unless -d $config->glimpsedir; $string = $config->glimpsedir . "/" . $release; mkdir $string; - system("chmod 755 $string"); + system("chmod 755 $string"); # TODO - fix Unix specific call? my $glimpse = new IO::Handle; my $pid = open($glimpse, "|-"); if ($pid == 0) { |