mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-12 05:34:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

osc: use new uri_parse() to parse an OSC7 PWD URI

Browse source
This commit is contained in:
Daniel Eklöf 2020-10-28 19:11:22 +01:00
parent 608cc746ad
commit cad0ae957d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 13 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

88
osc.c
View file

@ -3,8 +3,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <unistd.h>
#define LOG_MODULE "osc" #define LOG_MODULE "osc"
#define LOG_ENABLE_DBG 0 #define LOG_ENABLE_DBG 0
@ -14,6 +12,7 @@
#include "render.h" #include "render.h"
#include "selection.h" #include "selection.h"
#include "terminal.h" #include "terminal.h"
#include "uri.h"
#include "vt.h" #include "vt.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -99,7 +98,7 @@ struct clip_context {
}; };
static void static void
from_clipboard_cb(const char *text, size_t size, void *user) from_clipboard_cb(char *text, size_t size, void *user)
{ {
struct clip_context *ctx = user; struct clip_context *ctx = user;
struct terminal *term = ctx->term; struct terminal *term = ctx->term;
@ -352,87 +351,26 @@ parse_rgb(const char *string, uint32_t *color)
return true; return true;
} }
static uint8_t
nibble2hex(char c)
{
switch (c) {
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
return c - '0';
case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
return c - 'a' + 10;
case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
return c - 'A' + 10;
}
assert(false);
return 0;
}
static void static void
osc_set_pwd(struct terminal *term, char *string) osc_set_pwd(struct terminal *term, char *string)
{ {
LOG_DBG("PWD: URI: %s", string); LOG_DBG("PWD: URI: %s", string);
if (memcmp(string, "file://", 7) != 0) char *scheme, *host, *path;
return; if (!uri_parse(string, strlen(string), &scheme, NULL, NULL, &host, NULL, &path, NULL, NULL)) {
string += 7; LOG_ERR("OSC7: invalid URI: %s", string);
const char *hostname = string;
char *hostname_end = strchr(string, '/');
if (hostname_end == NULL)
return;
char this_host[HOST_NAME_MAX];
if (gethostname(this_host, sizeof(this_host)) < 0)
this_host[0] = '\0';
/* Ignore this CWD if the hostname isn't 'localhost' or our gethostname() */
size_t hostname_len = hostname_end - hostname;
if (strncmp(hostname, "", hostname_len) != 0 &&
strncmp(hostname, "localhost", hostname_len) != 0 &&
strncmp(hostname, this_host, hostname_len) != 0)
{
LOG_DBG("ignoring OSC 7: hostname mismatch: %.*s != %s",
(int)hostname_len, hostname, this_host);
return; return;
} }
/* Decode %xx encoded characters */ if (strcmp(scheme, "file") == 0 && hostname_is_localhost(host)) {
const char *path = hostname_end; LOG_DBG("OSC7: pwd: %s", path);
char *pwd = xmalloc(strlen(path) + 1); free(term->cwd);
char *p = pwd; term->cwd = path;
} else
free(path);
while (true) { free(scheme);
/* Find next '%' */ free(host);
const char *next = strchr(path, '%');
if (next == NULL) {
strcpy(p, path);
break;
}
/* Copy everything leading up to the '%' */
size_t prefix_len = next - path;
memcpy(p, path, prefix_len);
p += prefix_len;
if (isxdigit(next[1]) && isxdigit(next[2])) {
*p++ = nibble2hex(next[1]) << 4 | nibble2hex(next[2]);
*p = '\0';
path = next + 3;
} else {
*p++ = *next;
*p = '\0';
path = next + 1;
}
}
LOG_DBG("PWD: decoded: %s", pwd);
free(term->cwd);
term->cwd = pwd;
} }
#if 0 #if 0