Move autorun_startup in fe-common-core.c and remove autorun.{c,h}.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4785 dbcabf3a-b0e7-0310-adc4-f8d773084564

1 files changed, 31 insertions, 1 deletions

diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index a8076158..ada22785 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -32,7 +32,7 @@
 #include "channels.h"
 #include "servers-setup.h"
 
-#include "autorun.h"
+#include "special-vars.h"
 #include "fe-core-commands.h"
 #include "fe-queries.h"
 #include "hilight-text.h"
@@ -392,6 +392,36 @@ static void sig_setup_changed(void)
 		create_windows();
 }
 
+static void autorun_startup(void)
+{
+	char *path;
+	GIOChannel *handle;
+	GString *buf;
+	gsize tpos;
+
+	/* open ~/.irssi/startup and run all commands in it */
+	path = g_strdup_printf("%s/startup", get_irssi_dir());
+	handle = g_io_channel_new_file(path, "r", NULL);
+	g_free(path);
+	if (handle == NULL) {
+		/* file not found */
+		return;
+	}
+
+	buf = g_string_sized_new(512);
+	while (g_io_channel_read_line_string(handle, buf, &tpos, NULL) == G_IO_STATUS_NORMAL) {
+		buf->str[tpos] = '\0';
+		if (buf->str[0] != '#') {
+			eval_special_string(buf->str, "",
+					    active_win->active_server,
+					    active_win->active);
+		}
+	}
+	g_string_free(buf, TRUE);
+
+	g_io_channel_close(handle);
+}
+
 void fe_common_core_finish_init(void)
 {
 	int setup_changed;