Import upstream version 0.11~rc3~r2502

6 files changed, 12 insertions, 7 deletions

diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp
index 2c41f614..8dc8f30e 100644
--- a/bin/bbackupctl/bbackupctl.cpp
+++ b/bin/bbackupctl/bbackupctl.cpp
@@ -9,7 +9,8 @@
 
 #include "Box.h"
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
 
 #ifdef HAVE_UNISTD_H
 	#include <unistd.h>
diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in
index 925dcc3e..98dc8b6e 100755
--- a/bin/bbackupd/bbackupd-config.in
+++ b/bin/bbackupd/bbackupd-config.in
@@ -19,7 +19,7 @@ Usage:
         working-dir [backup directories]
 
 Parameters:
-    config-dir          is usually @sysconfdir_expanded@/box
+    config-dir          is usually @sysconfdir_expanded@/boxbackup
     backup-mode         is lazy or snapshot:
         lazy mode       runs continously, uploading files over a specified age
         snapshot mode   uploads a snapshot of the filesystem when instructed
@@ -57,7 +57,7 @@ __E
 }
 
 # default locations
-my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf';
+my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbackupd.conf';
 
 # command line parameters
 my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
diff --git a/bin/bbackupobjdump/bbackupobjdump.cpp b/bin/bbackupobjdump/bbackupobjdump.cpp
index 74fff510..5b6c44f7 100644
--- a/bin/bbackupobjdump/bbackupobjdump.cpp
+++ b/bin/bbackupobjdump/bbackupobjdump.cpp
@@ -9,7 +9,8 @@
 
 #include "Box.h"
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 
 #include "MainHelper.h"
 #include "FileStream.h"
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index 33860dcf..bab697b8 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -14,7 +14,8 @@
 #endif
 
 #include <errno.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
 
 #ifdef HAVE_SYS_TYPES_H
 	#include <sys/types.h>
diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp
index 71114ef4..e377b661 100644
--- a/bin/bbstoreaccounts/bbstoreaccounts.cpp
+++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp
@@ -36,6 +36,8 @@
 
 #include "MemLeakFindOn.h"
 
+#include <cstring>
+
 // max size of soft limit as percent of hard limit
 #define MAX_SOFT_LIMIT_SIZE		97
 
diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in
index 5ad96d50..83305c4f 100755
--- a/bin/bbstored/bbstored-config.in
+++ b/bin/bbstored/bbstored-config.in
@@ -19,7 +19,7 @@ Usage:
     bbstored-config config-dir server-hostname username [raidfile-config]
 
 Parameters:
-    config-dir       is usually @sysconfdir_expanded@/box
+    config-dir       is usually @sysconfdir_expanded@/boxbackup
     server-hostname  is the hostname that clients will use to connect to
                      this server
     username         is the user to run the server under
@@ -47,7 +47,7 @@ __E
 }
 
 # default locations
-my $default_config_location = '@sysconfdir_expanded@/box/bbstored.conf';
+my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbstored.conf';
 
 # command line parameters
 my ($config_dir,$server,$username,$raidfile_config) = @ARGV;