Merge pull request #114 from garlick/reorg

move source to src/ and man pages to man/
chaos · Jan 2, 2025 · cf8ca6a · cf8ca6a
2 parents 963213f + e97e68d
commit cf8ca6a
Show file tree

Hide file tree

Showing 141 changed files with 360 additions and 374 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,10 +1,6 @@
 SUBDIRS = \
-	liblsd \
-	libnpfs \
-	libnpclient \
-	libdiod \
-	diod \
-	utils \
+	src \
+	man \
 	etc
 
 if ENABLE_TESTS

diff --git a/configure.ac b/configure.ac
@@ -217,23 +217,25 @@ RRA_WITH_SYSTEMD_UNITDIR
 AC_CONFIG_FILES( \
   Makefile \
   diod.spec \
-  libdiod/Makefile \
-  liblsd/Makefile \
-  libnpfs/Makefile \
-  libnpclient/Makefile \
-  diod/diod.8 \
-  utils/diodmount.8 \
-  utils/diodcat.8 \
-  utils/dtop.8 \
-  utils/diodload.8 \
-  utils/diodls.8 \
-  utils/diodshowmount.8 \
-  utils/dioddate.8 \
-  etc/diod.conf.5 \
+  src/libdiod/Makefile \
+  src/liblsd/Makefile \
+  src/libnpfs/Makefile \
+  src/libnpclient/Makefile \
+  man/Makefile \
+  man/diod.8 \
+  man/diodmount.8 \
+  man/diodcat.8 \
+  man/dtop.8 \
+  man/diodload.8 \
+  man/diodls.8 \
+  man/diodshowmount.8 \
+  man/dioddate.8 \
+  man/diod.conf.5 \
   etc/diod.service \
   etc/auto.diod \
-  diod/Makefile \
-  utils/Makefile \
+  src/daemon/Makefile \
+  src/cmd/Makefile \
+  src/Makefile \
   tests/Makefile \
   tests/misc/Makefile \
   tests/kern/Makefile \

diff --git a/etc/Makefile.am b/etc/Makefile.am
@@ -1,9 +1,6 @@
 systemdsystemunit_DATA = \
 	diod.service
 
-man5_MANS = \
-	diod.conf.5
-
 sysconf_DATA = \
 	diod.conf \
 	auto.diod

diff --git a/man/Makefile.am b/man/Makefile.am
@@ -0,0 +1,15 @@
+man5_MANS = \
+	diod.conf.5
+
+man8_MANS = \
+	diod.8 \
+	diodcat.8 \
+	dioddate.8 \
+	diodload.8 \
+	diodls.8 \
+	diodshowmount.8 \
+	dtop.8
+
+if ENABLE_DIODMOUNT
+man8_MANS += diodmount.8
+endif
diff --git a/diod/diod.8.in → man/diod.8.in b/diod/diod.8.in → man/diod.8.in
diff --git a/etc/diod.conf.5.in → man/diod.conf.5.in b/etc/diod.conf.5.in → man/diod.conf.5.in
diff --git a/utils/diodcat.8.in → man/diodcat.8.in b/utils/diodcat.8.in → man/diodcat.8.in
diff --git a/utils/dioddate.8.in → man/dioddate.8.in b/utils/dioddate.8.in → man/dioddate.8.in
diff --git a/utils/diodload.8.in → man/diodload.8.in b/utils/diodload.8.in → man/diodload.8.in
diff --git a/utils/diodls.8.in → man/diodls.8.in b/utils/diodls.8.in → man/diodls.8.in
diff --git a/utils/diodmount.8.in → man/diodmount.8.in b/utils/diodmount.8.in → man/diodmount.8.in
diff --git a/utils/diodshowmount.8.in → man/diodshowmount.8.in b/utils/diodshowmount.8.in → man/diodshowmount.8.in
diff --git a/utils/dtop.8.in → man/dtop.8.in b/utils/dtop.8.in → man/dtop.8.in
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = \
+	liblsd \
+	libnpfs \
+	libnpclient \
+	libdiod \
+	daemon \
+	cmd
diff --git a/utils/Makefile.am → src/cmd/Makefile.am b/utils/Makefile.am → src/cmd/Makefile.am
@@ -1,10 +1,7 @@
 AM_CFLAGS = @WARNING_CFLAGS@
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libnpfs \
-	-I$(top_srcdir)/liblsd \
-	-I$(top_srcdir)/libdiod \
-	-I$(top_srcdir)/libnpclient \
+	-I$(top_srcdir) \
 	$(LUA_INCLUDE)
 AM_CPPFLAGS += $(ncurses_CPPFLAGS)
 
@@ -15,10 +12,10 @@ sbin_PROGRAMS += diodmount
 endif
 
 common_ldadd = \
-	$(top_builddir)/libdiod/libdiod.a \
-	$(top_builddir)/libnpclient/libnpclient.a \
-	$(top_builddir)/libnpfs/libnpfs.a \
-	$(top_builddir)/liblsd/liblsd.a \
+	$(top_builddir)/src/libdiod/libdiod.a \
+	$(top_builddir)/src/libnpclient/libnpclient.a \
+	$(top_builddir)/src/libnpfs/libnpfs.a \
+	$(top_builddir)/src/liblsd/liblsd.a \
 	$(LIBWRAP) $(LIBPTHREAD) $(LUA_LIB) $(LIBMUNGE) $(LIBCAP) \
 	$(LIBIBVERBS) $(LIBRDMACM) $(LIBTCMALLOC) $(ncurses_LIBS)
 
@@ -46,15 +43,3 @@ diodshowmount_SOURCES = diodshowmount.c $(common_sources)
 
 dioddate_LDADD = $(common_ldadd)
 dioddate_SOURCES = dioddate.c $(common_sources)
-
-man8_MANS = \
-	diodcat.8 \
-	dtop.8 \
-	diodload.8 \
-	diodls.8 \
-	diodshowmount.8 \
-	dioddate.8
-
-if ENABLE_DIODMOUNT
-man8_MANS += diodmount.8
-endif
diff --git a/utils/diodcat.c → src/cmd/diodcat.c b/utils/diodcat.c → src/cmd/diodcat.c
@@ -30,14 +30,14 @@
 #include <libgen.h>
 #include <signal.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-
-#include "list.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+
+#include "src/liblsd/list.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 
 #define OPTIONS "a:s:m:u:t:p"
 #if HAVE_GETOPT_LONG

diff --git a/utils/dioddate.c → src/cmd/dioddate.c b/utils/dioddate.c → src/cmd/dioddate.c
@@ -33,14 +33,14 @@
 #include <libgen.h>
 #include <signal.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-
-#include "list.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+
+#include "src/liblsd/list.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 
 #define OPTIONS "s:m:u:t:S"
 #if HAVE_GETOPT_LONG

diff --git a/utils/diodload.c → src/cmd/diodload.c b/utils/diodload.c → src/cmd/diodload.c
@@ -33,14 +33,14 @@
 #include <time.h>
 #include <pthread.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
 
-#include "list.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/liblsd/list.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 
 #define OPTIONS "s:m:n:r:g"
 #if HAVE_GETOPT_LONG

diff --git a/utils/diodls.c → src/cmd/diodls.c b/utils/diodls.c → src/cmd/diodls.c
@@ -34,14 +34,14 @@
 #include <grp.h>
 #include <time.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-
-#include "list.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+
+#include "src/liblsd/list.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 
 #define OPTIONS "a:s:m:u:t:lp"
 #if HAVE_GETOPT_LONG

diff --git a/utils/diodmount.c → src/cmd/diodmount.c b/utils/diodmount.c → src/cmd/diodmount.c
@@ -47,14 +47,14 @@
 #define PATH_MAX 1024
 #endif
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-#include "list.h"
-#include "hostlist.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+#include "src/liblsd/list.h"
+#include "src/liblsd/hostlist.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 #include "opt.h"
 
 #define OPTIONS "fnvo:adp"

diff --git a/utils/diodshowmount.c → src/cmd/diodshowmount.c b/utils/diodshowmount.c → src/cmd/diodshowmount.c
@@ -30,15 +30,15 @@
 #include <libgen.h>
 #include <signal.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-
-#include "list.h"
-#include "hostlist.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+
+#include "src/liblsd/list.h"
+#include "src/liblsd/hostlist.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 
 #define OPTIONS "s:m:u:t:l"
 #if HAVE_GETOPT_LONG

diff --git a/utils/dtop.c → src/cmd/dtop.c b/utils/dtop.c → src/cmd/dtop.c
@@ -37,16 +37,16 @@
 #include <dirent.h>
 #include <limits.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "npclient.h"
-#include "xpthread.h"
-
-#include "list.h"
-#include "hostlist.h"
-#include "diod_log.h"
-#include "diod_sock.h"
-#include "diod_auth.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/libnpclient/npclient.h"
+#include "src/libnpfs/xpthread.h"
+
+#include "src/liblsd/list.h"
+#include "src/liblsd/hostlist.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_sock.h"
+#include "src/libdiod/diod_auth.h"
 #include "sample.h"
 
 int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...)

diff --git a/utils/opt.c → src/cmd/opt.c b/utils/opt.c → src/cmd/opt.c
@@ -21,13 +21,13 @@
 #include <stdarg.h>
 #include <inttypes.h>
 
-#include "9p.h"
-#include "npfs.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
 
-#include "diod_log.h"
+#include "src/libdiod/diod_log.h"
 
 #include "opt.h"
-#include "list.h"
+#include "src/liblsd/list.h"
 
 #define OPT_MAGIC 0x54545344
 

diff --git a/utils/opt.h → src/cmd/opt.h b/utils/opt.h → src/cmd/opt.h
diff --git a/utils/sample.c → src/cmd/sample.c b/utils/sample.c → src/cmd/sample.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include "diod_log.h"
+#include "src/libdiod/diod_log.h"
 #include "sample.h"
 
 struct sample_struct {

diff --git a/utils/sample.h → src/cmd/sample.h b/utils/sample.h → src/cmd/sample.h
diff --git a/diod/Makefile.am → src/daemon/Makefile.am b/diod/Makefile.am → src/daemon/Makefile.am
@@ -1,18 +1,16 @@
 AM_CFLAGS = @WARNING_CFLAGS@
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libnpfs \
-	-I$(top_srcdir)/liblsd \
-	-I$(top_srcdir)/libdiod \
+	-I$(top_srcdir) \
 	$(LUA_INCLUDE)
 
 sbin_PROGRAMS = diod
 
 diod_LDADD = \
-	$(top_builddir)/libdiod/libdiod.a \
-	$(top_builddir)/libnpclient/libnpclient.a \
-	$(top_builddir)/libnpfs/libnpfs.a \
-	$(top_builddir)/liblsd/liblsd.a \
+	$(top_builddir)/src/libdiod/libdiod.a \
+	$(top_builddir)/src/libnpclient/libnpclient.a \
+	$(top_builddir)/src/libnpfs/libnpfs.a \
+	$(top_builddir)/src/liblsd/liblsd.a \
 	$(LIBWRAP) $(LIBPTHREAD) $(LUA_LIB) $(LIBMUNGE) $(LIBCAP) \
 	$(LIBIBVERBS) $(LIBRDMACM) $(LIBTCMALLOC)
 
@@ -28,6 +26,3 @@ diod_SOURCES = \
 	fid.h \
 	xattr.c \
 	xattr.h
-
-man8_MANS = \
-        diod.8
diff --git a/diod/diod.c → src/daemon/diod.c b/diod/diod.c → src/daemon/diod.c
@@ -41,21 +41,21 @@
 #include <signal.h>
 #include <pthread.h>
 
-#include "9p.h"
-#include "npfs.h"
-#include "list.h"
+#include "src/libnpfs/9p.h"
+#include "src/libnpfs/npfs.h"
+#include "src/liblsd/list.h"
 
-#include "diod_log.h"
-#include "diod_conf.h"
-#include "diod_sock.h"
+#include "src/libdiod/diod_log.h"
+#include "src/libdiod/diod_conf.h"
+#include "src/libdiod/diod_sock.h"
 #if WITH_RDMATRANS
-#include "diod_rdma.h"
+#include "src/libdiod/diod_rdma.h"
 #endif
 
 #include "ops.h"
 
 #if USE_IMPERSONATION_GANESHA
-#include "ganesha-syscalls.h"
+#include "src/libnpfs/ganesha-syscalls.h"
 #endif
 
 typedef enum { SRV_FILEDES, SRV_SOCKTEST, SRV_NORMAL } srvmode_t;