From: Wayne Davison <wayned@samba.org>
Date: Thu, 8 Jan 2009 00:38:56 +0000 (-0800)
Subject: Avoid a server-side problem with -e is at the start of the short options.
X-Git-Tag: v3.0.6pre1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f51d0e84930558c4117cd3070dcca80c9bdd54f;p=thirdparty%2Frsync.git

Avoid a server-side problem with -e is at the start of the short options.
(Bug #6020)
---

diff --git a/support/rrsync b/support/rrsync
index 26826319..0d138f17 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -143,7 +143,8 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
     if ($_ eq '.') {
       $in_options = 0;
     } else {
-      next if /^-$short_no_arg+(e\d*\.\w*)?$/o || /^-$short_with_num\d+$/o;
+      die "$0: invalid option: '-'\n" if $_ eq '-';
+      next if /^-$short_no_arg*(e\d*\.\w*)?$/o || /^-$short_with_num\d+$/o;
 
       my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
       my $disabled;