X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=f33741a8da9a61128d07befac31c0c5bf603693a;hp=f8e03fef4caa29c89b8a5a56a13e7f3f1ac2b354;hb=73f7c2fffd59e46e1f1b47128e7133036f991099;hpb=4446826a37f0c878b21c725584cc664e3145c573

diff --git a/answerscripts.c b/answerscripts.c
index f8e03fe..f33741a 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,20 +1,23 @@
+//#define __WIN32__
 #define PURPLE_PLUGINS
 
 /* Purple headers */
 #include <libpurple/debug.h>
 #include <libpurple/version.h>
 #include <libpurple/conversation.h>
-#include <libpurple/debug.h>
-#include <libpurple/log.h>
+//#include <libpurple/log.h>
 #include <libpurple/plugin.h>
-#include <libpurple/pluginpref.h>
-#include <libpurple/prefs.h>
-#include <libpurple/signals.h>
+//#include <libpurple/signals.h>
 #include <libpurple/util.h>
 #include <libpurple/notify.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
+
+#ifndef __WIN32__
+	#include <fcntl.h>
+#endif
 
 #define ANSWERSCRIPT "answerscripts.exe"
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
@@ -30,26 +33,27 @@ typedef struct {
   PurpleConversation *conv;
 } answerscripts_job;
 
-int answerscripts_process_message(answerscripts_job *job) {
-	//TODO: process scripts and send response asynchronously
+int answerscripts_process_message_cb(answerscripts_job *job) {
 	FILE *pipe = job->pipe;
 	PurpleConversation *conv = job->conv;
 
-	if (pipe && fgets(response, ANSWERSCRIPTS_LINE_LENGTH, pipe)) {
+	if (pipe && !feof(pipe)) {
+		if(!fgets(response, ANSWERSCRIPTS_LINE_LENGTH, pipe)
+			&& (errno == EWOULDBLOCK || errno == EAGAIN)
+		) return 1;
+
 		for(i=0;response[i];i++) if(response[i]=='\n') response[i]=0;
 		purple_conv_im_send(purple_conversation_get_im_data(conv), response);
-		return 1;
+
+		if(!feof(pipe)) return 1;
 	}
 	pclose(pipe);
 	free(job);
 	return 0;
 }
 
-static void
-received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
-
-	/* A workaround to avoid skipping of the first message as a result on NULL-conv: */
-	if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
+	if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who); //* A workaround to avoid skipping of the first message as a result on NULL-conv: */
 
 	buff = purple_markup_strip_html(buffer);
 	//printf("\nHarvie received: %s: %s\n", who, buff); //debug
@@ -63,25 +67,25 @@ received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConver
 	job->pipe = popen(hook_script, "r");
 	job->conv = conv;
 
-	purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, answerscripts_process_message, (gpointer) job);
+	#ifndef __WIN32__
+		int fflags = fcntl(fileno(job->pipe), F_GETFL, 0);
+		fcntl(fileno(job->pipe), F_SETFL, fflags | O_NONBLOCK);
+	#endif
 
+	purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);
 }
 
 
 static gboolean plugin_load(PurplePlugin * plugin) {
 	asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);
-
 	void *conv_handle = purple_conversations_get_handle();
-
-	purple_signal_connect(conv_handle, "received-im-msg",
-			      plugin, PURPLE_CALLBACK(received_im_msg_cb),
-			      NULL);
-	return TRUE;
+	purple_signal_connect(conv_handle, "received-im-msg", plugin, PURPLE_CALLBACK(received_im_msg_cb), NULL);
+	return 0;
 }
 
 static gboolean plugin_unload(PurplePlugin * plugin) {
 	free(hook_script);
-	return TRUE;
+	return 0;
 }
 
 static PurplePluginInfo info = {