From 3bc0cdb43a9e0a01a2a146e2e0f921ae6f432471 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 23 Feb 2013 13:11:59 +0100 Subject: [PATCH] vm/qfile-copy: rename incoming directory to QubesIncoming Also use plain source VM name as subdir (without "from-" prefix). --- qubes_rpc/qfile-agent.c | 2 +- qubes_rpc/qfile-unpacker.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qubes_rpc/qfile-agent.c b/qubes_rpc/qfile-agent.c index 0a1256fd..1d6bcddc 100644 --- a/qubes_rpc/qfile-agent.c +++ b/qubes_rpc/qfile-agent.c @@ -66,7 +66,7 @@ void wait_for_result() if (hdr.error_code != 0) { switch (hdr.error_code) { case EEXIST: - gui_fatal("File copy: not overwriting existing file. Clean incoming dir, and retry copy"); + gui_fatal("File copy: not overwriting existing file. Clean QubesIncoming dir, and retry copy"); break; case EINVAL: gui_fatal("File copy: Corrupted data from packer"); diff --git a/qubes_rpc/qfile-unpacker.c b/qubes_rpc/qfile-unpacker.c index 402a0092..abdc9f2b 100644 --- a/qubes_rpc/qfile-unpacker.c +++ b/qubes_rpc/qfile-unpacker.c @@ -12,7 +12,7 @@ #include #include #include "filecopy.h" -#define INCOMING_DIR_ROOT "/home/user/incoming" +#define INCOMING_DIR_ROOT "/home/user/QubesIncoming" int prepare_creds_return_uid(char *username) { struct passwd *pwd; @@ -45,7 +45,7 @@ int main(int argc, char ** argv) exit(1); } mkdir(INCOMING_DIR_ROOT, 0700); - asprintf(&incoming_dir, "%s/from-%s", INCOMING_DIR_ROOT, remote_domain); + asprintf(&incoming_dir, "%s/%s", INCOMING_DIR_ROOT, remote_domain); mkdir(incoming_dir, 0700); if (chdir(incoming_dir)) gui_fatal("Error chdir to %s", incoming_dir);