[X2Go-Commits] [x2goserver] 57/99: x2goserver/lib/x2goupdateoptionsstring: add debug print statements for in-depth examination of program options parsing.

[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 55948b22c36c7651af236015a494e13bb6d660b3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 21 22:19:16 2020 +0100

    x2goserver/lib/x2goupdateoptionsstring: add debug print statements for in-depth examination of program options parsing.
---
 debian/changelog                       | 2 ++
 x2goserver/bin/x2goupdateoptionsstring | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d6148679..b1ef9d8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -299,6 +299,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver/lib/x2goupdateoptionsstring: fix parsing of multiple
       subsequent separating "--" pseudo-options. We just have to make sure to
       treat subsequent pseudo-options literally and to not just consume them.
+    - x2goserver/lib/x2goupdateoptionsstring: add debug print statements for
+      in-depth examination of program options parsing.
   * 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 08d8ab92..1babf755 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -176,6 +176,10 @@ sub Main {
   my $options = undef;
 
   if (!($error_detected)) {
+    if ($debug) {
+      print {*STDERR} 'Sanitized program options string as: ' . Dumper ($sanitized_options);
+    }
+
     # The shift () operations here actually shift the outer array, not the
     # inner elements.
     # This can be very confusing.
@@ -223,6 +227,7 @@ sub Main {
 
   if (!($error_detected)) {
     if ($debug) {
+      print {*STDERR} 'Sanitized program options string as: ' . Dumper ($sanitized_options);
       print {*STDERR} 'Dumping intermediate array after initial parsing: ' . Dumper ($intermediate);
     }
 
@@ -293,6 +298,9 @@ sub Main {
         $error_detected = 11;
         last;
       }
+      elsif ($debug) {
+        print {*STDERR} 'Sanitized program options string as: ' . Dumper ($sanitized_options);
+      }
 
       $found_separator |= (0 + shift (@{$sanitized_options}));
       $sanitized_options = shift (@{$sanitized_options});

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