Rename, step 1: rename directories, but not build products.

unioslo · Sep 15, 2016 · 8c5c009 · 8c5c009
1 parent ea1ec10
commit 8c5c009
Show file tree

Hide file tree

Showing 47 changed files with 58 additions and 58 deletions.
diff --git a/bin/fly/Makefile.am b/bin/fly/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS		 = -I$(top_srcdir)/include
 sbin_PROGRAMS		 = fly
 fly_SOURCES		 = fly.c
-fly_LDADD		 = $(top_builddir)/lib/libfc/libfc.a
+fly_LDADD		 = $(top_builddir)/lib/libft/libfc.a
 dist_man1_MANS		 = fly.1
diff --git a/bin/fly/fly.c b/bin/fly/fly.c
@@ -42,9 +42,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <fc/ctype.h>
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/ctype.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #define FLY_DEFAULT_PORT 80
 static const char data[] = "GET / HTTP/0.9\r\n\r\n";

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.59])
 AC_INIT([Flycatcher], [0.20160915], [d.e.smorgrav@usit.uio.no],
     [flycatcher], [https://www.github.com/unioslo/flycatcher])
-AC_CONFIG_SRCDIR([sbin/flycatcher/flycatcher.c])
+AC_CONFIG_SRCDIR([sbin/flytrap/flycatcher.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(include/config.h)
@@ -93,11 +93,11 @@ AC_CONFIG_FILES([
     Makefile
     include/Makefile
     lib/Makefile
-    lib/libfc/Makefile
+    lib/libft/Makefile
     bin/Makefile
     bin/fly/Makefile
     sbin/Makefile
-    sbin/flycatcher/Makefile
+    sbin/flytrap/Makefile
     rc/Makefile
     rc/flycatcher.logrotate
     rc/flycatcher.systemd

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -1,11 +1,11 @@
 noinst_HEADERS =
-noinst_HEADERS += fc/assert.h
-noinst_HEADERS += fc/ctype.h
-noinst_HEADERS += fc/dict.h
-noinst_HEADERS += fc/endian.h
-noinst_HEADERS += fc/flopen.h
-noinst_HEADERS += fc/hash.h
-noinst_HEADERS += fc/log.h
-noinst_HEADERS += fc/pidfile.h
-noinst_HEADERS += fc/sbuf.h
-noinst_HEADERS += fc/strutil.h
+noinst_HEADERS += ft/assert.h
+noinst_HEADERS += ft/ctype.h
+noinst_HEADERS += ft/dict.h
+noinst_HEADERS += ft/endian.h
+noinst_HEADERS += ft/flopen.h
+noinst_HEADERS += ft/hash.h
+noinst_HEADERS += ft/log.h
+noinst_HEADERS += ft/pidfile.h
+noinst_HEADERS += ft/sbuf.h
+noinst_HEADERS += ft/strutil.h
diff --git a/include/fc/assert.h → include/ft/assert.h b/include/fc/assert.h → include/ft/assert.h
diff --git a/include/fc/ctype.h → include/ft/ctype.h b/include/fc/ctype.h → include/ft/ctype.h
diff --git a/include/fc/dict.h → include/ft/dict.h b/include/fc/dict.h → include/ft/dict.h
diff --git a/include/fc/endian.h → include/ft/endian.h b/include/fc/endian.h → include/ft/endian.h
diff --git a/include/fc/flopen.h → include/ft/flopen.h b/include/fc/flopen.h → include/ft/flopen.h
diff --git a/include/fc/hash.h → include/ft/hash.h b/include/fc/hash.h → include/ft/hash.h
diff --git a/include/fc/log.h → include/ft/log.h b/include/fc/log.h → include/ft/log.h
diff --git a/include/fc/pidfile.h → include/ft/pidfile.h b/include/fc/pidfile.h → include/ft/pidfile.h
diff --git a/include/fc/sbuf.h → include/ft/sbuf.h b/include/fc/sbuf.h → include/ft/sbuf.h
diff --git a/include/fc/strutil.h → include/ft/strutil.h b/include/fc/strutil.h → include/ft/strutil.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libfc
+SUBDIRS = libft
diff --git a/lib/libfc/Makefile.am → lib/libft/Makefile.am b/lib/libfc/Makefile.am → lib/libft/Makefile.am
diff --git a/lib/libfc/fc_assert.c → lib/libft/fc_assert.c b/lib/libfc/fc_assert.c → lib/libft/fc_assert.c
@@ -34,9 +34,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include <fc/assert.h>
+#include <ft/assert.h>
 #define FC_LOGV_REQUIRED
-#include <fc/log.h>
+#include <ft/log.h>
 
 void
 fc_abort(const char *fmt, ...)

diff --git a/lib/libfc/fc_dict.c → lib/libft/fc_dict.c b/lib/libfc/fc_dict.c → lib/libft/fc_dict.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/dict.h>
-#include <fc/hash.h>
+#include <ft/dict.h>
+#include <ft/hash.h>
 
 struct fc_dict_ent {
 	const char		*key;

diff --git a/lib/libfc/fc_flopen.c → lib/libft/fc_flopen.c b/lib/libfc/fc_flopen.c → lib/libft/fc_flopen.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "fc/flopen.h"
+#include "ft/flopen.h"
 
 int
 fc_flopen(const char *path, int flags, ...)

diff --git a/lib/libfc/fc_hash.c → lib/libft/fc_hash.c b/lib/libfc/fc_hash.c → lib/libft/fc_hash.c
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <fc/hash.h>
+#include <ft/hash.h>
 
 /*
  * Implementation of the hash function described in Pearson, Peter

diff --git a/lib/libfc/fc_log.c → lib/libft/fc_log.c b/lib/libfc/fc_log.c → lib/libft/fc_log.c
@@ -39,8 +39,8 @@
 #include <syslog.h>
 
 #define FC_LOGV_REQUIRED
-#include <fc/log.h>
-#include <fc/strutil.h>
+#include <ft/log.h>
+#include <ft/strutil.h>
 
 static char fc_prog_name[16];
 fc_log_level_t fc_log_level;

diff --git a/lib/libfc/fc_pidfile.c → lib/libft/fc_pidfile.c b/lib/libfc/fc_pidfile.c → lib/libft/fc_pidfile.c
@@ -45,8 +45,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "fc/flopen.h"
-#include "fc/pidfile.h"
+#include "ft/flopen.h"
+#include "ft/pidfile.h"
 
 struct fc_pidfh {
 	int	pf_fd;

diff --git a/lib/libfc/fc_readlinev.c → lib/libft/fc_readlinev.c b/lib/libfc/fc_readlinev.c → lib/libft/fc_readlinev.c
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fc/strutil.h>
+#include <ft/strutil.h>
 
 #define MIN_WORDV_SIZE	32
 

diff --git a/lib/libfc/fc_readword.c → lib/libft/fc_readword.c b/lib/libfc/fc_readword.c → lib/libft/fc_readword.c
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <fc/ctype.h>
-#include "fc/strutil.h"
+#include <ft/ctype.h>
+#include "ft/strutil.h"
 
 #define MIN_WORD_SIZE	32
 

diff --git a/lib/libfc/fc_sbuf.c → lib/libft/fc_sbuf.c b/lib/libfc/fc_sbuf.c → lib/libft/fc_sbuf.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/sbuf.h>
+#include <ft/sbuf.h>
 
 #define	KASSERT(e, m)		assert(e)
 #define	SBMALLOC(size)		malloc(size)

diff --git a/lib/libfc/fc_strlcat.c → lib/libft/fc_strlcat.c b/lib/libfc/fc_strlcat.c → lib/libft/fc_strlcat.c
@@ -36,7 +36,7 @@
 
 #include <stddef.h>
 
-#include <fc/strutil.h>
+#include <ft/strutil.h>
 
 /*
  * Like strcat(3), but always NUL-terminates; returns strlen(src)

diff --git a/lib/libfc/fc_strlcpy.c → lib/libft/fc_strlcpy.c b/lib/libfc/fc_strlcpy.c → lib/libft/fc_strlcpy.c
@@ -36,7 +36,7 @@
 
 #include <stddef.h>
 
-#include <fc/strutil.h>
+#include <ft/strutil.h>
 
 /*
  * Like strcpy(3), but always NUL-terminates; returns strlen(src)

diff --git a/sbin/Makefile.am b/sbin/Makefile.am
@@ -1 +1 @@
-SUBDIRS = flycatcher
+SUBDIRS = flytrap
diff --git a/sbin/flycatcher/.gitignore → sbin/flytrap/.gitignore b/sbin/flycatcher/.gitignore → sbin/flytrap/.gitignore
diff --git a/sbin/flycatcher/Makefile.am → sbin/flytrap/Makefile.am b/sbin/flycatcher/Makefile.am → sbin/flytrap/Makefile.am
@@ -20,7 +20,7 @@ flycatcher_SOURCES	+= ip4.c
 flycatcher_SOURCES	+= tcp4.c
 flycatcher_SOURCES	+= udp4.c
 
-flycatcher_LDADD	 = $(LIBPCAP) $(top_builddir)/lib/libfc/libfc.a
+flycatcher_LDADD	 = $(LIBPCAP) $(top_builddir)/lib/libft/libfc.a
 
 noinst_HEADERS		 =
 noinst_HEADERS		+= ethernet.h

diff --git a/sbin/flycatcher/arp.c → sbin/flytrap/arp.c b/sbin/flycatcher/arp.c → sbin/flytrap/arp.c
@@ -39,9 +39,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/assert.h>
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/assert.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/crc32.c → sbin/flytrap/crc32.c b/sbin/flycatcher/crc32.c → sbin/flytrap/crc32.c
diff --git a/sbin/flycatcher/ether.c → sbin/flytrap/ether.c b/sbin/flycatcher/ether.c → sbin/flytrap/ether.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/ethernet.h → sbin/flytrap/ethernet.h b/sbin/flycatcher/ethernet.h → sbin/flytrap/ethernet.h
diff --git a/sbin/flycatcher/flycatcher.8 → sbin/flytrap/flycatcher.8 b/sbin/flycatcher/flycatcher.8 → sbin/flytrap/flycatcher.8
diff --git a/sbin/flycatcher/flycatcher.c → sbin/flytrap/flycatcher.c b/sbin/flycatcher/flycatcher.c → sbin/flytrap/flycatcher.c
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/log.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 

diff --git a/sbin/flycatcher/flycatcher.h → sbin/flytrap/flycatcher.h b/sbin/flycatcher/flycatcher.h → sbin/flytrap/flycatcher.h
diff --git a/sbin/flycatcher/icmp4.c → sbin/flytrap/icmp4.c b/sbin/flycatcher/icmp4.c → sbin/flytrap/icmp4.c
@@ -41,9 +41,9 @@
 
 #include <arpa/inet.h>
 
-#include <fc/assert.h>
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/assert.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/iface.c → sbin/flytrap/iface.c b/sbin/flycatcher/iface.c → sbin/flytrap/iface.c
@@ -47,9 +47,9 @@
 #error pcap library required
 #endif
 
-#include <fc/log.h>
-#include <fc/sbuf.h>
-#include <fc/strutil.h>
+#include <ft/log.h>
+#include <ft/sbuf.h>
+#include <ft/strutil.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/iface.h → sbin/flytrap/iface.h b/sbin/flycatcher/iface.h → sbin/flytrap/iface.h
diff --git a/sbin/flycatcher/ip4.c → sbin/flytrap/ip4.c b/sbin/flycatcher/ip4.c → sbin/flytrap/ip4.c
@@ -41,10 +41,10 @@
 
 #include <arpa/inet.h>
 
-#include <fc/assert.h>
-#include <fc/ctype.h>
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/assert.h>
+#include <ft/ctype.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/log.c → sbin/flytrap/log.c b/sbin/flycatcher/log.c → sbin/flytrap/log.c
diff --git a/sbin/flycatcher/main.c → sbin/flytrap/main.c b/sbin/flycatcher/main.c → sbin/flytrap/main.c
@@ -38,8 +38,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <fc/log.h>
-#include <fc/pidfile.h>
+#include <ft/log.h>
+#include <ft/pidfile.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/packet.c → sbin/flytrap/packet.c b/sbin/flycatcher/packet.c → sbin/flytrap/packet.c
diff --git a/sbin/flycatcher/packet.h → sbin/flytrap/packet.h b/sbin/flycatcher/packet.h → sbin/flytrap/packet.h
diff --git a/sbin/flycatcher/tcp4.c → sbin/flytrap/tcp4.c b/sbin/flycatcher/tcp4.c → sbin/flytrap/tcp4.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"

diff --git a/sbin/flycatcher/udp4.c → sbin/flytrap/udp4.c b/sbin/flycatcher/udp4.c → sbin/flytrap/udp4.c
@@ -36,8 +36,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <fc/endian.h>
-#include <fc/log.h>
+#include <ft/endian.h>
+#include <ft/log.h>
 
 #include "flycatcher.h"
 #include "ethernet.h"