From 4b154cdfc9ea0e656ab1e003d7da398050f954a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Sep 2017 19:13:29 +0200
Subject: lr: hyperlink_on: print hostname and use RFC3986-style URI encoding

---
 lr.c | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'lr.c')

diff --git a/lr.c b/lr.c
index daadb3f..052bc29 100644
--- a/lr.c
+++ b/lr.c
@@ -99,6 +99,7 @@ static char input_delim = '\n';
 static int current_color;
 static int status;
 static char *basepath;
+static char host[1024];
 
 static char default_ordering[] = "n";
 static char default_format[] = "%p\\n";
@@ -138,6 +139,14 @@ static int uwid, gwid, fwid;
 static time_t now;
 static mode_t default_mask;
 
+// [^a-zA-Z0-9~._/-]
+static char rfc3986[128] = {
+	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,
+	1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,
+	1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1
+};
+
 struct fileinfo {
 	char *fpath;
 	size_t prefixl;
@@ -1560,15 +1569,28 @@ color_name_on(int c, const char *f, mode_t m)
 		fg256(196);
 }
 
+static void
+print_urlquoted(unsigned char *s)
+{
+	for (; *s; s++)
+		if (*s > 127 || rfc3986[*s])
+			printf("%%%02x", *s);
+		else
+			putchar(*s);
+}
+
 static void
 hyperlink_on(char *fpath)
 {
 	// OSC 8 hyperlink format
 	if (Xflag) {
-		if (*fpath == '/')
-			printf("\033]8;;file://%s\007", fpath);
-		else
-			printf("\033]8;;file://%s/%s\007", basepath, fpath);
+		printf("\033]8;;file://%s", host);
+		if (*fpath != '/') {
+			print_urlquoted((unsigned char *)basepath);
+			putchar('/');
+		}
+		print_urlquoted((unsigned char *)fpath);
+		putchar('\007');
 	}
 }
 
@@ -2065,6 +2087,14 @@ main(int argc, char *argv[])
 			    argv0, strerror(errno));
 			Xflag = 0;
 		}
+
+		if (gethostname(host, sizeof host) == 0) {
+			// termination not posix guaranteed
+			host[sizeof host - 1] = 0;
+		} else {
+			// ignore errors, use no host
+			*host = 0;
+		}
 	}
 
 	for (i = 0; i < Cflag; i++) {
-- 
cgit 1.4.1