Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm-file-editor: drop old wait-for-session mechanism

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-11-11 13:27:30 +01:00
parent a44e73900e
commit 71ef524dec
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qubes-rpc/vm-file-editor.c
View File

@ -147,11 +147,10 @@ void send_file_back(const char * filename)
int int
main() main()
{ {
struct stat stat_pre, stat_post, session_stat; struct stat stat_pre, stat_post;
int view_only = 0; int view_only = 0;
char *filename = get_filename(&view_only); char *filename = get_filename(&view_only);
int child, status, log_fd, null_fd; int child, status, log_fd, null_fd;
FILE *waiter_pidfile;
copy_file_by_name(filename); copy_file_by_name(filename);
if (view_only) { if (view_only) {
@ -162,37 +161,7 @@ main()
perror("stat pre"); perror("stat pre");
exit(1); exit(1);
} }
#ifdef DEBUG
fprintf(stderr, "time=%s, waiting for qubes-session\n", gettime());
#endif
// wait for X server to starts (especially in DispVM)
if (stat("/tmp/qubes-session-env", &session_stat)) {
switch (child = fork()) {
case -1:
perror("fork");
exit(1);
case 0:
waiter_pidfile = fopen("/tmp/qubes-session-waiter", "a");
if (waiter_pidfile == NULL) {
perror("fopen waiter_pidfile");
exit(1);
}
fprintf(waiter_pidfile, "%d\n", getpid());
fclose(waiter_pidfile);
// check the second time, to prevent race
if (stat("/tmp/qubes-session-env", &session_stat)) {
// wait for qubes-session notify
pause();
}
exit(0);
default:
waitpid(child, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
//propagate exit code from child
exit(WEXITSTATUS(status));
}
}
}
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "time=%s, starting editor\n", gettime()); fprintf(stderr, "time=%s, starting editor\n", gettime());
#endif #endif