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

dvm: dont send back the file if not modified

Browse Source
This commit is contained in:
Rafal Wojtczuk 2010-06-30 18:15:26 +02:00 committed by Joanna Rutkowska
parent e1320483f9
commit de4ff20448
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
appvm/qubes_add_pendrive_script.c
View File

@ -150,6 +150,7 @@ void dvm_transaction_request(char *seq, struct xs_handle *xs)
int xvdh_fd, file_fd; int xvdh_fd, file_fd;
char *src_vm; char *src_vm;
unsigned int len; unsigned int len;
struct stat stat_pre, stat_post;
xvdh_fd = open("/dev/xvdh", O_RDONLY); xvdh_fd = open("/dev/xvdh", O_RDONLY);
if (read(xvdh_fd, &header, sizeof(header)) != sizeof(header)) { if (read(xvdh_fd, &header, sizeof(header)) != sizeof(header)) {
syslog(LOG_DAEMON | LOG_ERR, "read dvm_header"); syslog(LOG_DAEMON | LOG_ERR, "read dvm_header");
@ -171,12 +172,22 @@ void dvm_transaction_request(char *seq, struct xs_handle *xs)
suicide(xs); suicide(xs);
close(xvdh_fd); close(xvdh_fd);
close(file_fd); close(file_fd);
if (stat(filename, &stat_pre)) {
syslog(LOG_DAEMON | LOG_ERR, "stat pre");
suicide(xs);
}
snprintf(cmdbuf, sizeof(cmdbuf), snprintf(cmdbuf, sizeof(cmdbuf),
"DISPLAY=:0 mimeopen -n '/tmp/%s'", header.name); "DISPLAY=:0 mimeopen -n '/tmp/%s'", header.name);
if (system(cmdbuf)) if (system(cmdbuf))
system("DISPLAY=:0 /usr/bin/kdialog --sorry 'Unable to handle mimetype of the requested file'"); system("DISPLAY=:0 /usr/bin/kdialog --sorry 'Unable to handle mimetype of the requested file'");
if (stat(filename, &stat_post)) {
syslog(LOG_DAEMON | LOG_ERR, "stat post");
suicide(xs);
}
src_vm = xs_read(xs, XBT_NULL, "qubes_blocksrc", &len); src_vm = xs_read(xs, XBT_NULL, "qubes_blocksrc", &len);
xs_write(xs, XBT_NULL, "device/qpen", "umount", 6); xs_write(xs, XBT_NULL, "device/qpen", "umount", 6);
if (stat_pre.st_mtime == stat_post.st_mtime)
suicide(xs);
xs_daemon_close(xs); xs_daemon_close(xs);
execl("/usr/bin/qvm-dvm-transfer", "qvm-dvm-transfer", src_vm, execl("/usr/bin/qvm-dvm-transfer", "qvm-dvm-transfer", src_vm,
filename, seq, NULL); filename, seq, NULL);