Attachment 1478587 Details for Bug 1622187 – Patch for man page, quit command and variable substitutions.

[patch] Patch for man page, quit command and variable substitutions.

swatch.patch (text/plain), 2.17 KB, created by John Horne on 2018-08-24 16:12:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Horne

Created: 2018-08-24 16:12:36 UTC

Size: 2.17 KB

patch

obsolete

>--- swatch.orig	2014-12-10 18:52:24.000000000 +0000
>+++ swatch	2018-08-24 15:28:11.238077819 +0100
>@@ -656,17 +656,19 @@
>   my $varname = shift;
>   my $command = shift;
>   my @new_cmd = ();
>+  my $i = my $n = my $m;
> 
>-  $command =~ s/\$[0*]/\$$varname/g if $awk_field_syntax;
>+  $command =~ s/(?<!\\)\$[0*]/\$$varname/g;
> 
>-  foreach my $i (split(/\s+/, $command)) {
>-    if ($awk_field_syntax and $i =~ /\$([0-9]+)/) {
>-      my $n = substr($i, 1);
>-      $n--;
>-      push(@new_cmd, "\$$varname\[$n\]");
>-    } else {
>-      push(@new_cmd, $i);
>+  foreach $i (split(/\s+/, $command)) {
>+    if ($awk_field_syntax) {
>+       while ($i =~ /(?<!\\)\$([1-9]+)/) {
>+          $n = $1;
>+          $m = $n - 1;
>+          $i =~ s/\$$n/\$$varname\[$m\]/;
>+       }
>     }
>+    push(@new_cmd, $i);
>   }
> 
>   return join(' ', @new_cmd);
>@@ -740,7 +742,7 @@
>   }
>   
>   if ($do_quit) {
>-    $code .= "      exit;\n";
>+    $code .= "      &goodbye;\n";
>   } elsif (not $do_continue) {
>     $code .= "      next;\n";
>   }
>@@ -1063,7 +1065,7 @@
> 
> Use this option only if you want to overide regular expression backreferencing
> in favor of B<awk(1)> style field referencing. Included for backward 
>-compatability.
>+compatibility.
> 
> =item B<--config-file|-c> I<filename>
> 
>@@ -1213,9 +1215,17 @@
> =item B<exec command>
> 
> Execute I<command>. The I<command> may contain variables which are 
>-substituted with fields from the matched line. A I<$N> will be replaced
>-by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
>-entire line.
>+substituted with fields from the matched line. If the B<--awk-field-syntax>
>+command-line option has been specified, then each I<$N> will be replaced
>+by the I<Nth> field in the line. If the option has not been specified,
>+then each I<$N> will refer to a backreference in the regular expression
>+used to match the line.
>+
>+A I<$0> or I<$*> will always be replaced by the entire line, unless they
>+have been escaped, regardless of the B<--awk-field-syntax> option.
>+
>+An escaped I<$N>, I<$0> or I<$*> may have unwanted effects since the value
>+will be determined by the shell used to execute the command.
> 
> =item B<mail [addresses=address:address:...][,subject=your_text_here]>
>

Actions: View | Diff

Attachments on bug 1622187: 1478587