From d525e28c2028ce5aa232813384e550fd18bf7e12 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 5 May 2024 17:48:44 -0400
Subject: [PATCH] Show original user input in debug message

Also add comments explaining the purpose of the lines, because it's
not immediately clear.
---
 ddclient.in | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ddclient.in b/ddclient.in
index c63155b..07c55af 100755
--- a/ddclient.in
+++ b/ddclient.in
@@ -2803,14 +2803,15 @@ sub get_ip {
         $reply = '';
 
     } else {
-        $url = opt('fw', $h) // '';
+        # Note that --use=firewallname uses --fw=arg, not --firewallname=arg.
+        $arg = opt('fw', $h) // '';
+        $url = $arg;
         $skip = opt('fw-skip', $h) // '';
 
         if (exists $builtinfw{$use}) {
             $skip = $builtinfw{$use}->{'skip'} unless $skip;
             $url  = "http://${url}" . $builtinfw{$use}->{'url'} unless $url =~ /\//;
         }
-        $arg = $url;
 
         if ($url) {
             $reply = geturl(
@@ -3234,14 +3235,15 @@ sub get_ipv4 {
             if (!defined(opt('fwv4', $h)) && defined(opt('fw', $h)));
         warning("'--fw-skip' is deprecated for '--usev4=$usev4'; use '--fwv4-skip' instead")
             if (!defined(opt('fwv4-skip', $h)) && defined(opt('fw-skip', $h)));
-        $url  = opt('fwv4', $h) // opt('fw', $h) // '';
+        # Note that --usev4=firewallname uses --fwv4=arg (or --fw=arg), not --firewallname=arg.
+        $arg = opt('fwv4', $h) // opt('fw', $h) // '';
+        $url = $arg;
         $skip = opt('fwv4-skip', $h) // opt('fw-skip', $h) // '';
 
         if (exists $builtinfw{$usev4}) {
             $skip = $builtinfw{$usev4}->{'skip'} unless $skip;
             $url  = "http://${url}" . $builtinfw{$usev4}->{'url'} unless $url =~ /\//;
         }
-        $arg = $url;
         if ($url) {
             $reply = geturl(
                 url => $url,