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

client: add -s,--server-socket command line option

Browse source 
This allows the user to override the default
path (XDG_RUNTIME_DIR/foot.sock) we try to connect to.
This commit is contained in:
Daniel Eklöf 2019-12-14 13:00:48 +01:00
parent 44f24b01bc
commit c5875bf97c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

50
client.c
View file

@ -29,9 +29,11 @@ static void
print_usage(const char *prog_name) print_usage(const char *prog_name)
{ {
printf("Usage: %s [OPTIONS]...\n", prog_name); printf("Usage: %s [OPTIONS]...\n", prog_name);
printf("Usage: %s [OPTIONS]... -- command\n", prog_name);
printf("\n"); printf("\n");
printf("Options:\n"); printf("Options:\n");
printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n" printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
" -s,--server-socket=PATH path to the server UNIX domain socket (default=XDG_RUNTIME_DIR/foot.sock)\n"
" -v,--version show the version number and quit\n"); " -v,--version show the version number and quit\n");
} }
@ -43,13 +45,15 @@ main(int argc, char *const *argv)
const char *const prog_name = argv[0]; const char *const prog_name = argv[0];
static const struct option longopts[] = { static const struct option longopts[] = {
{"term", required_argument, 0, 't'}, {"term", required_argument, 0, 't'},
{"version", no_argument, 0, 'v'}, {"server-socket", required_argument, 0, 's'},
{"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'},
{NULL, no_argument, 0, 0}, {"help", no_argument, 0, 'h'},
{NULL, no_argument, 0, 0},
}; };
const char *term = ""; const char *term = "";
const char *server_socket_path = NULL;
while (true) { while (true) {
int c = getopt_long(argc, argv, ":t:hv", longopts, NULL); int c = getopt_long(argc, argv, ":t:hv", longopts, NULL);
@ -59,6 +63,9 @@ main(int argc, char *const *argv)
switch (c) { switch (c) {
case 't': case 't':
term = optarg; term = optarg;
case 's':
server_socket_path = optarg;
break; break;
case 'v': case 'v':
@ -88,23 +95,34 @@ main(int argc, char *const *argv)
goto err; goto err;
} }
bool connected = false;
struct sockaddr_un addr = {.sun_family = AF_UNIX}; struct sockaddr_un addr = {.sun_family = AF_UNIX};
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR"); if (server_socket_path != NULL) {
if (xdg_runtime != NULL) { strncpy(addr.sun_path, server_socket_path, sizeof(addr.sun_path));
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/foot.sock", xdg_runtime);
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0)
connected = true;
}
if (!connected) {
strncpy(addr.sun_path, "/tmp/foot.sock", sizeof(addr.sun_path) - 1);
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) < 0) { if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
LOG_ERRNO("failed to connect (is 'foot --server' running?)"); LOG_ERR("%s: failed to connect (is 'foot --server' running?)", server_socket_path);
goto err; goto err;
} }
} else {
bool connected = false;
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
if (xdg_runtime != NULL) {
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/foot.sock", xdg_runtime);
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0)
connected = true;
else
LOG_WARN("%s/foot.sock: failed to connect, will now try /tmp/foot.sock", xdg_runtime);
}
if (!connected) {
strncpy(addr.sun_path, "/tmp/foot.sock", sizeof(addr.sun_path) - 1);
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
LOG_ERRNO("failed to connect (is 'foot --server' running?)");
goto err;
}
}
} }
const uint16_t term_len = strlen(term) + 1; const uint16_t term_len = strlen(term) + 1;