This patch reverts commit 50421f1f.

Expose subsurface_mkdir() in qthelper.h as main.cpp already
includes it. Once 'default_directory' is obtained call
subsurface_mkdir() on it. subsurface_mkdir() will not throw an
error if the directory exists according to the QDir documentation.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-10-13 11:34:26 -07:00 committed by Dirk Hohndel
parent 7b51a4c1be
commit 8d2d7cd4a3
4 changed files with 2 additions and 5 deletions

View file

@ -3,7 +3,6 @@
#include "dive.h"
#include "display.h"
#include "membuffer.h"
#include "qthelperfromc.h"
#include <string.h>
#include <sys/types.h>
#include <dirent.h>
@ -64,8 +63,6 @@ static const char *system_default_path_append(const char *append)
memset(buffer, 0, len);
strcat(buffer, home);
strcat(buffer, path);
// make sure this path exists
subsurface_mkdir(buffer);
if (append) {
strcat(buffer, "/");
strcat(buffer, append);

View file

@ -56,8 +56,6 @@ static const char *system_default_path_append(const char *append)
memset(buffer, 0, len);
strcat(buffer, home);
strcat(buffer, path);
// make sure this path exists
subsurface_mkdir(buffer);
if (append) {
strcat(buffer, "/");
strcat(buffer, append);

View file

@ -36,6 +36,7 @@ int main(int argc, char **argv)
const char *default_directory = system_default_directory();
const char *default_filename = system_default_filename();
subsurface_mkdir(default_directory);
for (i = 1; i < arguments.length(); i++) {
QString a = arguments.at(i);

View file

@ -130,5 +130,6 @@ bool parseGpsText(const QString &gps_text, double *latitude, double *longitude);
QByteArray getCurrentAppState();
void setCurrentAppState(QByteArray state);
extern "C" bool in_planner();
extern "C" void subsurface_mkdir(const char *dir);
#endif // QTHELPER_H