| Message ID | 20200909094617.1582-8-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
On Wed, Sep 09, 2020 at 05:46:03PM +0800, Yonggang Luo wrote: > On Windows there is no path like /tmp/s_local_disk.XXXXXX > Use g_get_tmp_dir instead of /tmp. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > tests/test-replication.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > @@ -571,6 +571,11 @@ static void setup_sigabrt_handler(void) > int main(int argc, char **argv) > { > int ret; > + const char *tmpdir = g_get_tmp_dir(); > + p_local_disk = g_strdup_printf("%s/p_local_disk.XXXXXX", tmpdir); > + s_local_disk = g_strdup_printf("%s/s_local_disk.XXXXXX", tmpdir); > + s_active_disk = g_strdup_printf("%s/s_active_disk.XXXXXX", tmpdir); > + s_hidden_disk = g_strdup_printf("%s/s_hidden_disk.XXXXXX", tmpdir); I presume msys is taking care of translating "/" into "\" so that we don't need to use g_build_filename to use the native directory separator straightaway ? Regards, Daniel
On Wed, Sep 9, 2020 at 8:56 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > On Wed, Sep 09, 2020 at 05:46:03PM +0800, Yonggang Luo wrote: > > On Windows there is no path like /tmp/s_local_disk.XXXXXX > > Use g_get_tmp_dir instead of /tmp. > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > > --- > > tests/test-replication.c | 18 ++++++++++++++---- > > 1 file changed, 14 insertions(+), 4 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > > @@ -571,6 +571,11 @@ static void setup_sigabrt_handler(void) > > int main(int argc, char **argv) > > { > > int ret; > > + const char *tmpdir = g_get_tmp_dir(); > > + p_local_disk = g_strdup_printf("%s/p_local_disk.XXXXXX", tmpdir); > > + s_local_disk = g_strdup_printf("%s/s_local_disk.XXXXXX", tmpdir); > > + s_active_disk = g_strdup_printf("%s/s_active_disk.XXXXXX", tmpdir); > > + s_hidden_disk = g_strdup_printf("%s/s_hidden_disk.XXXXXX", tmpdir); > > I presume msys is taking care of translating "/" into "\" so that > we don't need to use g_build_filename to use the native directory > separator straightaway ? > Not only msys2, but also win32 api can recoginize "/", so we doesn't need to care about it > > > Regards, > Daniel > -- > |: https://berrange.com -o- > https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- > https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- > https://www.instagram.com/dberrange :| > >
diff --git a/tests/test-replication.c b/tests/test-replication.c index 9ab3666a90..e7cbd6b144 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -23,14 +23,14 @@ /* primary */ #define P_ID "primary-id" -static char p_local_disk[] = "/tmp/p_local_disk.XXXXXX"; +static char *p_local_disk; /* secondary */ #define S_ID "secondary-id" #define S_LOCAL_DISK_ID "secondary-local-disk-id" -static char s_local_disk[] = "/tmp/s_local_disk.XXXXXX"; -static char s_active_disk[] = "/tmp/s_active_disk.XXXXXX"; -static char s_hidden_disk[] = "/tmp/s_hidden_disk.XXXXXX"; +static char *s_local_disk; +static char *s_active_disk; +static char *s_hidden_disk; /* FIXME: steal from blockdev.c */ QemuOptsList qemu_drive_opts = { @@ -571,6 +571,11 @@ static void setup_sigabrt_handler(void) int main(int argc, char **argv) { int ret; + const char *tmpdir = g_get_tmp_dir(); + p_local_disk = g_strdup_printf("%s/p_local_disk.XXXXXX", tmpdir); + s_local_disk = g_strdup_printf("%s/s_local_disk.XXXXXX", tmpdir); + s_active_disk = g_strdup_printf("%s/s_active_disk.XXXXXX", tmpdir); + s_hidden_disk = g_strdup_printf("%s/s_hidden_disk.XXXXXX", tmpdir); qemu_init_main_loop(&error_fatal); bdrv_init(); @@ -605,5 +610,10 @@ int main(int argc, char **argv) cleanup_imgs(); + g_free(p_local_disk); + g_free(s_local_disk); + g_free(s_active_disk); + g_free(s_hidden_disk); + return ret; }
On Windows there is no path like /tmp/s_local_disk.XXXXXX Use g_get_tmp_dir instead of /tmp. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- tests/test-replication.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)