Improve parameters handling

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index d67d09b..57c4c22 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -256,9 +256,9 @@ char *argv0;
 void
 usage(void)
 {
-       die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
-           "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
-           "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+       die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n"
+           "[-a cookiepolicies ] [-c cookiefile] [-C stylefile] [-e xid]\n"
+           "[-r scriptfile] [-u useragent] [-z zoomlevel] [uri]\n");
 }
 
 void
@@ -636,18 +636,32 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p)
 void
 seturiparameters(Client *c, const char *uri)
 {
+       Parameter *newconfig = NULL;
        int i;
 
        for (i = 0; i < LENGTH(uriparams); ++i) {
                if (uriparams[i].uri &&
                    !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
-                       curconfig = uriparams[i].config;
+                       newconfig = uriparams[i].config;
                        break;
                }
        }
 
-       for (i = 0; i < ParameterLast; ++i)
-               setparameter(c, 0, i, &curconfig[i].val);
+       if (!newconfig)
+               newconfig = defconfig;
+       if (newconfig == curconfig)
+               return;
+
+       for (i = 0; i < ParameterLast; ++i) {
+               if (defconfig[i].force)
+                       continue;
+               if (newconfig[i].force)
+                       setparameter(c, 0, i, &newconfig[i].val);
+               else if (curconfig[i].force)
+                       setparameter(c, 0, i, &defconfig[i].val);
+       }
+
+       curconfig = newconfig;
 }
 
 void
@@ -792,14 +806,16 @@ setcert(Client *c, const char *uri)
                return;
        }
 
-       uri = strstr(uri, "://") + sizeof("://") - 1;
-       host = strndup(uri, strstr(uri, "/") - uri);
+       if ((uri = strstr(uri, "https://"))) {
+               uri += sizeof("https://") - 1;
+               host = g_strndup(uri, strchr(uri, '/') - uri);
+               webkit_web_context_allow_tls_certificate_for_host(
+                   webkit_web_view_get_context(c->view), cert, host);
+               g_free(host);
+       }
 
-       webkit_web_context_allow_tls_certificate_for_host(
-           webkit_web_view_get_context(c->view), cert, host);
        g_object_unref(cert);
 
-       free(host);
 }
 
 const char *
@@ -1330,7 +1346,7 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
        g_object_get(cert, "certificate-pem", &pem, NULL);
        html = g_strdup_printf("<p>Could not validate TLS for “%s”<br>%s</p>"
                               "<p>You can inspect the following certificate "
-                              "with Ctrl+Shift+x (default keybinding).</p>"
+                              "with Ctrl-t (default keybinding).</p>"
                               "<p><pre>%s</pre></p>", uri, errmsg->str, pem);
        g_free(pem);
        g_string_free(errmsg, TRUE);
@@ -1348,7 +1364,6 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 
        switch (e) {
        case WEBKIT_LOAD_STARTED:
-               curconfig = defconfig;
                setatom(c, AtomUri, title);
                c->title = title;
                c->https = c->insecure = 0;
@@ -1899,8 +1914,7 @@ main(int argc, char *argv[])
                fulluseragent = EARGF(usage());
                break;
        case 'v':
-               die("surf-"VERSION", ©2009-2017 surf engineers, "
-                   "see LICENSE for details\n");
+               die("surf-"VERSION", see LICENSE for © details\n");
        case 'w':
                showxid = 1;
                break;