aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2016-12-28 19:35:14 +0000
committerSimon McVittie <smcv@debian.org>2016-12-28 21:32:12 +0000
commit4ad4fc33b52c7a2636eec810ca280efe65497fc9 (patch)
treea284626561f711ca590b9f6cc2959a564dfb3839 /IkiWiki
parent7f2235478d4331b8738e9a9dc8d6d6c08461cd5c (diff)
downloadikiwiki-4ad4fc33b52c7a2636eec810ca280efe65497fc9.tar
ikiwiki-4ad4fc33b52c7a2636eec810ca280efe65497fc9.tar.gz
git: write proposed attachment to temp file without going via system()
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/git.pm15
1 files changed, 10 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 333b4ac87..0ee49416b 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -221,6 +221,11 @@ sub safe_git {
chdir $git_dir_stack[0]
or error("cannot chdir to $git_dir_stack[0]: $!");
}
+
+ if ($params{stdout}) {
+ open(STDOUT, '>&', $params{stdout}) or error("Cannot reopen stdout: $!");
+ }
+
exec @{$params{cmdline}} or error("Cannot exec '@{$params{cmdline}}': $!");
}
# In parent.
@@ -958,11 +963,11 @@ sub git_parse_changes {
die $@ if $@;
my $fh;
($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);
- my $cmd = "cd $git_dir_stack[0] && ".
- "git show $detail->{sha1_to} > '$path'";
- if (system($cmd) != 0) {
- error("failed writing temp file '$path'.");
- }
+ safe_git(
+ error_handler => sub { error("failed writing temp file '$path': ".shift."."); },
+ stdout => $fh,
+ cmdline => ['git', 'show', $detail->{sha1_to}],
+ );
}
push @rets, {