fix: cmpfunc prefix overlap sorting and avoid integer truncation

Author: Arpit-Gupta-CS

tests.json

@@ -764,12 +764,33 @@
         "query=user=me"
       ]
     },
+    "excludes": [
+      "uppercase-hex"
+    ],
     "expected": {
       "stdout": "https://curl.se/hello?user%3dme\n",
       "stderr": "",
       "returncode": 0
     }
   },
+  {
+    "input": {
+      "arguments": [
+        "--url",
+        "https://curl.se/hello",
+        "--set",
+        "query=user=me"
+      ]
+    },
+    "required": [
+      "uppercase-hex"
+    ],
+    "expected": {
+      "stdout": "https://curl.se/hello?user%3Dme\n",
+      "stderr": "",
+      "returncode": 0
+    }
+  },
   {
     "input": {
       "arguments": [
@@ -2183,12 +2204,37 @@
         "query:=a&b&a%26b"
       ]
     },
+    "excludes": [
+      "uppercase-hex"
+    ],
     "expected": {
       "stdout": "http://localhost/ABC%5c%5c?a&b&a%26b\n",
       "returncode": 0,
       "stderr": ""
     }
   },
+  {
+    "input": {
+      "arguments": [
+        "-s",
+        "scheme:=http",
+        "-s",
+        "host:=localhost",
+        "-s",
+        "path:=/ABC%5C%5C",
+        "-s",
+        "query:=a&b&a%26b"
+      ]
+    },
+    "required": [
+      "uppercase-hex"
+    ],
+    "expected": {
+      "stdout": "http://localhost/ABC%5C%5C?a&b&a%26b\n",
+      "returncode": 0,
+      "stderr": ""
+    }
+  },
   {
     "input": {
       "arguments": [
@@ -2891,12 +2937,32 @@
         "path=%61"
       ]
     },
+    "excludes": [
+      "uppercase-hex"
+    ],
     "expected": {
       "stdout": "https://example.com/one/tao/%2fB/%2561\n",
       "stderr": "",
       "returncode": 0
     }
   },
+  {
+    "input": {
+      "arguments": [
+        "https://example.com/one/t%61o/%2F%42/",
+        "--append",
+        "path=%61"
+      ]
+    },
+    "required": [
+      "uppercase-hex"
+    ],
+    "expected": {
+      "stdout": "https://example.com/one/tao/%2FB/%2561\n",
+      "stderr": "",
+      "returncode": 0
+    }
+  },
   {
     "input": {
       "arguments": [

trurl.c

@@ -1595,10 +1595,10 @@ static void qpair2query(CURLU *uh, struct option *o)
 /* sort case insensitively */
 static int cmpfunc(const void *p1, const void *p2)
 {
-  int i;
+  size_t i;
   size_t len1 = ((const struct string *)p1)->len;
   size_t len2 = ((const struct string *)p2)->len;
-  int len = (int)(len1 < len2 ? len1 : len2);
+  size_t len = len1 < len2 ? len1 : len2;
 
   for(i = 0; i < len; i++) {
     char c1 = ((const struct string *)p1)->str[i] | ('a' - 'A');
@@ -1607,9 +1607,7 @@ static int cmpfunc(const void *p1, const void *p2)
       return c1 - c2;
   }
 
-  if(len1 != len2)
-    return len1 < len2 ? -1 : 1;
-  return 0;
+  return (len1 > len2) - (len1 < len2);
 }
 
 static bool sortquery(struct option *o)