author | Myhailo Danylenko <isbear@ukrpost.net> |
Fri, 04 Mar 2016 14:17:38 +0200 | |
changeset 90 | bed5beae28c5 |
parent 87 | 78238d26911a |
child 92 | 66f7e2aa040c |
permissions | -rw-r--r-- |
29
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
1 |
Move extcmd code from hooks |
335662766a88
Some updates to add-cmake
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
2 |
|
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
3 |
diff -r fd72b1e3bf26 mcabber/mcabber/Makefile.am |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
4 |
--- a/mcabber/mcabber/Makefile.am Wed Nov 12 22:23:32 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
5 |
+++ b/mcabber/mcabber/Makefile.am Wed Nov 12 22:24:18 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
6 |
@@ -7,7 +7,8 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
7 |
xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
8 |
xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
9 |
xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \ |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
10 |
- caps.c caps.h help.c help.h carbons.c carbons.h |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
11 |
+ caps.c caps.h help.c help.h carbons.c carbons.h \ |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
12 |
+ extcmd.c extcmd.h |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
13 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
14 |
if OTR |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
15 |
mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
16 |
@@ -43,6 +44,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
17 |
xmpp_iq.h xmpp_iqrequest.h \ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
18 |
xmpp_muc.h xmpp_s10n.h \ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
19 |
caps.h fifo.h help.h modules.h api.h \ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
20 |
+ extcmd.h \ |
55
8f5cf5969e25
Add fix-separate-build.diff
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
21 |
$(top_builddir)/include/config.h |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
22 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
23 |
if OTR |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
24 |
diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.c |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
25 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
26 |
+++ b/mcabber/mcabber/extcmd.c Wed Nov 12 22:24:18 2014 +0200 |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
27 |
@@ -0,0 +1,152 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
28 |
+/* |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
29 |
+ * extcmd.c -- External event handler command |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
30 |
+ * |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
31 |
+ * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
32 |
+ * |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
33 |
+ * This program is free software; you can redistribute it and/or modify |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
34 |
+ * it under the terms of the GNU General Public License as published by |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
35 |
+ * the Free Software Foundation; either version 2 of the License, or (at |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
36 |
+ * your option) any later version. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
37 |
+ * |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
38 |
+ * This program is distributed in the hope that it will be useful, but |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
39 |
+ * WITHOUT ANY WARRANTY; without even the implied warranty of |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
40 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
41 |
+ * General Public License for more details. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
42 |
+ * |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
43 |
+ * You should have received a copy of the GNU General Public License |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
44 |
+ * along with this program; if not, write to the Free Software |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
45 |
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
46 |
+ * USA |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
47 |
+ */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
48 |
+ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
49 |
+#include <stdlib.h> // mkstemp |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
50 |
+#include <string.h> // strlen |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
51 |
+#include <signal.h> // signal |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
52 |
+#include <sys/types.h> // waitpid |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
53 |
+#include <sys/wait.h> // waitpid |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
54 |
+#include <unistd.h> // fork, close, write, execl |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
55 |
+#include <glib.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
56 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
57 |
+#include "screen.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
58 |
+#include "roster.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
59 |
+#include "settings.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
60 |
+#include "utils.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
61 |
+#include "utf8.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
62 |
+ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
63 |
+#ifndef WAIT_ANY |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
64 |
+# define WAIT_ANY -1 |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
65 |
+#endif |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
66 |
+ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
67 |
+static char *extcmd = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
68 |
+ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
69 |
+// ext_sig_handler() |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
70 |
+// SIGCHLD handler. |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
71 |
+// wait()s for any terminated childs (to avoid hanging zombies) |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
72 |
+// and beeps, if child terminates with exit code 2. |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
73 |
+static void ext_sig_handler(int signum) |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
74 |
+{ |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
75 |
+ int status; |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
76 |
+ pid_t pid; |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
77 |
+ do { |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
78 |
+ pid = waitpid (WAIT_ANY, &status, WNOHANG); |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
79 |
+ // Check the exit status value if 'eventcmd_checkstatus' is set |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
80 |
+ if (settings_opt_get_int("eventcmd_checkstatus")) { |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
81 |
+ if (pid > 0) { |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
82 |
+ // exit status 2 -> beep |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
83 |
+ if (WIFEXITED(status) && WEXITSTATUS(status) == 2) { |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
84 |
+ scr_beep(); |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
85 |
+ } |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
86 |
+ } |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
87 |
+ } |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
88 |
+ } while (pid > 0); |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
89 |
+} |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
90 |
+ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
91 |
+// hk_ext_cmd_init() |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
92 |
+// Initialize external command variable. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
93 |
+// Can be called with parameter NULL to reset and free memory |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
94 |
+void hk_ext_cmd_init(const char *command) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
95 |
+{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
96 |
+ if (extcmd) { |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
97 |
+ signal(SIGCHLD, SIG_DFL); |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
98 |
+ g_free(extcmd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
99 |
+ extcmd = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
100 |
+ } |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
101 |
+ if (command) { |
63
d268aa028975
Fix extcmd handler function name
Myhailo Danylenko <isbear@ukrpost.net>
parents:
62
diff
changeset
|
102 |
+ signal(SIGCHLD, ext_sig_handler); |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
103 |
+ extcmd = expand_filename(command); |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
104 |
+ } |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
105 |
+} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
106 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
107 |
+// hk_ext_cmd() |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
108 |
+// Launch an external command (process) for the given event. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
109 |
+// For now, data should be NULL. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
110 |
+void hk_ext_cmd(const char *name, const char *arg_type, const char *arg_info, const char *data) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
111 |
+{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
112 |
+ pid_t pid; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
113 |
+ char *arg_data = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
114 |
+ char *datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
115 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
116 |
+ if (!arg_type || !arg_info) return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
117 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
118 |
+ if (*name && settings_opt_get_int("eventcmd_use_nickname")) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
119 |
+ name = roster_getname(name); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
120 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
121 |
+ if (data && settings_opt_get_int("event_log_files")) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
122 |
+ int fd; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
123 |
+ const char *prefix; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
124 |
+ char *prefix_xp = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
125 |
+ char *data_locale; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
126 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
127 |
+ data_locale = from_utf8(data); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
128 |
+ prefix = settings_opt_get("event_log_dir"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
129 |
+ if (prefix) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
130 |
+ prefix = prefix_xp = expand_filename(prefix); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
131 |
+ else |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
132 |
+ prefix = ut_get_tmpdir(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
133 |
+ datafname = g_strdup_printf("%s/mcabber-%d.XXXXXX", prefix, getpid()); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
134 |
+ g_free(prefix_xp); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
135 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
136 |
+ // XXX Some old systems may require us to set umask first. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
137 |
+ fd = mkstemp(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
138 |
+ if (fd == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
139 |
+ g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
140 |
+ datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
141 |
+ scr_LogPrint(LPRINT_LOGNORM, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
142 |
+ "Unable to create temp file for external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
143 |
+ } else { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
144 |
+ size_t data_locale_len = strlen(data_locale); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
145 |
+ ssize_t a = write(fd, data_locale, data_locale_len); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
146 |
+ ssize_t b = write(fd, "\n", 1); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
147 |
+ if ((size_t)a != data_locale_len || b != 1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
148 |
+ g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
149 |
+ datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
150 |
+ scr_LogPrint(LPRINT_LOGNORM, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
151 |
+ "Unable to write to temp file for external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
152 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
153 |
+ close(fd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
154 |
+ arg_data = datafname; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
155 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
156 |
+ g_free(data_locale); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
157 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
158 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
159 |
+ if ((pid=fork()) == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
160 |
+ scr_LogPrint(LPRINT_LOGNORM, "Fork error, cannot launch external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
161 |
+ g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
162 |
+ return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
163 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
164 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
165 |
+ if (pid == 0) { // child |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
166 |
+ // Close standard file descriptors |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
167 |
+ close(STDIN_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
168 |
+ close(STDOUT_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
169 |
+ close(STDERR_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
170 |
+ if (execl(extcmd, extcmd, arg_type, arg_info, name, arg_data, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
171 |
+ (char *)NULL) == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
172 |
+ // scr_LogPrint(LPRINT_LOGNORM, "Cannot execute external command."); |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
173 |
+ exit(EXIT_FAILURE); |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
174 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
175 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
176 |
+ g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
177 |
+} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
178 |
+ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
179 |
+/* vim: set expandtab cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
180 |
diff -r fd72b1e3bf26 mcabber/mcabber/extcmd.h |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
181 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
182 |
+++ b/mcabber/mcabber/extcmd.h Wed Nov 12 22:24:18 2014 +0200 |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
183 |
@@ -0,0 +1,15 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
184 |
+#ifndef __MCABBER_EXTCMD_H__ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
185 |
+#define __MCABBER_EXTCMD_H__ 1 |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
186 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
187 |
+#define EXT_CMD_TYPE_MESSAGE "MSG" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
188 |
+#define EXT_CMD_TYPE_STATUS "STATUS" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
189 |
+#define EXT_CMD_TYPE_UNREAD "UNREAD" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
190 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
191 |
+#define EXT_CMD_INFO_RECEIVED "IN" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
192 |
+#define EXT_CMD_INFO_SENT "OUT" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
193 |
+#define EXT_CMD_INFO_GROUPCHAT "MUC" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
194 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
195 |
+void hk_ext_cmd_init(const char *command); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
196 |
+void hk_ext_cmd(const char *bjid, const char *type, const char *info, const char *data); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
197 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
198 |
+#endif |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
199 |
diff -r fd72b1e3bf26 mcabber/mcabber/hooks.c |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
200 |
--- a/mcabber/mcabber/hooks.c Wed Nov 12 22:23:32 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
201 |
+++ b/mcabber/mcabber/hooks.c Wed Nov 12 22:24:18 2014 +0200 |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
202 |
@@ -24,6 +24,7 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
203 |
#include <string.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
204 |
#include <sys/types.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
205 |
#include <unistd.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
206 |
+#include <ctype.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
207 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
208 |
#include "hooks.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
209 |
#include "screen.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
210 |
@@ -35,6 +36,7 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
211 |
#include "utf8.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
212 |
#include "commands.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
213 |
#include "main.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
214 |
+#include "extcmd.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
215 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
216 |
#ifdef MODULES_ENABLE |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
217 |
#include <glib.h> |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
218 |
@@ -177,8 +179,6 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
219 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
220 |
#endif |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
221 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
222 |
-static char *extcmd; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
223 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
224 |
static const char *COMMAND_ME = "/me "; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
225 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
226 |
void hk_message_in(const char *bjid, const char *resname, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
227 |
@@ -195,7 +195,6 @@ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
228 |
char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
229 |
GSList *roster_usr; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
230 |
unsigned mucnicklen = 0; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
231 |
- const char *ename = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
232 |
gboolean attention = FALSE, mucprivmsg = FALSE; |
16
ca5a2f1def20
Rebase to new development version
Mikael Berthe <mikael@lilotux.net>
parents:
14
diff
changeset
|
233 |
gboolean error_msg_subtype = (type == LM_MESSAGE_SUB_TYPE_ERROR); |
14 | 234 |
#ifdef MODULES_ENABLE |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
235 |
@@ -374,19 +373,6 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
236 |
(!is_room || (is_groupchat && log_muc_conf && !timestamp))) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
237 |
hlog_write_message(bjid, timestamp, 0, wmsg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
238 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
239 |
- if (settings_opt_get_int("events_ignore_active_window") && |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
240 |
- current_buddy && scr_get_chatmode()) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
241 |
- gpointer bud = BUDDATA(current_buddy); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
242 |
- if (bud) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
243 |
- const char *cjid = buddy_getjid(bud); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
244 |
- if (cjid && !strcasecmp(cjid, bjid)) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
245 |
- active_window = TRUE; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
246 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
247 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
248 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
249 |
- if (settings_opt_get_int("eventcmd_use_nickname")) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
250 |
- ename = roster_getname(bjid); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
251 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
252 |
// Display the sender in the log window |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
253 |
if ((!is_groupchat) && !(message_flags & HBB_PREFIX_ERR) && |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
254 |
settings_opt_get_int("log_display_sender")) { |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
255 |
@@ -413,12 +399,24 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
256 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
257 |
#endif |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
258 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
259 |
+ if (settings_opt_get_int("events_ignore_active_window") && |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
260 |
+ current_buddy && scr_get_chatmode()) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
261 |
+ gpointer bud = BUDDATA(current_buddy); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
262 |
+ if (bud) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
263 |
+ const char *cjid = buddy_getjid(bud); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
264 |
+ if (cjid && !strcasecmp(cjid, bjid)) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
265 |
+ active_window = TRUE; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
266 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
267 |
+ } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
268 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
269 |
// External command |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
270 |
// - We do not call hk_ext_cmd() for history lines in MUC |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
271 |
// - We do call hk_ext_cmd() for private messages in a room |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
272 |
// - We do call hk_ext_cmd() for messages to the current window |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
273 |
if (!active_window && ((is_groupchat && !timestamp) || !is_groupchat)) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
274 |
- hk_ext_cmd(ename ? ename : bjid, (is_groupchat ? 'G' : 'M'), 'R', wmsg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
275 |
+ hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
276 |
+ is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
277 |
+ wmsg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
278 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
279 |
// Beep, if enabled: |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
280 |
// - if it's a private message |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
281 |
@@ -496,7 +494,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
282 |
#endif |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
283 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
284 |
// External command |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
285 |
- hk_ext_cmd(bjid, 'M', 'S', NULL); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
286 |
+ hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE, EXT_CMD_INFO_SENT, NULL); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
287 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
288 |
g_free(bmsg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
289 |
g_free(mmsg); |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
290 |
@@ -511,10 +509,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
291 |
char *bn; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
292 |
char *logsmsg; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
293 |
const char *rn = (resname ? resname : ""); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
294 |
- const char *ename = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
295 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
296 |
- if (settings_opt_get_int("eventcmd_use_nickname")) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
297 |
- ename = roster_getname(bjid); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
298 |
+ char newstatus[2] = { '?', '\0' }; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
299 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
300 |
oldstat = roster_getstatus(bjid, resname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
301 |
|
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
302 |
@@ -566,27 +561,28 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
303 |
scr_draw_roster(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
304 |
hlog_write_status(bjid, timestamp, status, status_msg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
305 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
306 |
+ newstatus[0] = imstatus2char[status]; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
307 |
+ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
308 |
#ifdef MODULES_ENABLE |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
309 |
{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
310 |
char os[2] = " \0"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
311 |
- char ns[2] = " \0"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
312 |
hk_arg_t args[] = { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
313 |
{ "jid", bjid }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
314 |
{ "resource", rn }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
315 |
{ "old_status", os }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
316 |
- { "new_status", ns }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
317 |
+ { "new_status", newstatus }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
318 |
{ "message", status_msg ? status_msg : "" }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
319 |
{ NULL, NULL }, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
320 |
}; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
321 |
os[0] = imstatus2char[oldstat]; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
322 |
- ns[0] = imstatus2char[status]; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
323 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
324 |
hk_run_handlers(HOOK_STATUS_CHANGE, args); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
325 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
326 |
#endif |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
327 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
328 |
// External command |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
329 |
- hk_ext_cmd(ename ? ename : bjid, 'S', imstatus2char[status], NULL); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
330 |
+ newstatus[0] = toupper(newstatus[0]); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
331 |
+ hk_ext_cmd(bjid, EXT_CMD_TYPE_STATUS, newstatus, status_msg); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
332 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
333 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
334 |
void hk_mystatuschange(time_t timestamp, enum imstatus old_status, |
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
335 |
@@ -711,7 +707,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
336 |
/* Call external command */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
337 |
str_unread = g_strdup_printf("%u %u %u %u", unread_count, attention_count, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
338 |
muc_unread, muc_attention); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
339 |
- hk_ext_cmd("", 'U', (guchar)MIN(255, unread_count), str_unread); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
340 |
+ hk_ext_cmd("", EXT_CMD_TYPE_UNREAD, str_unread, NULL); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
341 |
g_free(str_unread); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
342 |
} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
343 |
|
26
65d81aec6691
Resync to mainstream, drop extend-caps
Myhailo Danylenko <isbear@ukrpost.net>
parents:
24
diff
changeset
|
344 |
@@ -751,123 +747,4 @@ |
14 | 345 |
return 0; |
346 |
} |
|
347 |
||
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
348 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
349 |
-/* External commands */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
350 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
351 |
-// hk_ext_cmd_init() |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
352 |
-// Initialize external command variable. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
353 |
-// Can be called with parameter NULL to reset and free memory. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
354 |
-void hk_ext_cmd_init(const char *command) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
355 |
-{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
356 |
- if (extcmd) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
357 |
- g_free(extcmd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
358 |
- extcmd = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
359 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
360 |
- if (command) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
361 |
- extcmd = expand_filename(command); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
362 |
-} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
363 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
364 |
-// hk_ext_cmd() |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
365 |
-// Launch an external command (process) for the given event. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
366 |
-// For now, data should be NULL. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
367 |
-void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
368 |
-{ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
369 |
- pid_t pid; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
370 |
- const char *arg_type = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
371 |
- const char *arg_info = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
372 |
- const char *arg_data = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
373 |
- char status_str[2]; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
374 |
- char *datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
375 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
376 |
- if (!extcmd) return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
377 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
378 |
- // Prepare arg_* (external command parameters) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
379 |
- switch (type) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
380 |
- case 'M': /* Normal message */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
381 |
- arg_type = "MSG"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
382 |
- if (info == 'R') |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
383 |
- arg_info = "IN"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
384 |
- else if (info == 'S') |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
385 |
- arg_info = "OUT"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
386 |
- break; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
387 |
- case 'G': /* Groupchat message */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
388 |
- arg_type = "MSG"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
389 |
- arg_info = "MUC"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
390 |
- break; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
391 |
- case 'S': /* Status change */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
392 |
- arg_type = "STATUS"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
393 |
- if (strchr(imstatus2char, tolower(info))) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
394 |
- status_str[0] = toupper(info); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
395 |
- status_str[1] = 0; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
396 |
- arg_info = status_str; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
397 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
398 |
- break; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
399 |
- case 'U': /* Unread buffer count */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
400 |
- arg_type = "UNREAD"; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
401 |
- arg_info = data; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
402 |
- break; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
403 |
- default: |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
404 |
- return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
405 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
406 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
407 |
- if (!arg_type || !arg_info) return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
408 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
409 |
- if (strchr("MG", type) && data && settings_opt_get_int("event_log_files")) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
410 |
- int fd; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
411 |
- const char *prefix; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
412 |
- char *prefix_xp = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
413 |
- char *data_locale; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
414 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
415 |
- data_locale = from_utf8(data); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
416 |
- prefix = settings_opt_get("event_log_dir"); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
417 |
- if (prefix) |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
418 |
- prefix = prefix_xp = expand_filename(prefix); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
419 |
- else |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
420 |
- prefix = ut_get_tmpdir(); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
421 |
- datafname = g_strdup_printf("%s/mcabber-%d.XXXXXX", prefix, getpid()); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
422 |
- g_free(prefix_xp); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
423 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
424 |
- // XXX Some old systems may require us to set umask first. |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
425 |
- fd = mkstemp(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
426 |
- if (fd == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
427 |
- g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
428 |
- datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
429 |
- scr_LogPrint(LPRINT_LOGNORM, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
430 |
- "Unable to create temp file for external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
431 |
- } else { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
432 |
- size_t data_locale_len = strlen(data_locale); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
433 |
- ssize_t a = write(fd, data_locale, data_locale_len); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
434 |
- ssize_t b = write(fd, "\n", 1); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
435 |
- if ((size_t)a != data_locale_len || b != 1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
436 |
- g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
437 |
- datafname = NULL; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
438 |
- scr_LogPrint(LPRINT_LOGNORM, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
439 |
- "Unable to write to temp file for external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
440 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
441 |
- close(fd); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
442 |
- arg_data = datafname; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
443 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
444 |
- g_free(data_locale); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
445 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
446 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
447 |
- if ((pid=fork()) == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
448 |
- scr_LogPrint(LPRINT_LOGNORM, "Fork error, cannot launch external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
449 |
- g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
450 |
- return; |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
451 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
452 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
453 |
- if (pid == 0) { // child |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
454 |
- // Close standard file descriptors |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
455 |
- close(STDIN_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
456 |
- close(STDOUT_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
457 |
- close(STDERR_FILENO); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
458 |
- if (execl(extcmd, extcmd, arg_type, arg_info, bjid, arg_data, |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
459 |
- (char *)NULL) == -1) { |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
460 |
- // scr_LogPrint(LPRINT_LOGNORM, "Cannot execute external command."); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
461 |
- exit(1); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
462 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
463 |
- } |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
464 |
- g_free(datafname); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
465 |
-} |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
466 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
467 |
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
468 |
diff -r fd72b1e3bf26 mcabber/mcabber/hooks.h |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
469 |
--- a/mcabber/mcabber/hooks.h Wed Nov 12 22:23:32 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
470 |
+++ b/mcabber/mcabber/hooks.h Wed Nov 12 22:24:18 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
471 |
@@ -67,9 +67,6 @@ |
14 | 472 |
guint hk_subscription(LmMessageSubType mstype, const gchar *bjid, |
473 |
const gchar *msg); |
|
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
474 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
475 |
-void hk_ext_cmd_init(const char *command); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
476 |
-void hk_ext_cmd(const char *bjid, guchar type, guchar info, const char *data); |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
477 |
- |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
478 |
#endif /* __MCABBER_HOOKS_H__ */ |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
479 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
480 |
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
481 |
diff -r fd72b1e3bf26 mcabber/mcabber/main.c |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
482 |
--- a/mcabber/mcabber/main.c Wed Nov 12 22:23:32 2014 +0200 |
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
483 |
+++ b/mcabber/mcabber/main.c Wed Nov 12 22:24:18 2014 +0200 |
64 | 484 |
@@ -19,14 +19,18 @@ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
485 |
* USA |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
486 |
*/ |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
487 |
|
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
488 |
-#include <stdio.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
489 |
-#include <stdlib.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
490 |
-#include <unistd.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
491 |
-#include <string.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
492 |
-#include <signal.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
493 |
-#include <termios.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
494 |
-#include <sys/types.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
495 |
-#include <sys/wait.h> |
64 | 496 |
+#include <stdio.h> // fprintf, fileno, fgets, puts |
497 |
+#include <stdlib.h> // exit, getenv |
|
498 |
+#include <unistd.h> // tcsetattr, tcgetattr, getopt |
|
499 |
+#include <string.h> // strchr, strlen, memset |
|
500 |
+#include <signal.h> // signal |
|
501 |
+#include <termios.h> // tcsetattr, tcgetattr |
|
502 |
+#include <sys/types.h> // waitpid |
|
503 |
+#include <sys/wait.h> // waitpid |
|
504 |
+#include <glib.h> |
|
505 |
+#include <config.h> |
|
506 |
+#include <poll.h> // POLLIN, POLLERR, POLLPRI |
|
507 |
+ |
|
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
508 |
#include <glib.h> |
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
509 |
#include <config.h> |
64 | 510 |
#include <poll.h> |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
511 |
@@ -45,6 +49,7 @@ |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
512 |
#include "help.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
513 |
#include "events.h" |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
514 |
#include "compl.h" |
0
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
515 |
+#include "extcmd.h" |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
516 |
|
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
517 |
#ifndef MODULES_ENABLE |
633272cbb544
Initial experimental branch commit
Myhailo Danylenko <isbear@ukrpost.net>
parents:
diff
changeset
|
518 |
# include "fifo.h" |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
519 |
@@ -351,10 +356,10 @@ |
64 | 520 |
case 'h': |
521 |
case '?': |
|
522 |
printf("Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]); |
|
523 |
- return (c == 'h' ? 0 : -1); |
|
524 |
+ return (c == 'h' ? EXIT_SUCCESS : EXIT_FAILURE); |
|
525 |
case 'V': |
|
526 |
compile_options(); |
|
527 |
- return 0; |
|
528 |
+ return EXIT_SUCCESS; |
|
529 |
case 'f': |
|
530 |
configFile = g_strdup(optarg); |
|
531 |
break; |
|
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
532 |
@@ -363,7 +368,7 @@ |
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
533 |
|
64 | 534 |
if (optind < argc) { |
535 |
fprintf(stderr, "Usage: %s [-h|-V|-f mcabberrc_file]\n\n", argv[0]); |
|
536 |
- return -1; |
|
537 |
+ return EXIT_FAILURE; |
|
538 |
} |
|
62
f5249c9544e5
Fixes (eventcmd, otr4)
Myhailo Danylenko <isbear@ukrpost.net>
parents:
55
diff
changeset
|
539 |
|
64 | 540 |
/* Initialize command system, roster and default key bindings */ |
87
78238d26911a
Update series to current dev version
Myhailo Danylenko <isbear@ukrpost.net>
parents:
64
diff
changeset
|
541 |
@@ -518,7 +523,7 @@ |
64 | 542 |
|
543 |
printf("\n\nThanks for using mcabber!\n"); |
|
544 |
||
545 |
- return 0; |
|
546 |
+ return EXIT_SUCCESS; |
|
547 |
} |
|
548 |
||
549 |
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */ |