2019-11-01 20:39:34 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <getopt.h>
|
|
|
|
|
#include <signal.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
|
|
#include <sys/socket.h>
|
2021-01-19 14:34:30 +00:00
|
|
|
#include <sys/un.h>
|
2021-02-13 10:48:58 +01:00
|
|
|
#include <sys/stat.h>
|
2019-11-01 20:39:34 +01:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
#include <tllist.h>
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
#define LOG_MODULE "foot-client"
|
2019-11-02 00:01:08 +01:00
|
|
|
#define LOG_ENABLE_DBG 0
|
2019-11-01 20:39:34 +01:00
|
|
|
#include "log.h"
|
2020-11-21 20:21:18 +01:00
|
|
|
#include "client-protocol.h"
|
2021-01-15 20:39:45 +00:00
|
|
|
#include "debug.h"
|
2020-12-04 18:57:49 +01:00
|
|
|
#include "foot-features.h"
|
2021-02-11 11:08:18 +00:00
|
|
|
#include "macros.h"
|
2021-02-09 21:07:30 +01:00
|
|
|
#include "util.h"
|
2019-11-01 20:39:34 +01:00
|
|
|
#include "version.h"
|
2020-08-08 20:34:30 +01:00
|
|
|
#include "xmalloc.h"
|
2019-11-01 20:39:34 +01:00
|
|
|
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
struct override {
|
|
|
|
|
size_t len;
|
|
|
|
|
char *str;
|
|
|
|
|
};
|
|
|
|
|
typedef tll(struct override) override_list_t;
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
static volatile sig_atomic_t aborted = 0;
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
sig_handler(int signo)
|
|
|
|
|
{
|
|
|
|
|
aborted = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-04 18:57:49 +01:00
|
|
|
static const char *
|
|
|
|
|
version_and_features(void)
|
|
|
|
|
{
|
|
|
|
|
static char buf[256];
|
2021-06-24 17:50:44 +02:00
|
|
|
snprintf(buf, sizeof(buf), "version: %s %cpgo %cime %cgraphemes",
|
2021-03-26 20:30:13 +01:00
|
|
|
FOOT_VERSION,
|
2021-06-24 17:50:44 +02:00
|
|
|
feature_pgo() ? '+' : '-',
|
2021-03-26 20:30:13 +01:00
|
|
|
feature_ime() ? '+' : '-',
|
2021-06-24 17:50:44 +02:00
|
|
|
feature_graphemes() ? '+' : '-');
|
2020-12-04 18:57:49 +01:00
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
static void
|
|
|
|
|
print_usage(const char *prog_name)
|
|
|
|
|
{
|
2021-03-12 21:53:11 +01:00
|
|
|
printf("Usage: %s [OPTIONS...]\n", prog_name);
|
|
|
|
|
printf("Usage: %s [OPTIONS...] command [ARGS...]\n", prog_name);
|
2019-11-01 20:39:34 +01:00
|
|
|
printf("\n");
|
|
|
|
|
printf("Options:\n");
|
2021-06-26 22:15:09 +01:00
|
|
|
printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
|
|
|
|
|
" -T,--title=TITLE initial window title (foot)\n"
|
|
|
|
|
" -a,--app-id=ID window application ID (foot)\n"
|
|
|
|
|
" -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n"
|
|
|
|
|
" -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n"
|
|
|
|
|
" -m,--maximized start in maximized mode\n"
|
|
|
|
|
" -F,--fullscreen start in fullscreen mode\n"
|
|
|
|
|
" -L,--login-shell start shell as a login shell\n"
|
|
|
|
|
" -D,--working-directory=DIR directory to start in (CWD)\n"
|
|
|
|
|
" -s,--server-socket=PATH path to the server UNIX domain socket (default=$XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock)\n"
|
|
|
|
|
" -H,--hold remain open after child process exits\n"
|
|
|
|
|
" -N,--no-wait detach the client process from the running terminal, exiting immediately\n"
|
|
|
|
|
" -o,--override=[section.]key=value override configuration option\n"
|
|
|
|
|
" -d,--log-level={info|warning|error|none} log level (info)\n"
|
|
|
|
|
" -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n"
|
|
|
|
|
" -v,--version show the version number and quit\n");
|
2019-11-01 20:39:34 +01:00
|
|
|
}
|
|
|
|
|
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
static bool NOINLINE
|
|
|
|
|
push_override(override_list_t *overrides, const char *s, uint64_t *total_len)
|
|
|
|
|
{
|
|
|
|
|
size_t len = strlen(s) + 1;
|
|
|
|
|
if (len >= 1 << (8 * sizeof(struct client_string))) {
|
|
|
|
|
LOG_ERR("override length overflow");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct override o = {len, xstrdup(s)};
|
|
|
|
|
tll_push_back(*overrides, o);
|
|
|
|
|
*total_len += sizeof(struct client_string) + o.len;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
int
|
|
|
|
|
main(int argc, char *const *argv)
|
|
|
|
|
{
|
2021-04-30 22:47:16 +02:00
|
|
|
/* Custom exit code, to enable users to differentiate between foot
|
|
|
|
|
* itself failing, and the client application failiing */
|
2021-05-01 10:46:40 +02:00
|
|
|
static const int foot_exit_failure = -36;
|
2021-04-30 22:47:16 +02:00
|
|
|
int ret = foot_exit_failure;
|
2019-11-01 20:39:34 +01:00
|
|
|
|
|
|
|
|
const char *const prog_name = argv[0];
|
|
|
|
|
|
2019-11-01 20:50:00 +01:00
|
|
|
static const struct option longopts[] = {
|
2020-11-22 00:12:23 +00:00
|
|
|
{"term", required_argument, NULL, 't'},
|
|
|
|
|
{"title", required_argument, NULL, 'T'},
|
|
|
|
|
{"app-id", required_argument, NULL, 'a'},
|
|
|
|
|
{"window-size-pixels", required_argument, NULL, 'w'},
|
|
|
|
|
{"window-size-chars", required_argument, NULL, 'W'},
|
|
|
|
|
{"maximized", no_argument, NULL, 'm'},
|
|
|
|
|
{"fullscreen", no_argument, NULL, 'F'},
|
|
|
|
|
{"login-shell", no_argument, NULL, 'L'},
|
2021-02-12 09:39:44 +01:00
|
|
|
{"working-directory", required_argument, NULL, 'D'},
|
2020-11-22 00:12:23 +00:00
|
|
|
{"server-socket", required_argument, NULL, 's'},
|
|
|
|
|
{"hold", no_argument, NULL, 'H'},
|
2021-03-12 20:46:55 -03:00
|
|
|
{"no-wait", no_argument, NULL, 'N'},
|
2021-06-23 14:34:36 +02:00
|
|
|
{"override", required_argument, NULL, 'o'},
|
2021-02-09 21:07:30 +01:00
|
|
|
{"log-level", required_argument, NULL, 'd'},
|
2020-11-22 00:12:23 +00:00
|
|
|
{"log-colorize", optional_argument, NULL, 'l'},
|
|
|
|
|
{"version", no_argument, NULL, 'v'},
|
|
|
|
|
{"help", no_argument, NULL, 'h'},
|
|
|
|
|
{NULL, no_argument, NULL, 0},
|
2019-11-01 20:50:00 +01:00
|
|
|
};
|
|
|
|
|
|
2021-02-12 09:39:44 +01:00
|
|
|
const char *custom_cwd = NULL;
|
2019-12-14 13:00:48 +01:00
|
|
|
const char *server_socket_path = NULL;
|
2021-02-09 21:07:30 +01:00
|
|
|
enum log_class log_level = LOG_CLASS_INFO;
|
2020-02-05 19:54:16 +01:00
|
|
|
enum log_colorize log_colorize = LOG_COLORIZE_AUTO;
|
2020-05-26 20:11:38 +02:00
|
|
|
bool hold = false;
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
|
|
|
|
|
/* Used to format overrides */
|
2021-03-12 20:46:55 -03:00
|
|
|
bool no_wait = false;
|
2019-11-01 21:10:47 +01:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
char buf[1024];
|
|
|
|
|
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
/* Total packet length, not (yet) including overrides or argv[] */
|
|
|
|
|
uint64_t total_len = 0;
|
|
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
/* malloc:ed and needs to be in scope of all goto's */
|
2021-06-23 15:32:03 +02:00
|
|
|
int fd = -1;
|
2021-06-23 14:22:18 +02:00
|
|
|
char *_cwd = NULL;
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
override_list_t overrides = tll_init();
|
2021-06-23 14:22:18 +02:00
|
|
|
struct client_string *cargv = NULL;
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
while (true) {
|
2021-06-23 14:34:36 +02:00
|
|
|
int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:HNo:d:l::vh", longopts, NULL);
|
2019-11-01 20:39:34 +01:00
|
|
|
if (c == -1)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
switch (c) {
|
2019-11-01 21:10:47 +01:00
|
|
|
case 't':
|
2021-06-23 14:22:18 +02:00
|
|
|
snprintf(buf, sizeof(buf), "term=%s", optarg);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, buf, &total_len))
|
|
|
|
|
goto err;
|
2019-12-14 13:07:33 +01:00
|
|
|
break;
|
2019-12-14 13:00:48 +01:00
|
|
|
|
2020-04-01 19:59:47 +02:00
|
|
|
case 'T':
|
2021-06-23 14:22:18 +02:00
|
|
|
snprintf(buf, sizeof(buf), "title=%s", optarg);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, buf, &total_len))
|
|
|
|
|
goto err;
|
2020-04-01 19:59:47 +02:00
|
|
|
break;
|
|
|
|
|
|
2020-04-01 18:40:51 +02:00
|
|
|
case 'a':
|
2021-06-23 14:22:18 +02:00
|
|
|
snprintf(buf, sizeof(buf), "app-id=%s", optarg);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, buf, &total_len))
|
|
|
|
|
goto err;
|
2020-04-01 18:40:51 +02:00
|
|
|
break;
|
|
|
|
|
|
2020-02-20 18:34:51 +01:00
|
|
|
case 'L':
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, "login-shell=yes", &total_len))
|
|
|
|
|
goto err;
|
2020-02-20 18:34:51 +01:00
|
|
|
break;
|
|
|
|
|
|
2021-02-13 10:48:58 +01:00
|
|
|
case 'D': {
|
|
|
|
|
struct stat st;
|
|
|
|
|
if (stat(optarg, &st) < 0 || !(st.st_mode & S_IFDIR)) {
|
|
|
|
|
fprintf(stderr, "error: %s: not a directory\n", optarg);
|
2021-06-23 14:22:18 +02:00
|
|
|
goto err;
|
2021-02-13 10:48:58 +01:00
|
|
|
}
|
2021-02-12 09:39:44 +01:00
|
|
|
custom_cwd = optarg;
|
|
|
|
|
break;
|
2021-02-13 10:48:58 +01:00
|
|
|
}
|
2021-02-12 09:39:44 +01:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
case 'w': {
|
|
|
|
|
unsigned width, height;
|
2020-11-22 00:12:23 +00:00
|
|
|
if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) {
|
|
|
|
|
fprintf(stderr, "error: invalid window-size-pixels: %s\n", optarg);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
goto err;
|
2020-11-22 00:12:23 +00:00
|
|
|
}
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
snprintf(buf, sizeof(buf), "initial-window-size-pixels=%ux%u", width, height);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, buf, &total_len))
|
|
|
|
|
goto err;
|
2020-11-22 00:12:23 +00:00
|
|
|
break;
|
2021-06-23 14:22:18 +02:00
|
|
|
}
|
2020-11-22 00:12:23 +00:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
case 'W': {
|
|
|
|
|
unsigned width, height;
|
2020-11-22 00:12:23 +00:00
|
|
|
if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) {
|
|
|
|
|
fprintf(stderr, "error: invalid window-size-chars: %s\n", optarg);
|
2021-06-23 14:22:18 +02:00
|
|
|
goto err;
|
2020-11-22 00:12:23 +00:00
|
|
|
}
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
snprintf(buf, sizeof(buf), "initial-window-size-chars=%ux%u", width, height);
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, buf, &total_len))
|
|
|
|
|
goto err;
|
2020-11-22 00:12:23 +00:00
|
|
|
break;
|
2021-06-23 14:22:18 +02:00
|
|
|
}
|
2020-11-22 00:12:23 +00:00
|
|
|
|
2020-11-22 16:40:15 +00:00
|
|
|
case 'm':
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, "initial-window-mode=maximized", &total_len))
|
|
|
|
|
goto err;
|
2020-03-27 21:14:49 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'F':
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, "initial-window-mode=fullscreen", &total_len))
|
|
|
|
|
goto err;
|
2020-03-27 21:14:49 +01:00
|
|
|
break;
|
|
|
|
|
|
2019-12-14 13:00:48 +01:00
|
|
|
case 's':
|
|
|
|
|
server_socket_path = optarg;
|
2019-11-01 21:10:47 +01:00
|
|
|
break;
|
|
|
|
|
|
2020-05-26 20:11:38 +02:00
|
|
|
case 'H':
|
|
|
|
|
hold = true;
|
|
|
|
|
break;
|
|
|
|
|
|
2021-03-12 20:46:55 -03:00
|
|
|
case 'N':
|
|
|
|
|
no_wait = true;
|
|
|
|
|
break;
|
|
|
|
|
|
2021-06-23 14:34:36 +02:00
|
|
|
case 'o':
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
if (!push_override(&overrides, optarg, &total_len))
|
|
|
|
|
goto err;
|
2021-06-23 14:34:36 +02:00
|
|
|
break;
|
|
|
|
|
|
2021-02-09 21:07:30 +01:00
|
|
|
case 'd': {
|
2021-02-11 11:08:18 +00:00
|
|
|
int lvl = log_level_from_string(optarg);
|
|
|
|
|
if (unlikely(lvl < 0)) {
|
2021-02-09 21:07:30 +01:00
|
|
|
fprintf(
|
2021-02-11 11:08:18 +00:00
|
|
|
stderr,
|
|
|
|
|
"-d,--log-level: %s: argument must be one of %s\n",
|
|
|
|
|
optarg,
|
|
|
|
|
log_level_string_hint());
|
2021-06-23 14:22:18 +02:00
|
|
|
goto err;
|
2021-02-09 21:07:30 +01:00
|
|
|
}
|
2021-02-11 11:08:18 +00:00
|
|
|
log_level = lvl;
|
2021-02-09 21:07:30 +01:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-05 19:54:16 +01:00
|
|
|
case 'l':
|
|
|
|
|
if (optarg == NULL || strcmp(optarg, "auto") == 0)
|
|
|
|
|
log_colorize = LOG_COLORIZE_AUTO;
|
|
|
|
|
else if (strcmp(optarg, "never") == 0)
|
|
|
|
|
log_colorize = LOG_COLORIZE_NEVER;
|
|
|
|
|
else if (strcmp(optarg, "always") == 0)
|
|
|
|
|
log_colorize = LOG_COLORIZE_ALWAYS;
|
|
|
|
|
else {
|
|
|
|
|
fprintf(stderr, "%s: argument must be one of 'never', 'always' or 'auto'\n", optarg);
|
2021-06-23 14:22:18 +02:00
|
|
|
goto err;
|
2020-02-05 19:54:16 +01:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2019-11-01 20:39:34 +01:00
|
|
|
case 'v':
|
2020-12-04 18:57:49 +01:00
|
|
|
printf("footclient %s\n", version_and_features());
|
2021-06-23 14:22:18 +02:00
|
|
|
ret = EXIT_SUCCESS;
|
|
|
|
|
goto err;
|
2019-11-01 20:39:34 +01:00
|
|
|
|
|
|
|
|
case 'h':
|
|
|
|
|
print_usage(prog_name);
|
2021-06-23 14:22:18 +02:00
|
|
|
ret = EXIT_SUCCESS;
|
|
|
|
|
goto err;
|
2019-11-01 20:39:34 +01:00
|
|
|
|
|
|
|
|
case '?':
|
2021-06-23 14:22:18 +02:00
|
|
|
goto err;
|
2019-11-01 20:39:34 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
argc -= optind;
|
|
|
|
|
argv += optind;
|
|
|
|
|
|
2021-02-09 21:07:30 +01:00
|
|
|
log_init(log_colorize, false, LOG_FACILITY_USER, log_level);
|
2020-02-05 19:54:16 +01:00
|
|
|
|
2021-06-23 15:32:03 +02:00
|
|
|
fd = socket(AF_UNIX, SOCK_STREAM, 0);
|
2019-11-01 20:39:34 +01:00
|
|
|
if (fd == -1) {
|
|
|
|
|
LOG_ERRNO("failed to create socket");
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sockaddr_un addr = {.sun_family = AF_UNIX};
|
|
|
|
|
|
2019-12-14 13:00:48 +01:00
|
|
|
if (server_socket_path != NULL) {
|
2019-12-14 13:14:24 +01:00
|
|
|
strncpy(addr.sun_path, server_socket_path, sizeof(addr.sun_path) - 1);
|
2019-11-01 20:39:34 +01:00
|
|
|
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
|
2019-12-14 13:00:48 +01:00
|
|
|
LOG_ERR("%s: failed to connect (is 'foot --server' running?)", server_socket_path);
|
2019-11-01 20:39:34 +01:00
|
|
|
goto err;
|
|
|
|
|
}
|
2019-12-14 13:00:48 +01:00
|
|
|
} else {
|
|
|
|
|
bool connected = false;
|
|
|
|
|
|
|
|
|
|
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
|
|
|
|
|
if (xdg_runtime != NULL) {
|
2020-08-02 13:10:31 +02:00
|
|
|
const char *wayland_display = getenv("WAYLAND_DISPLAY");
|
|
|
|
|
if (wayland_display != NULL)
|
|
|
|
|
snprintf(addr.sun_path, sizeof(addr.sun_path),
|
|
|
|
|
"%s/foot-%s.sock", xdg_runtime, wayland_display);
|
|
|
|
|
else
|
|
|
|
|
snprintf(addr.sun_path, sizeof(addr.sun_path),
|
|
|
|
|
"%s/foot.sock", xdg_runtime);
|
2019-12-14 13:00:48 +01:00
|
|
|
|
|
|
|
|
if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0)
|
|
|
|
|
connected = true;
|
|
|
|
|
else
|
2020-03-10 18:02:57 +01:00
|
|
|
LOG_WARN("%s: failed to connect, will now try /tmp/foot.sock", addr.sun_path);
|
2019-12-14 13:00:48 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-11-01 20:39:34 +01:00
|
|
|
}
|
|
|
|
|
|
2021-02-12 09:39:44 +01:00
|
|
|
const char *cwd = custom_cwd;
|
|
|
|
|
if (cwd == NULL) {
|
2020-02-20 18:45:42 +01:00
|
|
|
errno = 0;
|
|
|
|
|
size_t buf_len = 1024;
|
|
|
|
|
do {
|
2021-02-12 09:39:44 +01:00
|
|
|
_cwd = xrealloc(_cwd, buf_len);
|
|
|
|
|
if (getcwd(_cwd, buf_len) == NULL && errno != ERANGE) {
|
2020-02-20 18:45:42 +01:00
|
|
|
LOG_ERRNO("failed to get current working directory");
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
buf_len *= 2;
|
|
|
|
|
} while (errno == ERANGE);
|
2021-02-12 09:39:44 +01:00
|
|
|
cwd = _cwd;
|
2020-02-20 18:45:42 +01:00
|
|
|
}
|
2019-11-05 10:08:30 +01:00
|
|
|
|
2020-11-21 20:21:18 +01:00
|
|
|
/* String lengths, including NULL terminator */
|
|
|
|
|
const size_t cwd_len = strlen(cwd) + 1;
|
2021-06-23 14:22:18 +02:00
|
|
|
const size_t override_count = tll_length(overrides);
|
2020-11-21 20:21:18 +01:00
|
|
|
|
|
|
|
|
const struct client_data data = {
|
|
|
|
|
.hold = hold,
|
2021-03-12 20:46:55 -03:00
|
|
|
.no_wait = no_wait,
|
2020-11-21 20:21:18 +01:00
|
|
|
.cwd_len = cwd_len,
|
2021-06-23 14:22:18 +02:00
|
|
|
.override_count = override_count,
|
2020-11-21 20:21:18 +01:00
|
|
|
.argc = argc,
|
|
|
|
|
};
|
2019-11-05 10:08:30 +01:00
|
|
|
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
/* Total packet length, not (yet) including argv[] */
|
|
|
|
|
total_len += sizeof(data) + cwd_len;
|
2019-12-21 19:56:37 +01:00
|
|
|
|
2020-11-21 20:21:18 +01:00
|
|
|
/* Add argv[] size to total packet length */
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
cargv = xmalloc(argc * sizeof(cargv[0]));
|
2020-11-21 20:21:18 +01:00
|
|
|
for (size_t i = 0; i < argc; i++) {
|
|
|
|
|
const size_t arg_len = strlen(argv[i]) + 1;
|
|
|
|
|
|
|
|
|
|
if (arg_len >= 1 << (8 * sizeof(cargv[i].len))) {
|
|
|
|
|
LOG_ERR("argv length overflow");
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cargv[i].len = arg_len;
|
|
|
|
|
total_len += sizeof(cargv[i]) + cargv[i].len;
|
2019-11-01 21:10:47 +01:00
|
|
|
}
|
|
|
|
|
|
2020-11-21 20:21:18 +01:00
|
|
|
/* Check for size overflows */
|
|
|
|
|
if (total_len >= 1llu << (8 * sizeof(uint32_t)) ||
|
|
|
|
|
cwd_len >= 1 << (8 * sizeof(data.cwd_len)) ||
|
2021-06-23 14:22:18 +02:00
|
|
|
override_count > (size_t)(unsigned int)data.override_count ||
|
2020-11-21 20:29:47 +01:00
|
|
|
argc > (int)(unsigned int)data.argc)
|
2020-04-01 19:59:47 +02:00
|
|
|
{
|
2020-11-21 20:21:18 +01:00
|
|
|
LOG_ERR("size overflow");
|
2020-04-01 19:59:47 +02:00
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-21 20:21:18 +01:00
|
|
|
/* Send everything except argv[] */
|
|
|
|
|
if (send(fd, &(uint32_t){total_len}, sizeof(uint32_t), 0) != sizeof(uint32_t) ||
|
|
|
|
|
send(fd, &data, sizeof(data), 0) != sizeof(data) ||
|
2021-06-23 14:22:18 +02:00
|
|
|
send(fd, cwd, cwd_len, 0) != cwd_len)
|
2020-04-01 18:40:51 +02:00
|
|
|
{
|
2020-11-21 20:21:18 +01:00
|
|
|
LOG_ERRNO("failed to send setup packet to server");
|
2020-03-27 21:14:49 +01:00
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-23 14:22:18 +02:00
|
|
|
/* Send overrides */
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
tll_foreach(overrides, it) {
|
|
|
|
|
const struct override *o = &it->item;
|
|
|
|
|
struct client_string s = {o->len};
|
|
|
|
|
if (send(fd, &s, sizeof(s), 0) != sizeof(s) ||
|
|
|
|
|
send(fd, o->str, o->len, 0) != o->len)
|
|
|
|
|
{
|
|
|
|
|
LOG_ERRNO("failed to send setup packet (overrides) to server");
|
|
|
|
|
goto err;
|
2021-06-23 14:22:18 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-11-21 20:21:18 +01:00
|
|
|
/* Send argv[] */
|
|
|
|
|
for (size_t i = 0; i < argc; i++) {
|
|
|
|
|
if (send(fd, &cargv[i], sizeof(cargv[i]), 0) != sizeof(cargv[i]) ||
|
|
|
|
|
send(fd, argv[i], cargv[i].len, 0) != cargv[i].len)
|
2019-11-01 20:39:34 +01:00
|
|
|
{
|
2021-06-23 14:22:18 +02:00
|
|
|
LOG_ERRNO("failed to send setup packet (argv) to server");
|
2019-11-01 20:39:34 +01:00
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-11-01 21:13:37 +01:00
|
|
|
const struct sigaction sa = {.sa_handler = &sig_handler};
|
|
|
|
|
if (sigaction(SIGINT, &sa, NULL) < 0 || sigaction(SIGTERM, &sa, NULL) < 0) {
|
2019-11-01 20:39:34 +01:00
|
|
|
LOG_ERRNO("failed to register signal handlers");
|
|
|
|
|
goto err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int exit_code;
|
|
|
|
|
ssize_t rcvd = recv(fd, &exit_code, sizeof(exit_code), 0);
|
|
|
|
|
|
|
|
|
|
if (rcvd == -1 && errno == EINTR)
|
2021-01-16 20:16:00 +00:00
|
|
|
xassert(aborted);
|
2019-11-01 20:39:34 +01:00
|
|
|
else if (rcvd != sizeof(exit_code))
|
|
|
|
|
LOG_ERRNO("failed to read server response");
|
|
|
|
|
else
|
|
|
|
|
ret = exit_code;
|
|
|
|
|
|
|
|
|
|
err:
|
client: add and use function push_override()
We now track override data (length + malloc:ed string) in a struct,
and push this struct to our overrides linked list.
There’s a new function, push_override() that takes a string,
calculates its length, strdup() it and pushes it to the linked
list. This function also length-checks the string, to ensure we don’t
overflow.
This way, we don’t have to loop the overrides list twice; once when
calculating the total length of all overrides, and once when sending
the overrides to the server.
Now, we can update the total length as we add overrides (i.e while
parsing the command line, instead of afterwards).
This means we only have to loop the list once, and that’s when sending
it. This also means there’s no longer any need to malloc an array
holding the lengths of each override.
2021-06-23 15:04:09 +02:00
|
|
|
tll_foreach(overrides, it) {
|
|
|
|
|
free(it->item.str);
|
|
|
|
|
tll_remove(overrides, it);
|
|
|
|
|
}
|
2020-11-21 20:21:18 +01:00
|
|
|
free(cargv);
|
2021-02-12 09:39:44 +01:00
|
|
|
free(_cwd);
|
2019-11-01 20:39:34 +01:00
|
|
|
if (fd != -1)
|
|
|
|
|
close(fd);
|
2019-12-14 13:01:21 +01:00
|
|
|
log_deinit();
|
2019-11-01 20:39:34 +01:00
|
|
|
return ret;
|
|
|
|
|
}
|