utils: move knotc from knot/ctl

Knot.files

@@ -237,6 +237,8 @@ src/knot/common/fdset.c
 src/knot/common/fdset.h
 src/knot/common/log.c
 src/knot/common/log.h
+src/knot/common/process.c
+src/knot/common/process.h
 src/knot/common/ref.c
 src/knot/common/ref.h
 src/knot/common/time.h
@@ -253,11 +255,6 @@ src/knot/conf/scheme.c
 src/knot/conf/scheme.h
 src/knot/conf/tools.c
 src/knot/conf/tools.h
-src/knot/ctl/estimator.c
-src/knot/ctl/estimator.h
-src/knot/ctl/knotc_main.c
-src/knot/ctl/process.c
-src/knot/ctl/process.h
 src/knot/ctl/remote.c
 src/knot/ctl/remote.h
 src/knot/dnssec/context.c
@@ -492,6 +489,9 @@ src/utils/knot1to2/includes.c
 src/utils/knot1to2/includes.h
 src/utils/knot1to2/main.c
 src/utils/knot1to2/scheme.h
+src/utils/knotc/estimator.c
+src/utils/knotc/estimator.h
+src/utils/knotc/main.c
 src/utils/knsupdate/knsupdate_exec.c
 src/utils/knsupdate/knsupdate_exec.h
 src/utils/knsupdate/knsupdate_main.c

src/Makefile.am

@@ -203,7 +203,9 @@ EXTRA_DIST += 					\
 	utils/knot1to2/cf-parse.y
 
 knotc_SOURCES =					\
-	knot/ctl/knotc_main.c
+	utils/knotc/estimator.c			\
+	utils/knotc/estimator.h			\
+	utils/knotc/main.c
 
 knotd_SOURCES =					\
 	knot/main.c
@@ -233,10 +235,6 @@ libknotd_la_SOURCES =				\
 	knot/conf/scheme.h			\
 	knot/conf/tools.c			\
 	knot/conf/tools.h			\
-	knot/ctl/estimator.c			\
-	knot/ctl/estimator.h			\
-	knot/ctl/process.c			\
-	knot/ctl/process.h			\
 	knot/ctl/remote.c			\
 	knot/ctl/remote.h			\
 	knot/dnssec/context.c			\
@@ -293,6 +291,8 @@ libknotd_la_SOURCES =				\
 	knot/common/fdset.h			\
 	knot/common/log.c			\
 	knot/common/log.h			\
+	knot/common/process.c			\
+	knot/common/process.h			\
 	knot/common/ref.c			\
 	knot/common/ref.h			\
 	knot/server/dthreads.c			\

src/knot/ctl/process.c → src/knot/common/process.c

@@ -28,9 +28,9 @@
 #include <pwd.h>
 #include <urcu.h>
 
-#include "knot/ctl/process.h"
-#include "knot/conf/conf.h"
 #include "knot/common/log.h"
+#include "knot/common/pid.h"
+#include "knot/conf/conf.h"
 #include "libknot/libknot.h"
 
 char* pid_filename()

src/knot/main.c

@@ -33,10 +33,10 @@
 
 #include "dnssec/crypto.h"
 #include "libknot/libknot.h"
-#include "knot/ctl/process.h"
 #include "knot/ctl/remote.h"
 #include "knot/conf/conf.h"
 #include "knot/common/log.h"
+#include "knot/common/process.h"
 #include "knot/server/server.h"
 #include "knot/server/tcp-handler.h"
 #include "knot/zone/timers.h"

src/knot/ctl/estimator.c → src/utils/knotc/estimator.c

@@ -16,7 +16,7 @@
 
 #include <assert.h>
 
-#include "knot/ctl/estimator.h"
+#include "utils/knotc/estimator.h"
 #include "knot/zone/node.h"
 #include "libknot/errcode.h"
 #include "libknot/dname.h"

src/knot/ctl/knotc_main.c → src/utils/knotc/main.c

@@ -28,7 +28,6 @@
 #include "dnssec/crypto.h"
 #include "libknot/libknot.h"
 #include "knot/common/log.h"
-#include "knot/ctl/estimator.h"
 #include "knot/ctl/remote.h"
 #include "knot/conf/conf.h"
 #include "knot/server/tcp-handler.h"
@@ -38,6 +37,7 @@
 #include "contrib/net.h"
 #include "contrib/sockaddr.h"
 #include "contrib/string.h"
+#include "utils/knotc/estimator.h"
 
 /*! \brief Controller flags. */
 enum knotc_flag_t {