Utility for making absolute URLs

3 files changed, 60 insertions, 59 deletions

diff --git a/src/gmutil.c b/src/gmutil.c
index 1a8d469f..af090574 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -32,6 +32,59 @@ void init_Url(iUrl *d, const iString *text) {
     iRelease(absPat);
 }
 
+static iRangecc dirPath_(iRangecc path) {
+    const size_t pos = lastIndexOfCStr_Rangecc(&path, "/");
+    if (pos == iInvalidPos) return path;
+    return (iRangecc){ path.start, path.start + pos };
+}
+
+const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelative) {
+    if (indexOfCStr_String(urlMaybeRelative, "://") != iInvalidPos) {
+        /* Already absolute. */
+        return urlMaybeRelative;
+    }
+    iUrl parts;
+    init_Url(&parts, d);
+    iString *absolute = new_String();
+    appendRange_String(absolute, parts.protocol);
+    appendCStr_String(absolute, "://");
+    appendRange_String(absolute, parts.host);
+    if (!isEmpty_Range(&parts.port)) {
+        appendCStr_String(absolute, ":");
+        appendRange_String(absolute, parts.port);
+    }
+    if (startsWith_String(urlMaybeRelative, "/")) {
+        append_String(absolute, urlMaybeRelative);
+    }
+    else {
+        iRangecc relPath = range_String(urlMaybeRelative);
+        iRangecc dir = dirPath_(parts.path);
+        for (;;) {
+            if (equal_Rangecc(&relPath, ".")) {
+                relPath.start++;
+            }
+            else if (startsWith_Rangecc(&relPath, "./")) {
+                relPath.start += 2;
+            }
+            else if (equal_Rangecc(&relPath, "..")) {
+                relPath.start += 2;
+                dir = dirPath_(dir);
+            }
+            else if (startsWith_Rangecc(&relPath, "../")) {
+                relPath.start += 3;
+                dir = dirPath_(dir);
+            }
+            else break;
+        }
+        appendRange_String(absolute, dir);
+        if (!endsWith_String(absolute, "/")) {
+            appendCStr_String(absolute, "/");
+        }
+        appendRange_String(absolute, relPath);
+    }
+    return collect_String(absolute);
+}
+
 void urlEncodeSpaces_String(iString *d) {
     for (;;) {
         const size_t pos = indexOfCStr_String(d, " ");
diff --git a/src/gmutil.h b/src/gmutil.h
index 41711af7..4a1fdee9 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -13,6 +13,7 @@ struct Impl_Url {
     iRangecc query;
 };
 
-void    init_Url    (iUrl *, const iString *text);
+void            init_Url                (iUrl *, const iString *text);
 
-void    urlEncodeSpaces_String  (iString *);
+const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
+void            urlEncodeSpaces_String  (iString *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 52628143..07761aa7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -409,59 +409,6 @@ static void scrollTo_DocumentWidget_(iDocumentWidget *d, int documentY) {
     scroll_DocumentWidget_(d, 0); /* clamp it */
 }
 
-static iRangecc dirPath_(iRangecc path) {
-    const size_t pos = lastIndexOfCStr_Rangecc(&path, "/");
-    if (pos == iInvalidPos) return path;
-    return (iRangecc){ path.start, path.start + pos };
-}
-
-static const iString *absoluteUrl_DocumentWidget_(const iDocumentWidget *d, const iString *url) {
-    if (indexOfCStr_String(url, "://") != iInvalidPos) {
-        /* Already absolute. */
-        return url;
-    }
-    iUrl parts;
-    init_Url(&parts, d->url);
-    iString *absolute = new_String();
-    appendRange_String(absolute, parts.protocol);
-    appendCStr_String(absolute, "://");
-    appendRange_String(absolute, parts.host);
-    if (!isEmpty_Range(&parts.port)) {
-        appendCStr_String(absolute, ":");
-        appendRange_String(absolute, parts.port);
-    }
-    if (startsWith_String(url, "/")) {
-        append_String(absolute, url);
-    }
-    else {
-        iRangecc relPath = range_String(url);
-        iRangecc dir = dirPath_(parts.path);
-        for (;;) {
-            if (equal_Rangecc(&relPath, ".")) {
-                relPath.start++;
-            }
-            else if (startsWith_Rangecc(&relPath, "./")) {
-                relPath.start += 2;
-            }
-            else if (equal_Rangecc(&relPath, "..")) {
-                relPath.start += 2;
-                dir = dirPath_(dir);
-            }
-            else if (startsWith_Rangecc(&relPath, "../")) {
-                relPath.start += 3;
-                dir = dirPath_(dir);
-            }
-            else break;
-        }
-        appendRange_String(absolute, dir);
-        if (!endsWith_String(absolute, "/")) {
-            appendCStr_String(absolute, "/");
-        }
-        appendRange_String(absolute, relPath);
-    }
-    return collect_String(absolute);
-}
-
 static void checkResponseCode_DocumentWidget_(iDocumentWidget *d) {
     if (!d->request) {
         return;
@@ -542,7 +489,7 @@ static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId)
         pushBack_ObjectList(
             d->media,
             iClob(new_MediaRequest(
-                d, linkId, absoluteUrl_DocumentWidget_(d, linkUrl_GmDocument(d->doc, linkId)))));
+                d, linkId, absoluteUrl_String(d->url, linkUrl_GmDocument(d->doc, linkId)))));
         return iTrue;
     }
     return iFalse;
@@ -605,7 +552,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
     else if (isCommand_Widget(w, ev, "document.copylink")) {
         if (d->hoverLink) {
             SDL_SetClipboardText(cstr_String(
-                absoluteUrl_DocumentWidget_(d, linkUrl_GmDocument(d->doc, d->hoverLink->linkId))));
+                absoluteUrl_String(d->url, linkUrl_GmDocument(d->doc, d->hoverLink->linkId))));
         }
         else {
             SDL_SetClipboardText(cstr_String(d->url));
@@ -820,8 +767,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     }
                     else {
                         postCommandf_App("open url:%s",
-                                         cstr_String(absoluteUrl_DocumentWidget_(
-                                             d, linkUrl_GmDocument(d->doc, linkId))));
+                                         cstr_String(absoluteUrl_String(
+                                             d->url, linkUrl_GmDocument(d->doc, linkId))));
                     }
                 }
                 if (d->selectMark.start) {