From 40c0a73db8f4e1b4aa52f77161893fbe69cbd72e Mon Sep 17 00:00:00 2001
From: Emanuele Torre <torreemanuele6@gmail.com>
Date: Fri, 16 Aug 2024 04:56:31 +0200
Subject: [PATCH] singleurl: fix query_is_modified

query_is_modified is global and does not get reset at every call of
singleurl() so, if a query is modified for a URL, the query for all the
following URLs is automatically considered modified.

Additionally --trim and --replace were setting query_is_modified to true
unconditionally as long as a --trim or --replace option is passed to
trurl, even if no changes were made.
Which made it effectively just a convoluted way to check if any of
--trim, --replace, --append query, --sort-query was passed.

Since singleurl() was made recursive to implement --iterate, I could not
just add  query_is_modified = false  at the start of singleurl() to fix
the problem, so I have refactored the code to not need a global.
---
 trurl.c | 64 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/trurl.c b/trurl.c
index 4a9bf9a3..626fdd4f 100644
--- a/trurl.c
+++ b/trurl.c
@@ -368,7 +368,6 @@ static void trurl_warnf(struct option *o, const char *fmt, ...)
 struct string qpairs[MAX_QPAIRS]; /* encoded */
 struct string qpairsdec[MAX_QPAIRS]; /* decoded */
 int nqpairs; /* how many is stored */
-bool query_is_modified = false;
 
 static void trurl_cleanup_options(struct option *o)
 {
@@ -1149,8 +1148,9 @@ static void json(struct option *o, CURLU *uh)
 }
 
 /* --trim query="utm_*" */
-static void trim(struct option *o)
+static bool trim(struct option *o)
 {
+  bool query_is_modified = false;
   struct curl_slist *node;
   for(node = o->trim_list; node; node = node->next) {
     char *ptr;
@@ -1178,7 +1178,7 @@ static void trim(struct option *o)
                removed. Get a copy and edit that accordingly. */
             temp = strdup(ptr);
             if(!temp)
-              return; /* out of memory, bail out */
+              return query_is_modified; /* out of memory, bail out */
             temp[inslen - 2] = '*';
             temp[inslen - 1] = '\0';
             ptr = temp;
@@ -1207,12 +1207,13 @@ static void trim(struct option *o)
           qpairs[i].len = 0;
           qpairsdec[i].str = strdup(""); /* marked as deleted */
           qpairsdec[i].len = 0;
+          query_is_modified = true;
         }
       }
       free(temp);
     }
-    query_is_modified = true;
   }
+  return query_is_modified;
 }
 
 /* memdup the amount and add a trailing zero */
@@ -1353,24 +1354,21 @@ static void extractqpairs(CURLU *uh, struct option *o)
 
 static void qpair2query(CURLU *uh, struct option *o)
 {
-  if(query_is_modified) {
-    int i;
-    char *nq = NULL;
-    for(i = 0; i<nqpairs; i++) {
-      char *oldnq = nq;
-      nq = curl_maprintf("%s%s%s", nq?nq:"",
-                         (nq && *nq && *(qpairs[i].str))? o->qsep: "",
-                         qpairs[i].str);
-      curl_free(oldnq);
-    }
-    if(nq) {
-      int rc = curl_url_set(uh, CURLUPART_QUERY, nq, 0);
-      if(rc)
-        trurl_warnf(o,
-                    "internal problem: failed to store updated query in URL");
-    }
-    curl_free(nq);
+  int i;
+  char *nq = NULL;
+  for(i = 0; i<nqpairs; i++) {
+    char *oldnq = nq;
+    nq = curl_maprintf("%s%s%s", nq ? nq : "",
+                       (nq && *nq && *(qpairs[i].str)) ? o->qsep : "",
+                       qpairs[i].str);
+    curl_free(oldnq);
+  }
+  if(nq) {
+    int rc = curl_url_set(uh, CURLUPART_QUERY, nq, 0);
+    if(rc)
+      trurl_warnf(o, "internal problem: failed to store updated query in URL");
   }
+  curl_free(nq);
 }
 
 /* sort case insensitively */
@@ -1390,18 +1388,20 @@ static int cmpfunc(const void *p1, const void *p2)
   return 0;
 }
 
-static void sortquery(struct option *o)
+static bool sortquery(struct option *o)
 {
   if(o->sort_query) {
     /* not these two lists may no longer be the same order after the sort */
     qsort(&qpairs[0], nqpairs, sizeof(struct string), cmpfunc);
     qsort(&qpairsdec[0], nqpairs, sizeof(struct string), cmpfunc);
-    query_is_modified = true;
+    return true;
   }
+  return false;
 }
 
-static void replace(struct option *o)
+static bool replace(struct option *o)
 {
+  bool query_is_modified = false;
   struct curl_slist *node;
   for(node = o->replace_list; node; node = node->next) {
     struct string key;
@@ -1443,7 +1443,7 @@ static void replace(struct option *o)
       qpairsdec[i].str = pdec->str;
       free(pdec);
       free(p);
-      replaced = true;
+      query_is_modified = replaced = true;
     }
 
     if(!replaced && o->force_replace) {
@@ -1451,9 +1451,10 @@ static void replace(struct option *o)
                   (int) (key.len),
                   key.str);
       addqpair(key.str, strlen(key.str), o->jsonout);
+      query_is_modified = true;
     }
-    query_is_modified = true;
   }
+  return query_is_modified;
 }
 
 static CURLUcode seturl(struct option *o, CURLU *uh, const char *url)
@@ -1499,6 +1500,7 @@ static void singleurl(struct option *o,
   do {
     struct curl_slist *p;
     bool url_is_invalid = false;
+    bool query_is_modified = false;
     unsigned setmask = 0;
 
     /* set everything */
@@ -1609,10 +1611,10 @@ static void singleurl(struct option *o,
     extractqpairs(uh, o);
 
     /* trim parts */
-    trim(o);
+    query_is_modified |= trim(o);
 
     /* replace parts */
-    replace(o);
+    query_is_modified |= replace(o);
 
     if(first_lap) {
       /* append query segments */
@@ -1622,10 +1624,12 @@ static void singleurl(struct option *o,
       }
     }
 
-    sortquery(o);
+    /* sort query */
+    query_is_modified |= sortquery(o);
 
     /* put the query back */
-    qpair2query(uh, o);
+    if(query_is_modified)
+      qpair2query(uh, o);
 
     /* make sure the URL is still valid */
     if(!url || o->redirect || o->set_list || o->append_path) {