mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

seatd-launch: Command line argument support

Browse source
This commit is contained in:
Kenny Levinsen 2021-08-06 23:00:05 +02:00
parent 369af8f9e4
commit 48727a0b6b
1 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

46
seatd-launch/seatd-launch.c
View file

@ -13,10 +13,42 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
(void)argc; (void)argc;
char sockbuf[256];
sprintf(sockbuf, "/tmp/seatd.%d.sock", getpid()); const char *usage = "Usage: seatd-launch [options] [--] command\n"
unlink(sockbuf); "\n"
" -h Show this help message\n"
" -s <path> Where to create the seatd socket\n"
" -v Show the version number\n"
"\n";
int c;
char *sockpath = NULL;
while ((c = getopt(argc, argv, "vhs:")) != -1) {
switch (c) {
case 's':
sockpath = optarg;
break;
case 'v':
printf("seatd-launch version %s\n", SEATD_VERSION);
return 0;
case 'h':
printf("%s", usage);
return 0;
case '?':
fprintf(stderr, "Try '%s -h' for more information.\n", argv[0]);
return 1;
default:
abort();
}
}
char sockbuf[256];
if (sockpath == NULL) {
sprintf(sockbuf, "/tmp/seatd.%d.sock", getpid());
sockpath = sockbuf;
}
unlink(sockpath);
int fds[2]; int fds[2];
if (pipe(fds) == -1) { if (pipe(fds) == -1) {
@ -41,7 +73,7 @@ int main(int argc, char *argv[]) {
} }
// TODO: Make seatd accept the numeric UID // TODO: Make seatd accept the numeric UID
execlp("seatd", "seatd", "-n", pipebuf, "-u", user->pw_name, "-s", sockbuf, NULL); execlp("seatd", "seatd", "-n", pipebuf, "-u", user->pw_name, "-s", sockpath, NULL);
perror("Could not start seatd"); perror("Could not start seatd");
_exit(1); _exit(1);
} }
@ -100,7 +132,7 @@ int main(int argc, char *argv[]) {
perror("Could not fork target process"); perror("Could not fork target process");
goto error_seatd; goto error_seatd;
} else if (child == 0) { } else if (child == 0) {
setenv("SEATD_SOCK", sockbuf, 1); setenv("SEATD_SOCK", sockpath, 1);
execv(argv[1], &argv[1]); execv(argv[1], &argv[1]);
perror("Could not start target"); perror("Could not start target");
_exit(1); _exit(1);
@ -117,7 +149,7 @@ int main(int argc, char *argv[]) {
} }
} }
unlink(sockbuf); unlink(sockpath);
kill(seatd_child, SIGTERM); kill(seatd_child, SIGTERM);
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
@ -127,7 +159,7 @@ int main(int argc, char *argv[]) {
} }
error_seatd: error_seatd:
unlink(sockbuf); unlink(sockpath);
kill(seatd_child, SIGTERM); kill(seatd_child, SIGTERM);
error: error:
return 1; return 1;