[X2Go-Commits] [x2goserver] 09/99: x2goserver/lib/x2goupdateoptionsstring: revert for loop simplification.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit b49377763001a48f17fea028e8feac4b009fca2e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Nov 6 08:35:30 2020 +0100

    x2goserver/lib/x2goupdateoptionsstring: revert for loop simplification.
    
    We actually depend on the subtle modification of the args reference
    variable.
---
 debian/changelog                       | 3 +++
 x2goserver/bin/x2goupdateoptionsstring | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71fad52d..37369101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -195,6 +195,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       options string was missing.
     - x2goserver/lib/x2goupdateoptionsstring: move most code to
       X2Go/Server/Agent/NX/Options.pm.
+    - x2goserver/lib/x2goupdateoptionsstring: revert for loop simplification.
+      We actually depend on the subtle modification of the args reference
+      variable.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goupdateoptionsstring b/x2goserver/bin/x2goupdateoptionsstring
index c472704f..e4ebe962 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -73,7 +73,7 @@ sub sanitize_program_options {
   if (!($error_detected)) {
     $args = dclone ($args);
 
-    foreach my $cur_arg (@{$args}) {
+    for (my $cur_arg = shift (@{$args}); defined ($cur_arg); $cur_arg = shift (@{$args})) {
       if (q{-} eq substr ($cur_arg, 0, 1)) {
         # Looks like an option so far. Let's continue scanning.
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git