Move linestack to libirc.

diff --git a/Makefile b/Makefile
index aff045ed536a9741898f3741c9a5461e4088cb56..c33a75e269d8e4e4536e81a8ef5236203e9ea4a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,14 +42,12 @@ objs = src/posix.o \
           src/cache.o \
           src/util.o \
           src/hooks.o \
-          src/linestack.o \
           src/plugins.o \
           src/settings.o \
           src/log.o \
           src/client.o \
           src/gen_config.o \
           src/repl.o \
-          src/linestack_file.o \
           src/ctcp_redirect.o \
           src/ctcp.o \
           src/motd.o \
@@ -72,7 +70,6 @@ headers = src/admin.h \
                  src/ctcp.h \
                  src/ctrlproxy.h \
                  src/hooks.h \
-                 src/linestack.h \
                  src/log_support.h \
                  src/repl.h \
                  src/settings.h \
@@ -81,10 +78,6 @@ headers = src/admin.h \
                  src/cache.h
 dep_files = $(patsubst %.o, %.d, $(objs))
 
-linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
-       @echo Linking $@
-       @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
-
 ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
        @echo Linking $@
        @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
@@ -200,7 +193,7 @@ cscope.out::
 clean::
        @echo Removing object files and executables
        @rm -f src/*.o daemon/*.o python/*.o testsuite/check ctrlproxy$(EXEEXT) testsuite/*.o *~
-       @rm -f linestack-cmd$(EXEEXT) ctrlproxy-admin$(EXEEXT)
+       @rm -f ctrlproxy-admin$(EXEEXT)
        @rm -f ctrlproxyd$(EXEEXT)
        @rm -f mods/*.$(SHLIBEXT) mods/*.o
        @echo Removing gcov output

diff --git a/configure.ac b/configure.ac
index 1eee40f6711a4ba9914722530a0f8eec0a7183ca..46da73ec5ca8d3a23fbd55d9968e8c9c8911c7f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ PKG_CHECK_MODULES(GNUTLS, gnutls, [
 
 AC_CHECK_LIB(readline, readline, [ 
        AC_DEFINE(HAVE_READLINE, 1, [Whether readline is available])
-       BINS="$BINS linestack-cmd$ac_cv_exeext ctrlproxy-admin$ac_cv_exeext" 
+       BINS="$BINS libirc/tools/linestack-cmd$ac_cv_exeext ctrlproxy-admin$ac_cv_exeext" 
        LIBS="$LIBS -lreadline"
 ])
 

diff --git a/libirc/Makefile b/libirc/Makefile
index 9d55281da19cd308d5bc1748c40294be6109423b..20ccfdf4f15e0b1f0eaacb846dce0bbd21378c7a 100644 (file)
--- a/libirc/Makefile
+++ b/libirc/Makefile
@@ -17,6 +17,8 @@ libirc_objs = \
           $(libircdir)/url.o \
           $(libircdir)/util.o \
           $(libircdir)/listener.o \
+          $(libircdir)/linestack_file.o \
+          $(libircdir)/linestack.o \
           $(LIBIRC_SSL_OBJS)
 
 libirc_headers = \
@@ -29,7 +31,8 @@ libirc_headers = \
                  $(libircdir)/redirect.h \
                  $(libircdir)/url.h \
                  $(libircdir)/listener.h \
-                 $(libircdir)/util.h
+                 $(libircdir)/util.h \
+                 $(libircdir)/linestack.h \
 
 pyirc_objs = $(libircdir)/python/irc.o \
                         $(libircdir)/python/transport.o \
@@ -53,6 +56,14 @@ $(pyirc_objs): CFLAGS+=$(PYTHON_CFLAGS) -fPIC
 $(libircdir)/python/irc.$(SHLIBEXT): $(pyirc_objs) $(LIBIRC)
 $(libircdir)/python/irc.$(SHLIBEXT): LDFLAGS+=$(PYTHON_LDFLAGS) $(LIBS)
 
+$(libircdir)/tools/linestack-cmd$(EXEEXT): $(libircdir)/tools/linestack-cmd.o \
+                                              $(LIBIRC)
+       @echo Linking $@
+       @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
+
+clean::
+       @rm -f linestack-cmd$(EXEEXT) 
+
 python:: $(libircdir)/python/irc.$(SHLIBEXT) 
 
 check-python:: $(libircdir)/python/irc.$(SHLIBEXT)

diff --git a/src/linestack.c b/libirc/linestack.c
similarity index 100%
rename from src/linestack.c
rename to libirc/linestack.c

diff --git a/src/linestack.h b/libirc/linestack.h
similarity index 100%
rename from src/linestack.h
rename to libirc/linestack.h

diff --git a/src/linestack_file.c b/libirc/linestack_file.c
similarity index 99%
rename from src/linestack_file.c
rename to libirc/linestack_file.c
index 9eff731826a0f154ea3246dc4bc17c5131563344..1813da18b4e8e8533f33a99b97ed248f233ba1ce 100644 (file)
--- a/src/linestack_file.c
+++ b/libirc/linestack_file.c
@@ -487,7 +487,7 @@ static gboolean file_insert_state(struct linestack_context *ctx,
                                                          const struct irc_network_state *state, 
                                                          guint64 state_id);
 
-static char *global_init(const char *basedir)
+static const char *global_init(const char *basedir)
 {
        char *readme_file;;
        if (g_file_test(basedir, G_FILE_TEST_IS_DIR))
@@ -508,19 +508,19 @@ static gboolean file_init(struct linestack_context *ctx, const char *name,
                                                  const struct irc_network_state *state)
 {
        struct lf_data *data = g_new0(struct lf_data, 1);
-       char *parent_dir, *data_dir, *data_file;
+       char *data_dir, *data_file;
        char *index_file, *state_file;
        GError *error = NULL;
        const char *fname;
        GDir *dir;
        const char *mode;
 
-       parent_dir = global_init(basedir);
+       if (!global_init(basedir)) 
+               return FALSE;
 
-       data_dir = g_build_filename(parent_dir, name, NULL);
+       data_dir = g_build_filename(basedir, name, NULL);
        g_assert(data_dir != NULL);
 
-       g_free(parent_dir);
        g_mkdir(data_dir, 0700);
        data_file = g_build_filename(data_dir, "lines", NULL);
        g_assert(data_file != NULL);

diff --git a/src/linestack-cmd.c b/libirc/tools/linestack-cmd.c
similarity index 98%
rename from src/linestack-cmd.c
rename to libirc/tools/linestack-cmd.c
index d7d799696efa1721b47fe7459275dd3461b7bb6c..43c6b8498a73cf85d45d9414caedf62a7d07afdc 100644 (file)
--- a/src/linestack-cmd.c
+++ b/libirc/tools/linestack-cmd.c
@@ -10,6 +10,7 @@
 
 static struct linestack_context *ctx = NULL;
 static struct irc_network_state *state = NULL;
+void log_global(enum log_level ll, const char *fmt, ...) { /* FIXME */}
 
 static void handle_help(int, char **);
 static void handle_mark(int, char **);