X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=9f0c8a16446ffcb68243a4f6fbe94bd3b97e7e37;hb=5c527339842fdd06411eaf25547aef0902f96915;hp=e08bfe5468969c51a6289a027e5426df46bf571c;hpb=27cec484084f37e01cadcdf7ea92c64de71e0b34;p=surf.git

diff --git a/surf.c b/surf.c
index e08bfe5..9f0c8a1 100644
--- a/surf.c
+++ b/surf.c
@@ -246,8 +246,8 @@ char *argv0;
 void
 usage(void)
 {
-	die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
-	    "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
+	die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+	    "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
 	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
 
@@ -817,7 +817,7 @@ newwindow(Client *c, const Arg *a, int noembed)
 {
 	int i = 0;
 	char tmp[64];
-	const char *cmd[26], *uri;
+	const char *cmd[28], *uri;
 	const Arg arg = { .v = cmd };
 
 	cmd[i++] = argv0;
@@ -828,6 +828,10 @@ newwindow(Client *c, const Arg *a, int noembed)
 		cmd[i++] = "-c";
 		cmd[i++] = cookiefile;
 	}
+	if (stylefile && g_strcmp0(stylefile, "")) {
+		cmd[i++] = "-C";
+		cmd[i++] = stylefile;
+	}
 	cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
 	if (embed && !noembed) {
 		cmd[i++] = "-e";
@@ -846,10 +850,7 @@ newwindow(Client *c, const Arg *a, int noembed)
 		cmd[i++] = scriptfile;
 	}
 	cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
-	if (stylefile && g_strcmp0(stylefile, "")) {
-		cmd[i++] = "-t";
-		cmd[i++] = stylefile;
-	}
+	cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
 	if (fulluseragent && g_strcmp0(fulluseragent, "")) {
 		cmd[i++] = "-u";
 		cmd[i++] = fulluseragent;
@@ -1743,11 +1744,17 @@ main(int argc, char *argv[])
 	case 'S':
 		defconfig CSETB(JavaScript, 1);
 		break;
+	case 't':
+		defconfig CSETB(StrictTLS, 0);
+		break;
+	case 'T':
+		defconfig CSETB(StrictTLS, 1);
+		break;
 	case 'u':
 		fulluseragent = EARGF(usage());
 		break;
 	case 'v':
-		die("surf-"VERSION", ©2009-2015 surf engineers, "
+		die("surf-"VERSION", ©2009-2017 surf engineers, "
 		    "see LICENSE for details\n");
 	case 'x':
 		showxid = 1;