summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
Diffstat (limited to 'libexec')
-rw-r--r--libexec/listmounts/Makefile.am2
-rw-r--r--libexec/listmounts/listmounts.cc4
-rw-r--r--libexec/listmounts/main.cc12
-rw-r--r--libexec/listmounts/main.h4
-rw-r--r--libexec/listmounts/options.cc8
-rw-r--r--libexec/listmounts/options.h4
-rw-r--r--libexec/mount/Makefile.am2
-rw-r--r--libexec/mount/main.cc12
-rw-r--r--libexec/mount/main.h4
-rw-r--r--libexec/mount/mount.cc4
-rw-r--r--libexec/mount/options.cc8
-rw-r--r--libexec/mount/options.h4
12 files changed, 34 insertions, 34 deletions
diff --git a/libexec/listmounts/Makefile.am b/libexec/listmounts/Makefile.am
index a9bb166c..9a11bfaf 100644
--- a/libexec/listmounts/Makefile.am
+++ b/libexec/listmounts/Makefile.am
@@ -25,4 +25,4 @@ libexec_listmounts_listmounts_SOURCES = \
libexec/listmounts/options.cc \
libexec/listmounts/listmounts.cc
libexec_listmounts_listmounts_LDADD = \
- $(top_builddir)/lib/schroot-base/libschroot-base.la
+ $(top_builddir)/lib/bin-common/libbin-common.la
diff --git a/libexec/listmounts/listmounts.cc b/libexec/listmounts/listmounts.cc
index 4c957509..1f9be8b4 100644
--- a/libexec/listmounts/listmounts.cc
+++ b/libexec/listmounts/listmounts.cc
@@ -21,7 +21,7 @@
#include "options.h"
#include "main.h"
-#include <schroot-base/run.h>
+#include <bin-common/run.h>
using std::endl;
using boost::format;
@@ -42,6 +42,6 @@ int
main (int argc,
char *argv[])
{
- return schroot_base::run
+ return bin_common::run
<schroot_listmounts::options, schroot_listmounts::main>(argc, argv);
}
diff --git a/libexec/listmounts/main.cc b/libexec/listmounts/main.cc
index e32a5e5e..3f228b0b 100644
--- a/libexec/listmounts/main.cc
+++ b/libexec/listmounts/main.cc
@@ -51,12 +51,12 @@ sbuild::error<main::error_code>::error_strings =
};
main::main (options::ptr& options):
- schroot_base::main("schroot-listmounts",
- // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
- // and '-' is an em-dash.
- _("[OPTION…] — list mount points"),
- options,
- false),
+ bin_common::main("schroot-listmounts",
+ // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
+ // and '-' is an em-dash.
+ _("[OPTION…] — list mount points"),
+ options,
+ false),
opts(options)
{
}
diff --git a/libexec/listmounts/main.h b/libexec/listmounts/main.h
index 54379cd2..3982ba86 100644
--- a/libexec/listmounts/main.h
+++ b/libexec/listmounts/main.h
@@ -19,7 +19,7 @@
#ifndef LIBEXEC_LISTMOUNTS_MAIN_H
#define LIBEXEC_LISTMOUNTS_MAIN_H
-#include <schroot-base/main.h>
+#include <bin-common/main.h>
#include <libexec/listmounts/options.h>
@@ -34,7 +34,7 @@ namespace schroot_listmounts
/**
* Frontend for schroot. This class is used to "run" schroot.
*/
- class main : public schroot_base::main
+ class main : public bin_common::main
{
public:
/// Error codes.
diff --git a/libexec/listmounts/options.cc b/libexec/listmounts/options.cc
index 9a63713f..9e3d935e 100644
--- a/libexec/listmounts/options.cc
+++ b/libexec/listmounts/options.cc
@@ -37,7 +37,7 @@ using namespace schroot_listmounts;
const options::action_type options::ACTION_LISTMOUNTS ("listmounts");
options::options ():
- schroot_base::options(),
+ bin_common::options(),
mountpoint(),
mount(_("Mount"))
{
@@ -51,7 +51,7 @@ void
options::add_options ()
{
// Chain up to add basic options.
- schroot_base::options::add_options();
+ bin_common::options::add_options();
action.add(ACTION_LISTMOUNTS);
action.set_default(ACTION_LISTMOUNTS);
@@ -65,7 +65,7 @@ void
options::add_option_groups ()
{
// Chain up to add basic option groups.
- schroot_base::options::add_option_groups();
+ bin_common::options::add_option_groups();
#ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD
if (!mount.options().empty())
@@ -82,7 +82,7 @@ void
options::check_options ()
{
// Chain up to check basic options.
- schroot_base::options::check_options();
+ bin_common::options::check_options();
if (this->action == ACTION_LISTMOUNTS &&
this->mountpoint.empty())
diff --git a/libexec/listmounts/options.h b/libexec/listmounts/options.h
index a90ef9ba..5353276c 100644
--- a/libexec/listmounts/options.h
+++ b/libexec/listmounts/options.h
@@ -19,7 +19,7 @@
#ifndef LIBEXEC_LISTMOUNTS_OPTIONS_H
#define LIBEXEC_LISTMOUNTS_OPTIONS_H
-#include <schroot-base/options.h>
+#include <bin-common/options.h>
#include <string>
@@ -29,7 +29,7 @@ namespace schroot_listmounts
/**
* schroot-listmounts command-line options.
*/
- class options : public schroot_base::options
+ class options : public bin_common::options
{
public:
/// A shared_ptr to an options object.
diff --git a/libexec/mount/Makefile.am b/libexec/mount/Makefile.am
index 61392030..4896433f 100644
--- a/libexec/mount/Makefile.am
+++ b/libexec/mount/Makefile.am
@@ -26,5 +26,5 @@ libexec_mount_mount_SOURCES = \
libexec/mount/mount.cc
libexec_mount_mount_LDADD = $(BOOST_FILESYSTEM_LIBS) \
- $(top_builddir)/lib/schroot-base/libschroot-base.la
+ $(top_builddir)/lib/bin-common/libbin-common.la
diff --git a/libexec/mount/main.cc b/libexec/mount/main.cc
index 9b141e31..e1253de3 100644
--- a/libexec/mount/main.cc
+++ b/libexec/mount/main.cc
@@ -58,12 +58,12 @@ sbuild::error<main::error_code>::error_strings =
};
main::main (options::ptr& options):
- schroot_base::main("schroot-mount",
- // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
- // and '-' is an em-dash.
- _("[OPTION…] — mount filesystems"),
- options,
- false),
+ bin_common::main("schroot-mount",
+ // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
+ // and '-' is an em-dash.
+ _("[OPTION…] — mount filesystems"),
+ options,
+ false),
opts(options)
{
}
diff --git a/libexec/mount/main.h b/libexec/mount/main.h
index 07389d66..4812abe1 100644
--- a/libexec/mount/main.h
+++ b/libexec/mount/main.h
@@ -19,7 +19,7 @@
#ifndef LIBEXEC_MOUNT_MAIN_H
#define LIBEXEC_MOUNT_MAIN_H
-#include <schroot-base/main.h>
+#include <bin-common/main.h>
#include <libexec/mount/options.h>
@@ -34,7 +34,7 @@ namespace schroot_mount
/**
* Frontend for schroot-mount. This class is used to "run" schroot-mount.
*/
- class main : public schroot_base::main
+ class main : public bin_common::main
{
public:
/// Error codes.
diff --git a/libexec/mount/mount.cc b/libexec/mount/mount.cc
index 31876805..1845aae0 100644
--- a/libexec/mount/mount.cc
+++ b/libexec/mount/mount.cc
@@ -21,7 +21,7 @@
#include "options.h"
#include "main.h"
-#include <schroot-base/run.h>
+#include <bin-common/run.h>
using std::endl;
using boost::format;
@@ -42,6 +42,6 @@ int
main (int argc,
char *argv[])
{
- return schroot_base::run
+ return bin_common::run
<schroot_mount::options, schroot_mount::main>(argc, argv);
}
diff --git a/libexec/mount/options.cc b/libexec/mount/options.cc
index bb961a2a..7b7019a5 100644
--- a/libexec/mount/options.cc
+++ b/libexec/mount/options.cc
@@ -38,7 +38,7 @@ using namespace schroot_mount;
const options::action_type options::ACTION_MOUNT ("mount");
options::options ():
- schroot_base::options(),
+ bin_common::options(),
dry_run(false),
fstab(),
mountpoint(),
@@ -54,7 +54,7 @@ void
options::add_options ()
{
// Chain up to add basic options.
- schroot_base::options::add_options();
+ bin_common::options::add_options();
action.add(ACTION_MOUNT);
action.set_default(ACTION_MOUNT);
@@ -73,7 +73,7 @@ void
options::add_option_groups ()
{
// Chain up to add basic option groups.
- schroot_base::options::add_option_groups();
+ bin_common::options::add_option_groups();
#ifndef BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD
if (!mount.options().empty())
@@ -90,7 +90,7 @@ void
options::check_options ()
{
// Chain up to check basic options.
- schroot_base::options::check_options();
+ bin_common::options::check_options();
if (vm.count("dry-run"))
this->dry_run = true;
diff --git a/libexec/mount/options.h b/libexec/mount/options.h
index 9f256433..57b20a39 100644
--- a/libexec/mount/options.h
+++ b/libexec/mount/options.h
@@ -19,7 +19,7 @@
#ifndef LIBEXEC_MOUNT_OPTIONS_H
#define LIBEXEC_MOUNT_OPTIONS_H
-#include <schroot-base/options.h>
+#include <bin-common/options.h>
#include <string>
@@ -29,7 +29,7 @@ namespace schroot_mount
/**
* schroot-mount command-line options.
*/
- class options : public schroot_base::options
+ class options : public bin_common::options
{
public:
/// A shared_ptr to an options object.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 21:18:02 +0000