From eb8e95d994e5748a206d0ea05303ca9d7ebc9dd5 Mon Sep 17 00:00:00 2001
From: Alban Peignier <alban@tryphon.eu>
Date: Fri, 5 Sep 2014 10:09:20 +0200
Subject: [PATCH] Replace getenv("HOME") and hardcoded "/tmp" by RDGetHomeDir()
and RDTempDir() in UpdateDb
---
rdadmin/createdb.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/rdadmin/createdb.cpp b/rdadmin/createdb.cpp
index 28f7286c..dfd31f89 100644
--- a/rdadmin/createdb.cpp
+++ b/rdadmin/createdb.cpp
@@ -48,6 +48,7 @@
#include "rdconfig.h"
#include <createdb.h>
#include <globals.h>
+#include <rdconf.h>
//
// NOTE TO MAINTAINERS:
@@ -2729,11 +2730,10 @@ int UpdateDb(int ver)
//
if(!admin_skip_backup) {
if(admin_backup_filename.isEmpty()) {
- if(getenv("HOME")==NULL) {
- admin_backup_filename="/tmp";
- }
- else {
- admin_backup_filename=getenv("HOME");
+ bool home_found = false;
+ admin_backup_filename = RDGetHomeDir(&home_found);
+ if (!home_found) {
+ admin_backup_filename = RDTempDir();
}
admin_backup_filename+=
QString().sprintf("/rdbackup-%s-%d.sql.gz",