From ef3517dc3971eaf3986331b532f201e52dea7817 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 8 Aug 2010 22:22:11 +0200
Subject: [PATCH] =?utf8?q?Renamed=20=E2=80=98collectd-flush=E2=80=99=20to?=
 =?utf8?q?=20=E2=80=98collectdctl=E2=80=99=20(collectd=20control=20interfa?=
 =?utf8?q?ce).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/Makefile.am                             | 18 +++++++++---------
 src/{collectd-flush.c => collectdctl.c}     |  6 ++++--
 src/{collectd-flush.pod => collectdctl.pod} |  0
 3 files changed, 13 insertions(+), 11 deletions(-)
 rename src/{collectd-flush.c => collectdctl.c} (97%)
 rename src/{collectd-flush.pod => collectdctl.pod} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index c5087142..08006291 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
 
 sbin_PROGRAMS = collectd collectdmon
-bin_PROGRAMS = collectd-nagios collectd-flush
+bin_PROGRAMS = collectd-nagios collectdctl
 
 collectd_SOURCES = collectd.c collectd.h \
 		   common.c common.h \
@@ -106,16 +106,16 @@ collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la
 collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 
-collectd_flush_SOURCES = collectd-flush.c
-collectd_flush_LDADD =
+collectdctl_SOURCES = collectdctl.c
+collectdctl_LDADD =
 if BUILD_WITH_LIBSOCKET
-collectd_flush_LDADD += -lsocket
+collectdctl_LDADD += -lsocket
 endif
 if BUILD_AIX
-collectd_flush_LDADD += -lm
+collectdctl_LDADD += -lm
 endif
-collectd_flush_LDADD += libcollectdclient/libcollectdclient.la
-collectd_flush_DEPENDENCIES = libcollectdclient/libcollectdclient.la
+collectdctl_LDADD += libcollectdclient/libcollectdclient.la
+collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 
 pkglib_LTLIBRARIES = 
@@ -1237,7 +1237,7 @@ dist_man_MANS = collectd.1 \
 		collectd.conf.5 \
 		collectd-email.5 \
 		collectd-exec.5 \
-		collectd-flush.1 \
+		collectdctl.1 \
 		collectd-java.5 \
 		collectdmon.1 \
 		collectd-nagios.1 \
@@ -1254,7 +1254,7 @@ EXTRA_DIST = types.db pinba.proto
 EXTRA_DIST +=   collectd.conf.pod \
 		collectd-email.pod \
 		collectd-exec.pod \
-		collectd-flush.pod \
+		collectdctl.pod \
 		collectd-java.pod \
 		collectdmon.pod \
 		collectd-nagios.pod \
diff --git a/src/collectd-flush.c b/src/collectdctl.c
similarity index 97%
rename from src/collectd-flush.c
rename to src/collectdctl.c
index 2183013a..6e53ddc1 100644
--- a/src/collectd-flush.c
+++ b/src/collectdctl.c
@@ -1,6 +1,7 @@
 /**
- * collectd-flush - src/collectd-flush.c
+ * collectd - src/collectdctl.c
  * Copyright (C) 2010 Håkon J Dugstad Johnsen
+ * Copyright (C) 2010 Sebastian Harl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Håkon J Dugstad Johnsen <hakon-dugstad.johnsen at telenor.com>
+ *   Sebastian "tokkee" Harl <sh@tokkee.org>
  **/
 
 #if HAVE_CONFIG_H
@@ -68,7 +70,7 @@ static void exit_usage (const char *name, int status) {
 
       "\nExample:\n\n"
 
-      "  collectd-flush flush plugin=rrdtool identifie=somehost/cpu-0/cpu-wait\n\n"
+      "  collectdctl flush plugin=rrdtool identifie=somehost/cpu-0/cpu-wait\n\n"
 
       "Flushes all CPU wait RRD values of the first CPU of the local host.\n"
       "I.e., writes all pending RRD updates of that data-source to disk.\n"
diff --git a/src/collectd-flush.pod b/src/collectdctl.pod
similarity index 100%
rename from src/collectd-flush.pod
rename to src/collectdctl.pod
-- 
2.11.0