hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the cloc graph generator to purge temporary files properly

Browse Source
This commit is contained in:
hyung-hwan 2015-02-05 13:20:29 +00:00
parent b690831cb0
commit 111c662dec
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
codepot/src/codepot/controllers/code.php
View File

@ -677,21 +677,24 @@ class Code extends Controller
return; return;
} }
$tfname = @tempnam(__FILE__, 'xxx'); // pass __FILE__ as the first argument so that tempnam creates a name
// in the system directory. __FILE__ can never be a valid directory.
$tfname = @tempnam(__FILE__, 'codepot-cloc-');
if ($tfname === FALSE) if ($tfname === FALSE)
{ {
header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error'); header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error');
return; return;
} }
$tfname = $tfname . '.' . pathinfo ($file['name'], PATHINFO_EXTENSION); $actual_tfname = $tfname . '.' . pathinfo ($file['name'], PATHINFO_EXTENSION);
@file_put_contents ($tfname, $file['content']); @file_put_contents ($actual_tfname, $file['content']);
$cloc_cmd = sprintf ('%s --quiet --csv --csv-delimiter=":" %s', CODEPOT_CLOC_COMMAND_PATH, $tfname); $cloc_cmd = sprintf ('%s --quiet --csv --csv-delimiter=":" %s', CODEPOT_CLOC_COMMAND_PATH, $actual_tfname);
$cloc = @popen ($cloc_cmd, 'r'); $cloc = @popen ($cloc_cmd, 'r');
if ($cloc === FALSE) if ($cloc === FALSE)
{ {
@unlink ($tfname); @unlink ($tfname);
@unlink ($actual_tfname);
header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error'); header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error');
return; return;
} }
@ -710,6 +713,7 @@ class Code extends Controller
@pclose ($cloc); @pclose ($cloc);
@unlink ($tfname); @unlink ($tfname);
@unlink ($actual_tfname);
if ($counter === FALSE) if ($counter === FALSE)
{ {