summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/bbackupctl/bbackupctl.cpp2
-rwxr-xr-xbin/bbackupd/bbackupd-config4
-rwxr-xr-xbin/bbackupd/bbackupd-config.in4
-rw-r--r--bin/bbackupquery/bbackupquery.cpp2
-rw-r--r--bin/bbstoreaccounts/bbstoreaccounts.cpp2
-rwxr-xr-xbin/bbstored/bbstored-config4
6 files changed, 12 insertions, 6 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp
index 033715b6..1eb3d015 100644
--- a/bin/bbackupctl/bbackupctl.cpp
+++ b/bin/bbackupctl/bbackupctl.cpp
@@ -75,6 +75,8 @@ enum Command
SyncAndWaitForEnd,
};
+#include <cstdlib>
+
void PrintUsageAndExit()
{
printf("Usage: bbackupctl [-q] [-c config_file] <command>\n"
diff --git a/bin/bbackupd/bbackupd-config b/bin/bbackupd/bbackupd-config
index d2fc49fb..37847d7e 100755
--- a/bin/bbackupd/bbackupd-config
+++ b/bin/bbackupd/bbackupd-config
@@ -58,7 +58,7 @@ Usage:
working-dir [backup directories]
Parameters:
- config-dir is usually /etc/boxbackup
+ config-dir is usually /etc/box
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
@@ -96,7 +96,7 @@ __E
}
# default locations
-my $default_config_location = '/etc/boxbackup/bbackupd.conf';
+my $default_config_location = '/etc/box/bbackupd.conf';
# command line parameters
my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in
index a88749fc..16ddb75c 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@/boxbackup
+ config-dir is usually @sysconfdir_expanded@/box
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@/boxbackup/bbackupd.conf';
+my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf';
# command line parameters
my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index fdd7cb6e..3b115ac2 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -94,6 +94,8 @@
#include "MemLeakFindOn.h"
+#include <cstdlib>
+
void PrintUsageAndExit()
{
printf("Usage: bbackupquery [-q] [-w] "
diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp
index 3e866181..fc1e2e0c 100644
--- a/bin/bbstoreaccounts/bbstoreaccounts.cpp
+++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp
@@ -69,6 +69,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 b/bin/bbstored/bbstored-config
index 4490c4ed..7f1d7cc8 100755
--- a/bin/bbstored/bbstored-config
+++ b/bin/bbstored/bbstored-config
@@ -58,7 +58,7 @@ Usage:
bbstored-config config-dir server-hostname username [raidfile-config]
Parameters:
- config-dir is usually /etc/boxbackup
+ config-dir is usually /etc/box
server-hostname is the hostname that clients will use to connect to
this server
username is the user to run the server under
@@ -86,7 +86,7 @@ __E
}
# default locations
-my $default_config_location = '/etc/boxbackup/bbstored.conf';
+my $default_config_location = '/etc/box/bbstored.conf';
# command line parameters
my ($config_dir,$server,$username,$raidfile_config) = @ARGV;