Consolidate utilities into one header

13 files changed, 30 insertions, 37 deletions

diff --git a/src/BulkRemove.cc b/src/BulkRemove.cc
index 94ff620..983bdb9 100644
--- a/src/BulkRemove.cc
+++ b/src/BulkRemove.cc
@@ -1,5 +1,6 @@
 #include <config.h>
 #include "Subprocess.h"
+#include "Utils.h"
 
 void BulkRemove(const std::string &path) {
   std::vector<std::string> cmd;
diff --git a/src/BulkRemove.h b/src/BulkRemove.h
deleted file mode 100644
index 060ec53..0000000
--- a/src/BulkRemove.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef BULKREMOVE_H
-#define BULKREMOVE_H
-
-#include <string>
-
-void BulkRemove(const std::string &path);
-
-#endif /* BULKREMOVE_H */
-
diff --git a/src/Check.cc b/src/Check.cc
index 49996bf..ce11a08 100644
--- a/src/Check.cc
+++ b/src/Check.cc
@@ -1,6 +1,7 @@
 #include <config.h>
 #include "Command.h"
 #include "Errors.h"
+#include "Utils.h"
 #include <cstdio>
 #include <cstdarg>
 #include <cerrno>
diff --git a/src/Check.h b/src/Check.h
deleted file mode 100644
index 1438017..0000000
--- a/src/Check.h
+++ /dev/null
@@ -1,7 +0,0 @@
-//-*-C++-*-
-#ifndef CHECK_H
-#define CHECK_H
-
-bool check(const char *format, ...);
-
-#endif /* CHECK_H */
diff --git a/src/HTML.cc b/src/HTML.cc
index 3aee7d8..7390e45 100644
--- a/src/HTML.cc
+++ b/src/HTML.cc
@@ -1,6 +1,6 @@
 #include <config.h>
 #include "Document.h"
-#include "Unicode.h"
+#include "Utils.h"
 #include "Errors.h"
 #include <ostream>
 #include <cstdio>
diff --git a/src/Makefile.am b/src/Makefile.am
index 8801b72..7dff90f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,9 @@ Date.cc Device.cc Directory.cc Document.cc Email.cc Errors.cc		\
 FileLock.cc Host.cc HTML.cc MakeBackup.cc MakeDirectory.cc Prune.cc	\
 Regexp.cc Report.cc Retire.cc RetireDevices.cc RetireVolumes.cc		\
 rsbackup.cc StdioFile.cc Store.cc stylesheet.cc Subprocess.cc		\
-Unicode.cc Volume.cc BulkRemove.h Check.h Command.h Conf.h Date.h	\
-Defaults.h Document.h Email.h Errors.h FileLock.h IO.h Regexp.h		\
-rsbackup.h Store.h Subprocess.h Unicode.h
+Unicode.cc Volume.cc Command.h Conf.h Date.h Defaults.h Document.h	\
+Email.h Errors.h FileLock.h IO.h Regexp.h Retire.h rsbackup.h Store.h	\
+Subprocess.h Utils.h
 
 stylesheet.cc: rsbackup.css
 	${top_srcdir}/scripts/txt2src stylesheet < $^ > $@
diff --git a/src/Prune.cc b/src/Prune.cc
index cff1ec6..a744461 100644
--- a/src/Prune.cc
+++ b/src/Prune.cc
@@ -6,7 +6,7 @@
 #include "Regexp.h"
 #include "IO.h"
 #include "Subprocess.h"
-#include "BulkRemove.h"
+#include "Utils.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/Retire.cc b/src/Retire.cc
index a9f3683..f85ef5e 100644
--- a/src/Retire.cc
+++ b/src/Retire.cc
@@ -3,7 +3,7 @@
 #include "Conf.h"
 #include "Command.h"
 #include "Store.h"
-#include "BulkRemove.h"
+#include "Utils.h"
 #include "Errors.h"
 #include <cerrno>
 
diff --git a/src/RetireDevices.cc b/src/RetireDevices.cc
index 15b72be..33e76d7 100644
--- a/src/RetireDevices.cc
+++ b/src/RetireDevices.cc
@@ -2,7 +2,7 @@
 #include "rsbackup.h"
 #include "Conf.h"
 #include "Command.h"
-#include "Check.h"
+#include "Utils.h"
 #include "IO.h"
 #include "Retire.h"
 #include <cerrno>
diff --git a/src/RetireVolumes.cc b/src/RetireVolumes.cc
index bd22380..2d4d7c8 100644
--- a/src/RetireVolumes.cc
+++ b/src/RetireVolumes.cc
@@ -1,7 +1,7 @@
 #include <config.h>
 #include "Conf.h"
 #include "Command.h"
-#include "Check.h"
+#include "Utils.h"
 #include "Errors.h"
 #include "IO.h"
 #include "Retire.h"
diff --git a/src/Unicode.cc b/src/Unicode.cc
index 83527af..b57d1a3 100644
--- a/src/Unicode.cc
+++ b/src/Unicode.cc
@@ -1,5 +1,5 @@
 #include <config.h>
-#include "Unicode.h"
+#include "Utils.h"
 #include "Errors.h"
 #include <iconv.h>
 #include <langinfo.h>
diff --git a/src/Unicode.h b/src/Unicode.h
deleted file mode 100644
index 1f9fd49..0000000
--- a/src/Unicode.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//-*-C++-*-
-#ifndef UNICODE_H
-#define UNICODE_H
-
-#include <string>
-
-// Convert mbs from native multibyte encoding to a Unicode string.  We
-// assume that wchar_t is UTF-32.
-void toUnicode(std::wstring &u, const std::string &mbs);
-
-#endif /* UNICODE_H */
-
diff --git a/src/Utils.h b/src/Utils.h
new file mode 100644
index 0000000..936863e
--- /dev/null
+++ b/src/Utils.h
@@ -0,0 +1,19 @@
+//-*-C++-*-
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <string>
+
+// Display a prompt and insist on a yes/no reply.
+// Overridden by --force (which means 'always yes').
+bool check(const char *format, ...);
+
+// rm -rf PATH
+void BulkRemove(const std::string &path);
+
+// Convert mbs from native multibyte encoding to a Unicode string.  We
+// assume that wchar_t is UTF-32.
+void toUnicode(std::wstring &u, const std::string &mbs);
+
+#endif /* UTILS_H */
+