X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=ac44b9ab4c529f712a0c9322d2c1e2b146702250;hp=2938ae11855b5f48208af630792ec9a37c66b8a9;hb=ebbb4bca5d11bf97a7e8c1d973d38bc19cc6b5de;hpb=b02532fd7d3c82864c76eecbfd99a1abc7e2c1b2

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 2938ae11..ac44b9ab 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -15,8 +15,10 @@ BEGIN {
 
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(debiantag server_branch server_ref
-                      stat_exists fail ensuredir waitstatusmsg failedcmd
+    @EXPORT      = qw(setup_sigwarn
+                      debiantag server_branch server_ref
+                      stat_exists fail ensuredir executable_on_path
+                      waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
                       git_rev_parse git_get_ref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
@@ -25,7 +27,7 @@ BEGIN {
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
-                      shellquote printcmd);
+                      shellquote printcmd messagequote);
     # implicitly uses $main::us
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
     @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };
@@ -48,6 +50,13 @@ sub FRESHREPO () { return 0x4; }
 our $debugprefix;
 our $debuglevel = 0;
 
+sub setup_sigwarn () {
+    our $sigwarn_mainprocess = $$;
+    $SIG{__WARN__} = sub { 
+	die $_[0] unless getppid == $sigwarn_mainprocess;
+    };
+}
+
 sub initdebug ($) { 
     ($debugprefix) = @_;
     open DEBUG, ">/dev/null" or die $!;
@@ -73,12 +82,22 @@ sub printdebug {
     print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
 
+sub messagequote ($) {
+    local ($_) = @_;
+    s{\\}{\\\\}g;
+    s{\n}{\\n}g;
+    s{\x08}{\\b}g;
+    s{\t}{\\t}g;
+    s{[\000-\037\177]}{ sprintf "\\x%02x", ord $& }ge;
+    $_;
+}
+
 sub shellquote {
     my @out;
     local $_;
     foreach my $a (@_) {
 	$_ = $a;
-	if (!length || m{[^-=_./0-9a-z]}i) {
+	if (!length || m{[^-=_./:0-9a-z]}i) {
 	    s{['\\]}{'\\$&'}g;
 	    push @out, "'$_'";
 	} else {
@@ -135,6 +154,17 @@ sub ensuredir ($) {
     die "mkdir $dir: $!";
 }
 
+sub executable_on_path ($) {
+    my ($program) = @_;
+    return 1 if $program =~ m{/};
+    my @path = split /:/, ($ENV{PATH} // "/usr/local/bin:/bin:/usr/bin");
+    foreach my $pe (@path) {
+	my $here = "$pe/$program";
+	return $here if stat_exists $here && -x _;
+    }
+    return undef;
+}
+
 our @signames = split / /, $Config{sig_name};
 
 sub waitstatusmsg () {
@@ -166,15 +196,20 @@ sub failedcmd {
 sub cmdoutput_errok {
     die Dumper(\@_)." ?" if grep { !defined } @_;
     debugcmd "|",@_;
-    open P, "-|", @_ or die $!;
+    open P, "-|", @_ or die "$_[0] $!";
     my $d;
     $!=0; $?=0;
     { local $/ = undef; $d = <P>; }
     die $! if P->error;
     if (!close P) { printdebug "=>!$?\n"; return undef; }
     chomp $d;
-    $d =~ m/^.*/;
-    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debuglevel>0; #';
+    if ($debuglevel > 0) {
+	$d =~ m/^.*/;
+	my $dd = $&;
+	my $more = (length $' ? '...' : ''); #');
+	$dd =~ s{[^\n -~]|\\}{ sprintf "\\x%02x", ord $& }ge;
+	printdebug "=> \`$dd'",$more,"\n";
+    }
     return $d;
 }