From 31c6ed2077377b7313b28188a7811a9be866a3e4 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 18 May 2013 06:31:53 +0200 Subject: [PATCH] qga: save state directory in ga_install_service() If the user selects a non-default state directory at service installation time, we should remember it in the registered service. Signed-off-by: Laszlo Ersek Signed-off-by: Michael Roth (cherry picked from commit a839ee77c786a8200c76ca92f697eebf6bcc9aa3) * modified to save state_dir unconditionally an avoid reliance on uncommitted CSIDL_COMMON_APPDATA dependencies Signed-off-by: Michael Roth --- qga/main.c | 3 ++- qga/service-win32.c | 6 +++++- qga/service-win32.h | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qga/main.c b/qga/main.c index 44a283686..c2ba5d913 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1002,7 +1002,8 @@ int main(int argc, char **argv) case 's': service = optarg; if (strcmp(service, "install") == 0) { - return ga_install_service(path, log_filepath); + const char *fixed_state_dir; + return ga_install_service(path, log_filepath, state_dir); } else if (strcmp(service, "uninstall") == 0) { return ga_uninstall_service(); } else { diff --git a/qga/service-win32.c b/qga/service-win32.c index 8a5de8a8b..02926abb2 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -35,7 +35,8 @@ static int printf_win_error(const char *text) return n; } -int ga_install_service(const char *path, const char *logfile) +int ga_install_service(const char *path, const char *logfile, + const char *state_dir) { SC_HANDLE manager; SC_HANDLE service; @@ -56,6 +57,9 @@ int ga_install_service(const char *path, const char *logfile) if (logfile) { g_string_append_printf(cmdline, " -l %s -v", logfile); } + if (state_dir) { + g_string_append_printf(cmdline, " -t %s", state_dir); + } g_debug("service's cmdline: %s", cmdline->str); diff --git a/qga/service-win32.h b/qga/service-win32.h index 99dfc5334..3b9e87024 100644 --- a/qga/service-win32.h +++ b/qga/service-win32.h @@ -24,7 +24,8 @@ typedef struct GAService { SERVICE_STATUS_HANDLE status_handle; } GAService; -int ga_install_service(const char *path, const char *logfile); +int ga_install_service(const char *path, const char *logfile, + const char *state_dir); int ga_uninstall_service(void); #endif -- 2.39.2