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

main/client: add -D,--working-directory=DIR

Browse source 
This overrides the CWD the slave process chdir()’s into before
exec:ing the client application.
This commit is contained in:
Daniel Eklöf 2021-02-12 09:39:44 +01:00
parent 64a60d12f0
commit 19868c9c8d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client.c
View file

@ -54,6 +54,7 @@ print_usage(const char *prog_name)
" -m,--maximized start in maximized mode\n" " -m,--maximized start in maximized mode\n"
" -F,--fullscreen start in fullscreen mode\n" " -F,--fullscreen start in fullscreen mode\n"
" -L,--login-shell start shell as a login shell\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" " -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" " -H,--hold remain open after child process exits\n"
" -d,---log-level={info|warning|error} log level (info)\n" " -d,---log-level={info|warning|error} log level (info)\n"
@ -77,6 +78,7 @@ main(int argc, char *const *argv)
{"maximized", no_argument, NULL, 'm'}, {"maximized", no_argument, NULL, 'm'},
{"fullscreen", no_argument, NULL, 'F'}, {"fullscreen", no_argument, NULL, 'F'},
{"login-shell", no_argument, NULL, 'L'}, {"login-shell", no_argument, NULL, 'L'},
{"working-directory", required_argument, NULL, 'D'},
{"server-socket", required_argument, NULL, 's'}, {"server-socket", required_argument, NULL, 's'},
{"hold", no_argument, NULL, 'H'}, {"hold", no_argument, NULL, 'H'},
{"log-level", required_argument, NULL, 'd'}, {"log-level", required_argument, NULL, 'd'},
@ -89,6 +91,7 @@ main(int argc, char *const *argv)
const char *term = ""; const char *term = "";
const char *title = ""; const char *title = "";
const char *app_id = ""; const char *app_id = "";
const char *custom_cwd = NULL;
unsigned size_type = 0; // enum conf_size_type (without pulling in tllist/fcft via config.h) unsigned size_type = 0; // enum conf_size_type (without pulling in tllist/fcft via config.h)
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
@ -101,7 +104,7 @@ main(int argc, char *const *argv)
bool hold = false; bool hold = false;
while (true) { while (true) {
int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLs:Hd:l::vh", longopts, NULL); int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLD:s:Hd:l::vh", longopts, NULL);
if (c == -1) if (c == -1)
break; break;
@ -122,6 +125,10 @@ main(int argc, char *const *argv)
login_shell = true; login_shell = true;
break; break;
case 'D':
custom_cwd = optarg;
break;
case 'w': case 'w':
if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) { if (sscanf(optarg, "%ux%u", &width, &height) != 2 || width == 0 || height == 0) {
fprintf(stderr, "error: invalid window-size-pixels: %s\n", optarg); fprintf(stderr, "error: invalid window-size-pixels: %s\n", optarg);
@ -202,7 +209,7 @@ main(int argc, char *const *argv)
log_init(log_colorize, false, LOG_FACILITY_USER, log_level); log_init(log_colorize, false, LOG_FACILITY_USER, log_level);
/* malloc:ed and needs to be in scope of all goto's */ /* malloc:ed and needs to be in scope of all goto's */
char *cwd = NULL; char *_cwd = NULL;
struct client_argv *cargv = NULL; struct client_argv *cargv = NULL;
int fd = socket(AF_UNIX, SOCK_STREAM, 0); int fd = socket(AF_UNIX, SOCK_STREAM, 0);
@ -247,17 +254,19 @@ main(int argc, char *const *argv)
} }
} }
{ const char *cwd = custom_cwd;
if (cwd == NULL) {
errno = 0; errno = 0;
size_t buf_len = 1024; size_t buf_len = 1024;
do { do {
cwd = xrealloc(cwd, buf_len); _cwd = xrealloc(_cwd, buf_len);
if (getcwd(cwd, buf_len) == NULL && errno != ERANGE) { if (getcwd(_cwd, buf_len) == NULL && errno != ERANGE) {
LOG_ERRNO("failed to get current working directory"); LOG_ERRNO("failed to get current working directory");
goto err; goto err;
} }
buf_len *= 2; buf_len *= 2;
} while (errno == ERANGE); } while (errno == ERANGE);
cwd = _cwd;
} }
/* String lengths, including NULL terminator */ /* String lengths, including NULL terminator */
@ -356,7 +365,7 @@ main(int argc, char *const *argv)
err: err:
free(cargv); free(cargv);
free(cwd); free(_cwd);
if (fd != -1) if (fd != -1)
close(fd); close(fd);
log_deinit(); log_deinit();

26
main.c
View file

@ -67,6 +67,7 @@ print_usage(const char *prog_name)
" -m,--maximized start in maximized mode\n" " -m,--maximized start in maximized mode\n"
" -F,--fullscreen start in fullscreen mode\n" " -F,--fullscreen start in fullscreen mode\n"
" -L,--login-shell start shell as a login shell\n" " -L,--login-shell start shell as a login shell\n"
" -D,--working-directory=DIR directory to start in (CWD)\n"
" -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\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" " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n"
" -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n" " -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n"
@ -163,6 +164,7 @@ main(int argc, char *const *argv)
{"title", required_argument, NULL, 'T'}, {"title", required_argument, NULL, 'T'},
{"app-id", required_argument, NULL, 'a'}, {"app-id", required_argument, NULL, 'a'},
{"login-shell", no_argument, NULL, 'L'}, {"login-shell", no_argument, NULL, 'L'},
{"working-directory", required_argument, NULL, 'D'},
{"font", required_argument, NULL, 'f'}, {"font", required_argument, NULL, 'f'},
{"window-size-pixels", required_argument, NULL, 'w'}, {"window-size-pixels", required_argument, NULL, 'w'},
{"window-size-chars", required_argument, NULL, 'W'}, {"window-size-chars", required_argument, NULL, 'W'},
@ -185,6 +187,7 @@ main(int argc, char *const *argv)
const char *conf_term = NULL; const char *conf_term = NULL;
const char *conf_title = NULL; const char *conf_title = NULL;
const char *conf_app_id = NULL; const char *conf_app_id = NULL;
const char *custom_cwd = NULL;
bool login_shell = false; bool login_shell = false;
tll(char *) conf_fonts = tll_init(); tll(char *) conf_fonts = tll_init();
enum conf_size_type conf_size_type = CONF_SIZE_PX; enum conf_size_type conf_size_type = CONF_SIZE_PX;
@ -204,7 +207,7 @@ main(int argc, char *const *argv)
user_notifications_t user_notifications = tll_init(); user_notifications_t user_notifications = tll_init();
while (true) { while (true) {
int c = getopt_long(argc, argv, "+c:Ct:T:a:Lf:w:W:s::HmFPp:d:l::Svh", longopts, NULL); int c = getopt_long(argc, argv, "+c:Ct:T:a:LD:f:w:W:s::HmFPp:d:l::Svh", longopts, NULL);
if (c == -1) if (c == -1)
break; break;
@ -233,6 +236,10 @@ main(int argc, char *const *argv)
conf_app_id = optarg; conf_app_id = optarg;
break; break;
case 'D':
custom_cwd = optarg;
break;
case 'f': case 'f':
tll_free_and_free(conf_fonts, free); tll_free_and_free(conf_fonts, free);
for (char *font = strtok(optarg, ","); font != NULL; font = strtok(NULL, ",")) { for (char *font = strtok(optarg, ","); font != NULL; font = strtok(NULL, ",")) {
@ -443,18 +450,21 @@ main(int argc, char *const *argv)
struct server *server = NULL; struct server *server = NULL;
struct shutdown_context shutdown_ctx = {.term = &term, .exit_code = EXIT_FAILURE}; struct shutdown_context shutdown_ctx = {.term = &term, .exit_code = EXIT_FAILURE};
char *cwd = NULL; const char *cwd = custom_cwd;
{ char *_cwd = NULL;
if (cwd == NULL) {
errno = 0; errno = 0;
size_t buf_len = 1024; size_t buf_len = 1024;
do { do {
cwd = xrealloc(cwd, buf_len); _cwd = xrealloc(_cwd, buf_len);
if (getcwd(cwd, buf_len) == NULL && errno != ERANGE) { if (getcwd(_cwd, buf_len) == NULL && errno != ERANGE) {
LOG_ERRNO("failed to get current working directory"); LOG_ERRNO("failed to get current working directory");
goto out; goto out;
} }
buf_len *= 2; buf_len *= 2;
} while (errno == ERANGE); } while (errno == ERANGE);
cwd = _cwd;
} }
shm_set_max_pool_size(conf.tweak.max_shm_pool_size); shm_set_max_pool_size(conf.tweak.max_shm_pool_size);
@ -476,8 +486,8 @@ main(int argc, char *const *argv)
&term_shutdown_cb, &shutdown_ctx)) == NULL) { &term_shutdown_cb, &shutdown_ctx)) == NULL) {
goto out; goto out;
} }
free(cwd); free(_cwd);
cwd = NULL; _cwd = NULL;
if (as_server && (server = server_init(&conf, fdm, reaper, wayl)) == NULL) if (as_server && (server = server_init(&conf, fdm, reaper, wayl)) == NULL)
goto out; goto out;
@ -510,7 +520,7 @@ main(int argc, char *const *argv)
ret = aborted || tll_length(wayl->terms) == 0 ? EXIT_SUCCESS : EXIT_FAILURE; ret = aborted || tll_length(wayl->terms) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
out: out:
free(cwd); free(_cwd);
server_destroy(server); server_destroy(server);
term_destroy(term); term_destroy(term);