docker: decode ascii encoded dockerarg strings

To support for example spaces via %20

Alternative implementation for pull request 965

Author: adrianschroeter

build-recipe-docker

@@ -227,7 +227,7 @@ recipe_build_docker() {
 		buildargs[${#buildargs[@]}]="$kv"
 		;;
 	esac
-    done < <( queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ dockerarg )
+    done < <( queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" --decode buildflags+ dockerarg )
 
     if test -n "$BUILD_FLAVOR" ; then
 	buildargs[${#buildargs[@]}]='--build-arg'

queryconfig

@@ -29,7 +29,7 @@ use strict;
 use Build;
 use Build::Rpm;
 
-my ($dist, $archs, $configdir, $type, $argument);
+my ($dist, $archs, $configdir, $decode, $type, $argument);
 
 $configdir = ($::ENV{'BUILD_DIR'} || '/usr/lib/build') . '/configs';
 
@@ -42,6 +42,10 @@ while (@ARGV)  {
     shift @ARGV;
     $archs = shift @ARGV;
     next;
+  } elsif ($ARGV[0] eq '--decode') {
+    shift @ARGV;
+    $decode = 1;
+    next;
   } elsif ($ARGV[0] eq '--configdir') {
     shift @ARGV;
     $configdir = shift @ARGV;
@@ -58,39 +62,45 @@ die("Please specify what to query\n") unless defined $type;
 my $cf = Build::read_config_dist($dist, $archs, $configdir);
 die("Unable to read config\n") unless $cf;
 
+sub printout {
+  my ($str) = @_;
+  $str =~ s/%([a-fA-F0-9]{2})/chr(hex($1))/ge if $decode;
+  print $str;
+}
+
 if ($type eq 'buildflags') {
   die("Specify which buildflag to query\n") unless $argument;
   my $result = $cf->{"buildflags:$argument"};
-  print "$result\n" if defined $result;
+  printout("$result\n") if defined $result;
 } elsif ($type eq 'buildflags+') {
   die("Specify which buildflag to query\n") unless $argument;
   for (@{$cf->{'buildflags'} || []}) {
-    print "$1\n" if /\Q$argument\E:(.*)/;
+    printout("$1\n") if /\Q$argument\E:(.*)/;
   }
 } elsif ($type eq 'hostarch') {
   my $result = $cf->{"hostarch"};
-  print "$result\n" if defined $result;
+  printout("$result\n") if defined $result;
 } elsif ($type eq 'target' || $type eq 'type' || $type eq 'binarytype' || $type eq 'buildengine' || $type eq 'rawmacros') {
-  print "$cf->{$type}\n" if $cf->{$type};
+  printout("$cf->{$type}\n") if $cf->{$type};
 } elsif ($type eq 'repotype' || $type eq 'repourl' || $type eq 'registryurl') {
-  print join(' ', @{$cf->{$type}})."\n" if $cf->{$type};
+  printout(join(' ', @{$cf->{$type}})."\n") if $cf->{$type};
 } elsif ($type eq 'optflags') {
   exit(0) unless $cf->{'optflags'};
   my $all = $cf->{'optflags'}->{'*'};
   $all = defined($all) && $all ne '' ? " $all" : '';
   $all .= " -g" if $argument && $argument eq 'debug';
   for (sort keys %{$cf->{'optflags'}}) {
     next if $_ eq '*';
-    print "optflags: $_ $cf->{'optflags'}->{$_}$all\n";
+    printout("optflags: $_ $cf->{'optflags'}->{$_}$all\n");
   }
 } elsif ($type eq 'substitute') {
   die("Specify which substitute to query\n") unless $argument;
   my @res =  @{$cf->{'substitute'}->{$argument} || []};
-  print join(' ', @res)."\n" if @res;
+  printout(join(' ', @res)."\n")if @res;
 } elsif ($type eq 'eval') {
   die("Specify what to eval\n") unless defined $argument;
   my $result = Build::Rpm::expandmacros($cf, $argument);
-  print "$result\n";
+  printout("$result\n");
 } else {
   die("unsupported query type: $type\n");
 }