libpurple/util.c

Sat, 22 Aug 2020 02:58:07 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Sat, 22 Aug 2020 02:58:07 -0500
changeset 40516
fefaa6596e74
parent 40441
f23c7e772667
child 40519
974dbfd7e52f
permissions
-rw-r--r--

Remove the Gtk Ticker plugin as it doesn't scale to today's IM networks

Remove the ticker plugin as it doesn't scale to todays typical IM usage.

Testing Done:
Compile and install.

Reviewed at https://reviews.imfreedom.org/r/81/

20330
650a7af9c238 remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
1 /* Purple is the legal property of its developers, whose names are too numerous
8046
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 8026
diff changeset
2 * to list here. Please refer to the COPYRIGHT file distributed with this
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 8026
diff changeset
3 * source distribution.
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
4 *
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
7 * the Free Software Foundation; either version 2 of the License, or
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
8 * (at your option) any later version.
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
9 *
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
13 * GNU General Public License for more details.
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
14 *
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
16 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 19840
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
18 */
40441
f23c7e772667 Make sure we're not including the gettext macros in header files and deal with the repercussions of that.
Gary Kramlich <grim@reaperworld.com>
parents: 40439
diff changeset
19
f23c7e772667 Make sure we're not including the gettext macros in header files and deal with the repercussions of that.
Gary Kramlich <grim@reaperworld.com>
parents: 40439
diff changeset
20 #include <glib/gi18n-lib.h>
f23c7e772667 Make sure we're not including the gettext macros in header files and deal with the repercussions of that.
Gary Kramlich <grim@reaperworld.com>
parents: 40439
diff changeset
21
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
22 #include "internal.h"
40439
e9838d634d5e Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents: 40350
diff changeset
23 #include "purpleprivate.h"
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
24
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
25 #include "conversation.h"
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
26 #include "core.h"
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
27 #include "debug.h"
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
28 #include "notify.h"
36543
a8c3fecee2d3 Renamed prpl.[ch] to protocol.[ch]
Ankit Vani <a@nevitus.org>
parents: 36541
diff changeset
29 #include "protocol.h"
5545
a8b1a1262402 [gaim-migrate @ 5946]
Christian Hammond <chipx86@chipx86.com>
parents: 5532
diff changeset
30 #include "prefs.h"
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
31 #include "util.h"
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
32
33538
cbeb76707f12 Better implementation of purple_escape_js
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33537
diff changeset
33 #include <json-glib/json-glib.h>
cbeb76707f12 Better implementation of purple_escape_js
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33537
diff changeset
34
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
35 static char *custom_user_dir = NULL;
20345
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
36 static char *user_dir = NULL;
38890
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
37 static gchar *cache_dir = NULL;
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
38 static gchar *config_dir = NULL;
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
39 static gchar *data_dir = NULL;
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
40
21238
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
41 void
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
42 purple_util_init(void)
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
43 {
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
44 }
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
45
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
46 void
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
47 purple_util_uninit(void)
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
48 {
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
49 /* Free these so we don't have leaks at shutdown. */
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
50
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
51 g_free(custom_user_dir);
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
52 custom_user_dir = NULL;
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
53
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
54 g_free(user_dir);
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
55 user_dir = NULL;
33538
cbeb76707f12 Better implementation of purple_escape_js
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33537
diff changeset
56
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
57 g_free(cache_dir);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
58 cache_dir = NULL;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
59
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
60 g_free(config_dir);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
61 config_dir = NULL;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
62
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
63 g_free(data_dir);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
64 data_dir = NULL;
21238
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
65 }
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
66
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
67 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
68 * Base16 Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
69 **************************************************************************/
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
70 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
71 purple_base16_encode(const guchar *data, gsize len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
72 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
73 gsize i;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
74 gchar *ascii = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
75
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
76 g_return_val_if_fail(data != NULL, NULL);
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
77 g_return_val_if_fail(len > 0, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
78
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
79 ascii = g_malloc(len * 2 + 1);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
80
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
81 for (i = 0; i < len; i++)
34457
a9d3726c3a8f Clang warnings: clean up libpurple
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34305
diff changeset
82 g_snprintf(&ascii[i * 2], 3, "%02x", data[i] & 0xFF);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
83
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
84 return ascii;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
85 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
86
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
87 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
88 purple_base16_decode(const char *str, gsize *ret_len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
89 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
90 gsize len, i, accumulator = 0;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
91 guchar *data;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
92
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
93 g_return_val_if_fail(str != NULL, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
94
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
95 len = strlen(str);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
96
32189
3af8d41121b6 Don't use strlen() when all you're trying to do is check if the string
Mark Doliner <markdoliner@pidgin.im>
parents: 32147
diff changeset
97 g_return_val_if_fail(*str, 0);
15101
6fc73c8a0f4d [gaim-migrate @ 17822]
Nathan Walp <nwalp@pidgin.im>
parents: 15059
diff changeset
98 g_return_val_if_fail(len % 2 == 0, 0);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
99
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
100 data = g_malloc(len / 2);
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
101
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
102 for (i = 0; i < len; i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
103 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
104 if ((i % 2) == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
105 accumulator = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
106 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
107 accumulator <<= 4;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
108
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
109 if (isdigit(str[i]))
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
110 accumulator |= str[i] - 48;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
111 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
112 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
113 switch(tolower(str[i]))
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
114 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
115 case 'a': accumulator |= 10; break;
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
116 case 'b': accumulator |= 11; break;
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
117 case 'c': accumulator |= 12; break;
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
118 case 'd': accumulator |= 13; break;
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
119 case 'e': accumulator |= 14; break;
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
120 case 'f': accumulator |= 15; break;
1826
2353dd376dcf [gaim-migrate @ 1836]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1815
diff changeset
121 }
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
122 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
123
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
124 if (i % 2)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
125 data[(i - 1) / 2] = accumulator;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
126 }
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
127
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
128 if (ret_len != NULL)
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
129 *ret_len = len / 2;
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
130
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
131 return data;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
132 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
133
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
134 gchar *
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
135 purple_base16_encode_chunked(const guchar *data, gsize len)
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
136 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
137 gsize i;
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
138 gchar *ascii = NULL;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
139
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
140 g_return_val_if_fail(data != NULL, NULL);
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
141 g_return_val_if_fail(len > 0, NULL);
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
142
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
143 /* For each byte of input, we need 2 bytes for the hex representation
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
144 * and 1 for the colon.
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
145 * The final colon will be replaced by a terminating NULL
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
146 */
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
147 ascii = g_malloc(len * 3 + 1);
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
148
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
149 for (i = 0; i < len; i++)
34457
a9d3726c3a8f Clang warnings: clean up libpurple
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34305
diff changeset
150 g_snprintf(&ascii[i * 3], 4, "%02x:", data[i] & 0xFF);
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
151
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
152 /* Replace the final colon with NULL */
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
153 ascii[len * 3 - 1] = 0;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
154
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
155 return ascii;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
156 }
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
157
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
158 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
159 * Date/Time Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
160 **************************************************************************/
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
161
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
162 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
163 purple_utf8_strftime(const char *format, const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
164 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
165 static char buf[128];
39017
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
166 GDateTime *dt;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
167 char *utf8;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
168
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
169 g_return_val_if_fail(format != NULL, NULL);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
170
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
171 if (tm == NULL)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
172 {
39017
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
173 dt = g_date_time_new_now_local();
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
174 } else {
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
175 dt = g_date_time_new_local(tm->tm_year + 1900, tm->tm_mon + 1,
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
176 tm->tm_mday, tm->tm_hour,
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
177 tm->tm_min, tm->tm_sec);
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
178 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
179
39017
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
180 utf8 = g_date_time_format(dt, format);
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
181 g_date_time_unref(dt);
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
182
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
183 if (utf8 == NULL) {
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
184 purple_debug_error("util",
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
185 "purple_utf8_strftime(): Formatting failed\n");
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
186 return "";
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
187 }
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
188
39017
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
189 g_strlcpy(buf, utf8, sizeof(buf));
4c9d510555b5 util: Port internals of purple_utf8_strftime() to g_date_time_format()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39016
diff changeset
190 g_free(utf8);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
191 return buf;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
192 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
193
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
194 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
195 purple_date_format_short(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
196 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
197 return purple_utf8_strftime("%x", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
198 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
199
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
200 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
201 purple_date_format_long(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
202 {
23995
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
203 /*
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
204 * This string determines how some dates are displayed. The default
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
205 * string "%x %X" shows the date then the time. Translators can
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
206 * change this to "%X %x" if they want the time to be shown first,
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
207 * followed by the date.
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
208 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
209 return purple_utf8_strftime(_("%x %X"), tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
210 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
211
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
212 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
213 purple_date_format_full(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
214 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
215 return purple_utf8_strftime("%c", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
216 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
217
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
218 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
219 purple_time_format(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
220 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
221 return purple_utf8_strftime("%X", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
222 }
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
223
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
224 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
225 purple_time_build(int year, int month, int day, int hour, int min, int sec)
1805
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
226 {
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
227 struct tm tm;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
228
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
229 tm.tm_year = year - 1900;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
230 tm.tm_mon = month - 1;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
231 tm.tm_mday = day;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
232 tm.tm_hour = hour;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
233 tm.tm_min = min;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
234 tm.tm_sec = sec >= 0 ? sec : time(NULL) % 60;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
235
1805
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
236 return mktime(&tm);
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
237 }
3230
6d0e07333504 [gaim-migrate @ 3247]
Jim Seymour <jseymour@users.sourceforge.net>
parents: 3153
diff changeset
238
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
239 /* originally taken from GLib trunk 1-6-11 */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
240 /* originally licensed as LGPL 2+ */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
241 static time_t
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
242 mktime_utc(struct tm *tm)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
243 {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
244 time_t retval;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
245
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
246 #ifndef HAVE_TIMEGM
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
247 static const gint days_before[] =
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
248 {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
249 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
250 };
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
251 #endif
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
252
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
253 #ifndef HAVE_TIMEGM
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
254 if (tm->tm_mon < 0 || tm->tm_mon > 11)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
255 return (time_t) -1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
256
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
257 retval = (tm->tm_year - 70) * 365;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
258 retval += (tm->tm_year - 68) / 4;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
259 retval += days_before[tm->tm_mon] + tm->tm_mday - 1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
260
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
261 if (tm->tm_year % 4 == 0 && tm->tm_mon < 2)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
262 retval -= 1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
263
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
264 retval = ((((retval * 24) + tm->tm_hour) * 60) + tm->tm_min) * 60 + tm->tm_sec;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
265 #else
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
266 retval = timegm (tm);
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
267 #endif /* !HAVE_TIMEGM */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
268
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
269 return retval;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
270 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
271
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
272 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
273 purple_str_to_time(const char *timestamp, gboolean utc,
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
274 struct tm *tm, long *tz_off, const char **rest)
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
275 {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
276 struct tm t;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
277 const gchar *str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
278 gint year = 0;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
279 long tzoff = PURPLE_NO_TZ_OFF;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
280 time_t retval;
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
281 gboolean mktime_with_utc = FALSE;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
282
24177
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
283 if (rest != NULL)
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
284 *rest = NULL;
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
285
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
286 g_return_val_if_fail(timestamp != NULL, 0);
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
287
31731
96ccdfb11ae0 Zero the struct tm used for purple_str_to_time().
Daniel Atallah <datallah@pidgin.im>
parents: 31332
diff changeset
288 memset(&t, 0, sizeof(struct tm));
96ccdfb11ae0 Zero the struct tm used for purple_str_to_time().
Daniel Atallah <datallah@pidgin.im>
parents: 31332
diff changeset
289
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
290 str = timestamp;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
291
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
292 /* Strip leading whitespace */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
293 while (g_ascii_isspace(*str))
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
294 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
295
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
296 if (*str == '\0') {
39913
ce96d4639dc7 Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39910
diff changeset
297 if (rest != NULL) {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
298 *rest = str;
39913
ce96d4639dc7 Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39910
diff changeset
299 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
300
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
301 return 0;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
302 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
303
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
304 if (!g_ascii_isdigit(*str) && *str != '-' && *str != '+') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
305 if (rest != NULL && *str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
306 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
307
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
308 return 0;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
309 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
310
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
311 /* 4 digit year */
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
312 if (sscanf(str, "%04d", &year) && year >= 1900) {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
313 str += 4;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
314
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
315 if (*str == '-' || *str == '/')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
316 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
317
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
318 t.tm_year = year - 1900;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
319 }
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
320
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
321 /* 2 digit month */
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
322 if (!sscanf(str, "%02d", &t.tm_mon)) {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
323 if (rest != NULL && *str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
324 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
325
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
326 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
327 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
328
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
329 str += 2;
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
330 t.tm_mon -= 1;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
331
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
332 if (*str == '-' || *str == '/')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
333 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
334
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
335 /* 2 digit day */
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
336 if (!sscanf(str, "%02d", &t.tm_mday)) {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
337 if (rest != NULL && *str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
338 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
339
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
340 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
341 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
342
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
343 str += 2;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
344
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
345 /* Grab the year off the end if there's still stuff */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
346 if (*str == '/' || *str == '-') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
347 /* But make sure we don't read the year twice */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
348 if (year >= 1900) {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
349 if (rest != NULL && *str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
350 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
351
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
352 return 0;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
353 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
354
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
355 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
356
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
357 if (!sscanf(str, "%04d", &t.tm_year)) {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
358 if (rest != NULL && *str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
359 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
360
13465
259b56595409 [gaim-migrate @ 15839]
Richard Laager <rlaager@pidgin.im>
parents: 13444
diff changeset
361 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
362 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
363
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
364 t.tm_year -= 1900;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
365 } else if (*str == 'T' || *str == '.') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
366 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
367
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
368 /* Continue grabbing the hours/minutes/seconds */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
369 if ((sscanf(str, "%02d:%02d:%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3 &&
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
370 (str += 8)) ||
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
371 (sscanf(str, "%02d%02d%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3 &&
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
372 (str += 6)))
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
373 {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
374 gint sign, tzhrs, tzmins;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
375
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
376 if (*str == '.') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
377 /* Cut off those pesky micro-seconds */
21696
9eac1e42a98e Fix a bug in purple_str_to_time() that could cause it to try reading past
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21665
diff changeset
378 do {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
379 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
380 } while (*str >= '0' && *str <= '9');
23507
7035c0e7f8ce Allow a 'Z' (UTC) TZ in strings passed to purple_str_to_time. Used for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23391
diff changeset
381 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
382
34228
f93f8b0f36c3 Fix purple_str_to_time()'s tz_off sign handling
Richard Laager <rlaager@pidgin.im>
parents: 33809
diff changeset
383 sign = (*str == '+') ? 1 : -1;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
384
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
385 /* Process the timezone */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
386 if (*str == '+' || *str == '-') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
387 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
388
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
389 if (((sscanf(str, "%02d:%02d", &tzhrs, &tzmins) == 2 && (str += 5)) ||
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
390 (sscanf(str, "%02d%02d", &tzhrs, &tzmins) == 2 && (str += 4))))
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
391 {
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
392 mktime_with_utc = TRUE;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
393 tzoff = tzhrs * 60 * 60 + tzmins * 60;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
394 tzoff *= sign;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
395 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
396 } else if (*str == 'Z') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
397 /* 'Z' = Zulu = UTC */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
398 str++;
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
399 mktime_with_utc = TRUE;
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
400 tzoff = 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
401 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
402
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
403 if (!mktime_with_utc)
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
404 {
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
405 /* No timezone specified. */
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
406
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
407 if (utc) {
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
408 mktime_with_utc = TRUE;
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
409 tzoff = 0;
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
410 } else {
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
411 /* Local Time */
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
412 t.tm_isdst = -1;
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
413 }
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
414 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
415 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
416 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
417
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
418 if (rest != NULL && *str != '\0') {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
419 /* Strip trailing whitespace */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
420 while (g_ascii_isspace(*str))
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
421 str++;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
422
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
423 if (*str != '\0')
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
424 *rest = str;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
425 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
426
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
427 if (mktime_with_utc)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
428 retval = mktime_utc(&t);
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
429 else
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
430 retval = mktime(&t);
23061
a863009f90fa Fix purple_str_to_time() to not break the returned value when we have given
Richard Laager <rlaager@pidgin.im>
parents: 23028
diff changeset
431
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
432 if (tm != NULL)
21707
c2f50b4a53e8 I had used memcpy to copy the struct tm to where the caller wants it, but
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21698
diff changeset
433 *tm = t;
23061
a863009f90fa Fix purple_str_to_time() to not break the returned value when we have given
Richard Laager <rlaager@pidgin.im>
parents: 23028
diff changeset
434
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
435 if (tzoff != PURPLE_NO_TZ_OFF)
35181
e5c1b7f9486d Fix purple_str_to_time() again.
Richard Laager <rlaager@pidgin.im>
parents: 34229
diff changeset
436 retval -= tzoff;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
437
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
438 if (tz_off != NULL)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
439 *tz_off = tzoff;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
440
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
441 return retval;
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
442 }
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
443
38619
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
444 GDateTime *
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
445 purple_str_to_date_time(const char *timestamp, gboolean utc)
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
446 {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
447 const gchar *str;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
448 gint year = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
449 gint month = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
450 gint day = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
451 gint hour = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
452 gint minute = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
453 gint seconds = 0;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
454 gint microseconds = 0;
38624
dcd42461c1a8 Fix parsing of date time microseconds.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38619
diff changeset
455 int chars = 0;
38619
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
456 GTimeZone *tz = NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
457 GDateTime *retval;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
458
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
459 g_return_val_if_fail(timestamp != NULL, NULL);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
460
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
461 str = timestamp;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
462
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
463 /* Strip leading whitespace */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
464 while (g_ascii_isspace(*str))
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
465 str++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
466
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
467 if (*str == '\0') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
468 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
469 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
470
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
471 if (!g_ascii_isdigit(*str) && *str != '-' && *str != '+') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
472 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
473 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
474
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
475 /* 4 digit year */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
476 if (sscanf(str, "%04d", &year) && year > 0) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
477 str += 4;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
478
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
479 if (*str == '-' || *str == '/')
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
480 str++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
481 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
482
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
483 /* 2 digit month */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
484 if (!sscanf(str, "%02d", &month)) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
485 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
486 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
487
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
488 str += 2;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
489
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
490 if (*str == '-' || *str == '/')
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
491 str++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
492
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
493 /* 2 digit day */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
494 if (!sscanf(str, "%02d", &day)) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
495 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
496 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
497
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
498 str += 2;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
499
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
500 /* Grab the year off the end if there's still stuff */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
501 if (*str == '/' || *str == '-') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
502 /* But make sure we don't read the year twice */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
503 if (year > 0) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
504 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
505 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
506
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
507 str++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
508
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
509 if (!sscanf(str, "%04d", &year)) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
510 return NULL;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
511 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
512 } else if (*str == 'T' || *str == '.') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
513 str++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
514
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
515 /* Continue grabbing the hours/minutes/seconds */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
516 if ((sscanf(str, "%02d:%02d:%02d", &hour, &minute, &seconds) == 3 &&
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
517 (str += 8)) ||
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
518 (sscanf(str, "%02d%02d%02d", &hour, &minute, &seconds) == 3 &&
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
519 (str += 6)))
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
520 {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
521 if (*str == '.') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
522 str++;
38624
dcd42461c1a8 Fix parsing of date time microseconds.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38619
diff changeset
523 if (sscanf(str, "%d%n", &microseconds, &chars) == 1) {
38619
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
524 str += chars;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
525 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
526 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
527
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
528 if (*str) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
529 const gchar *end = str;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
530 if (*end == '+' || *end == '-') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
531 end++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
532 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
533
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
534 while (isdigit(*end) || *end == ':') {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
535 end++;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
536 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
537
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
538 if (str != end) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
539 /* Trim anything trailing a purely numeric time zone. */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
540 gchar *tzstr = g_strndup(str, end - str);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
541 tz = g_time_zone_new(tzstr);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
542 g_free(tzstr);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
543 } else {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
544 /* Just try whatever is there. */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
545 tz = g_time_zone_new(str);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
546 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
547 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
548 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
549 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
550
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
551 if (!tz) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
552 /* No timezone specified. */
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
553 if (utc) {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
554 tz = g_time_zone_new_utc();
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
555 } else {
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
556 tz = g_time_zone_new_local();
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
557 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
558 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
559
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
560 retval = g_date_time_new(tz, year, month, day, hour, minute,
38624
dcd42461c1a8 Fix parsing of date time microseconds.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38619
diff changeset
561 seconds + microseconds * pow(10, -chars));
38619
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
562 g_time_zone_unref(tz);
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
563
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
564 return retval;
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
565 }
2121337626ee Add purple_str_to_date_time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 38358
diff changeset
566
40171
564fcabca6d9 Rename purple_get_month -> purple_time_parse_month
qarkai <qarkai@gmail.com>
parents: 40170
diff changeset
567 gint purple_time_parse_month(const char *month_abbr)
40170
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
568 {
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
569 const char *months[] = {
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
570 "Jan", "Feb", "Mar", "Apr", "May", "Jun",
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
571 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
572 NULL};
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
573 for (gint month = 0; months[month] != NULL; month++) {
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
574 if (purple_strequal(month_abbr, months[month])) {
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
575 return month + 1;
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
576 }
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
577 }
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
578 return 0;
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
579 }
c69c52a5ffe7 Add purple_get_month() util function
qarkai <qarkai@gmail.com>
parents: 40142
diff changeset
580
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
581 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
582 * Markup Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
583 **************************************************************************/
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
584
27652
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
585 /*
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
586 * This function is stolen from glib's gmarkup.c and modified to not
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
587 * replace ' with &apos;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
588 */
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
589 static void append_escaped_text(GString *str,
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
590 const gchar *text, gssize length)
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
591 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
592 const gchar *p;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
593 const gchar *end;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
594 gunichar c;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
595
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
596 p = text;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
597 end = text + length;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
598
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
599 while (p != end)
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
600 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
601 const gchar *next;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
602 next = g_utf8_next_char (p);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
603
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
604 switch (*p)
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
605 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
606 case '&':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
607 g_string_append (str, "&amp;");
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
608 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
609
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
610 case '<':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
611 g_string_append (str, "&lt;");
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
612 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
613
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
614 case '>':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
615 g_string_append (str, "&gt;");
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
616 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
617
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
618 case '"':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
619 g_string_append (str, "&quot;");
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
620 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
621
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
622 default:
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
623 c = g_utf8_get_char (p);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
624 if ((0x1 <= c && c <= 0x8) ||
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
625 (0xb <= c && c <= 0xc) ||
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
626 (0xe <= c && c <= 0x1f) ||
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
627 (0x7f <= c && c <= 0x84) ||
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
628 (0x86 <= c && c <= 0x9f))
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
629 g_string_append_printf (str, "&#x%x;", c);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
630 else
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
631 g_string_append_len (str, p, next - p);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
632 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
633 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
634
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
635 p = next;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
636 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
637 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
638
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
639 /* This function is stolen from glib's gmarkup.c */
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
640 gchar *purple_markup_escape_text(const gchar *text, gssize length)
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
641 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
642 GString *str;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
643
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
644 g_return_val_if_fail(text != NULL, NULL);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
645
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
646 if (length < 0)
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
647 length = strlen(text);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
648
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
649 /* prealloc at least as long as original text */
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
650 str = g_string_sized_new(length);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
651 append_escaped_text(str, text, length);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
652
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
653 return g_string_free(str, FALSE);
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
654 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
655
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
656 const char *
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
657 purple_markup_unescape_entity(const char *text, int *length)
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
658 {
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
659 const char *pln;
38370
5ce633da4ee5 util: Remove two unused variables from purple_markup_unescape_entity()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38270
diff changeset
660 int len;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
661
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
662 if (!text || *text != '&')
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
663 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
664
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
665 #define IS_ENTITY(s) (!g_ascii_strncasecmp(text, s, (len = sizeof(s) - 1)))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
666
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
667 if(IS_ENTITY("&amp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
668 pln = "&";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
669 else if(IS_ENTITY("&lt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
670 pln = "<";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
671 else if(IS_ENTITY("&gt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
672 pln = ">";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
673 else if(IS_ENTITY("&nbsp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
674 pln = " ";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
675 else if(IS_ENTITY("&copy;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
676 pln = "\302\251"; /* or use g_unichar_to_utf8(0xa9); */
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
677 else if(IS_ENTITY("&quot;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
678 pln = "\"";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
679 else if(IS_ENTITY("&reg;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
680 pln = "\302\256"; /* or use g_unichar_to_utf8(0xae); */
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
681 else if(IS_ENTITY("&apos;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
682 pln = "\'";
38371
87fff7866cff purple_markup_unescape_entity: Fix handling of hexadecimal html entities
dx <dx@dxzone.com.ar>
parents: 38370
diff changeset
683 else if(text[1] == '#' && (g_ascii_isxdigit(text[2]) || text[2] == 'x')) {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
684 static char buf[7];
38226
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
685 const char *start = text + 2;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
686 char *end;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
687 guint64 pound;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
688 int base = 10;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
689 int buflen;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
690
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
691 if (*start == 'x') {
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
692 base = 16;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
693 start++;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
694 }
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
695
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
696 pound = g_ascii_strtoull(start, &end, base);
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
697 if (pound == 0 || pound > INT_MAX || *end != ';') {
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
698 return NULL;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
699 }
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
700
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
701 len = (end - text) + 1;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
702
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
703 buflen = g_unichar_to_utf8((gunichar)pound, buf);
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
704 buf[buflen] = '\0';
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
705 pln = buf;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
706 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
707 else
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
708 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
709
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
710 if (length)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
711 *length = len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
712 return pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
713 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
714
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
715 char *
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
716 purple_markup_get_css_property(const gchar *style,
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
717 const gchar *opt)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
718 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
719 const gchar *css_str = style;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
720 const gchar *css_value_start;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
721 const gchar *css_value_end;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
722 gchar *tmp;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
723 gchar *ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
724
24642
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
725 g_return_val_if_fail(opt != NULL, NULL);
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
726
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
727 if (!css_str)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
728 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
729
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
730 /* find the CSS property */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
731 while (1)
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
732 {
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
733 /* skip whitespace characters */
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
734 while (*css_str && g_ascii_isspace(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
735 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
736 if (!g_ascii_isalpha(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
737 return NULL;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
738 if (g_ascii_strncasecmp(css_str, opt, strlen(opt)))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
739 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
740 /* go to next css property positioned after the next ';' */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
741 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
742 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
743 if(*css_str != ';')
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
744 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
745 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
746 }
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
747 else
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
748 break;
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
749 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
750
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
751 /* find the CSS value position in the string */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
752 css_str += strlen(opt);
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
753 while (*css_str && g_ascii_isspace(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
754 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
755 if (*css_str != ':')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
756 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
757 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
758 while (*css_str && g_ascii_isspace(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
759 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
760 if (*css_str == '\0' || *css_str == '"' || *css_str == ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
761 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
762
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
763 /* mark the CSS value */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
764 css_value_start = css_str;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
765 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
766 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
767 css_value_end = css_str - 1;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
768
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
769 /* Removes trailing whitespace */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
770 while (css_value_end > css_value_start && g_ascii_isspace(*css_value_end))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
771 css_value_end--;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
772
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
773 tmp = g_strndup(css_value_start, css_value_end - css_value_start + 1);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
774 ret = purple_unescape_html(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
775 g_free(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
776
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
777 return ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
778 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
779
27234
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
780 gboolean purple_markup_is_rtl(const char *html)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
781 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
782 GData *attributes;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
783 const gchar *start, *end;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
784 gboolean res = FALSE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
785
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
786 if (purple_markup_find_tag("span", html, &start, &end, &attributes))
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
787 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
788 /* tmp is a member of attributes and is free with g_datalist_clear call */
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
789 const char *tmp = g_datalist_get_data(&attributes, "dir");
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
790 if (tmp && !g_ascii_strcasecmp(tmp, "RTL"))
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
791 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
792 if (!res)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
793 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
794 tmp = g_datalist_get_data(&attributes, "style");
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
795 if (tmp)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
796 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
797 char *tmp2 = purple_markup_get_css_property(tmp, "direction");
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
798 if (tmp2 && !g_ascii_strcasecmp(tmp2, "RTL"))
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
799 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
800 g_free(tmp2);
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
801 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
802
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
803 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
804 g_datalist_clear(&attributes);
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
805 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
806 return res;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
807 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
808
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
809 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
810 purple_markup_find_tag(const char *needle, const char *haystack,
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
811 const char **start, const char **end, GData **attributes)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
812 {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
813 GData *attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
814 const char *cur = haystack;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
815 char *name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
816 gboolean found = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
817 gboolean in_tag = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
818 gboolean in_attr = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
819 const char *in_quotes = NULL;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
820 size_t needlelen;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
821
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
822 g_return_val_if_fail( needle != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
823 g_return_val_if_fail( *needle != '\0', FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
824 g_return_val_if_fail( haystack != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
825 g_return_val_if_fail( start != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
826 g_return_val_if_fail( end != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
827 g_return_val_if_fail(attributes != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
828
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
829 needlelen = strlen(needle);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
830 g_datalist_init(&attribs);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
831
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
832 while (*cur && !found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
833 if (in_tag) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
834 if (in_quotes) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
835 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
836
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
837 while (*close && *close != *in_quotes)
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
838 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
839
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
840 /* if we got the close quote, store the value and carry on from *
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
841 * after it. if we ran to the end of the string, point to the NULL *
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
842 * and we're outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
843 if (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
844 /* only store a value if we have an attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
845 if (name) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
846 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
847 char *val = g_strndup(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
848
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
849 g_datalist_set_data_full(&attribs, name, val, g_free);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
850 g_free(name);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
851 name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
852 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
853
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
854 in_quotes = NULL;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
855 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
856 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
857 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
858 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
859 } else if (in_attr) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
860 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
861
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
862 while (*close && *close != '>' && *close != '"' &&
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
863 *close != '\'' && *close != ' ' && *close != '=')
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
864 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
865
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
866 /* if we got the equals, store the name of the attribute. if we got
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
867 * the quote, save the attribute and go straight to quote mode.
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
868 * otherwise the tag closed or we reached the end of the string,
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
869 * so we can get outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
870 switch (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
871 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
872 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
873 in_quotes = close;
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
874 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
875 case '=':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
876 {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
877 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
878
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
879 /* don't store a blank attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
880 if (len) {
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
881 g_free(name);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
882 name = g_ascii_strdown(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
883 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
884
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
885 in_attr = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
886 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
887 }
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
888 break;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
889 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
890 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
891 in_attr = FALSE;
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
892 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
893 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
894 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
895 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
896 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
897 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
898 switch (*cur) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
899 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
900 /* swallow extra spaces inside tag */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
901 while (*cur && *cur == ' ') cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
902 in_attr = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
903 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
904 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
905 found = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
906 *end = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
907 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
908 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
909 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
910 in_quotes = cur;
35998
aeaebd2ba4af Silence more already dismissed coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35995
diff changeset
911 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
912 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
913 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
914 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
915 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
916 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
917 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
918 /* if we hit a < followed by the name of our tag... */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
919 if (*cur == '<' && !g_ascii_strncasecmp(cur + 1, needle, needlelen)) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
920 *start = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
921 cur = cur + needlelen + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
922
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
923 /* if we're pointing at a space or a >, we found the right tag. if *
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
924 * we're not, we've found a longer tag, so we need to skip to the *
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
925 * >, but not being distracted by >s inside quotes. */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
926 if (*cur == ' ' || *cur == '>') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
927 in_tag = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
928 } else {
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
929 while (*cur && *cur != '"' && *cur != '\'' && *cur != '>') {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
930 if (*cur == '"') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
931 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
932 while (*cur && *cur != '"')
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
933 cur++;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
934 } else if (*cur == '\'') {
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
935 cur++;
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
936 while (*cur && *cur != '\'')
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
937 cur++;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
938 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
939 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
940 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
941 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
942 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
943 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
944 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
945 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
946 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
947 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
948
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
949 /* clean up any attribute name from a premature termination */
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
950 g_free(name);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
951
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
952 if (found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
953 *attributes = attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
954 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
955 *start = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
956 *end = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
957 *attributes = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
958 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
959
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
960 return found;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
961 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
962
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
963 struct purple_parse_tag {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
964 char *src_tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
965 char *dest_tag;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
966 gboolean ignore;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
967 };
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
968
27892
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
969 /* NOTE: Do not put `do {} while(0)` around this macro (as this is the method
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
970 recommended in the GCC docs). It contains 'continue's that should
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
971 affect the while-loop in purple_markup_html_to_xhtml and doing the
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
972 above would break that.
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
973 Also, remember to put braces in constructs that require them for
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
974 multiple statements when using this macro. */
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
975 #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
976 const char *o = c + strlen("<" x); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
977 const char *p = NULL, *q = NULL, *r = NULL; \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
978 /* o = iterating over full tag \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
979 * p = > (end of tag) \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
980 * q = start of quoted bit \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
981 * r = < inside tag \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
982 */ \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
983 GString *innards = g_string_new(""); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
984 while(o && *o) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
985 if(!q && (*o == '\"' || *o == '\'') ) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
986 q = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
987 } else if(q) { \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
988 if(*o == *q) { /* end of quoted bit */ \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
989 char *unescaped = g_strndup(q+1, o-q-1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
990 char *escaped = g_markup_escape_text(unescaped, -1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
991 g_string_append_printf(innards, "%c%s%c", *q, escaped, *q); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
992 g_free(unescaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
993 g_free(escaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
994 q = NULL; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
995 } else if(*c == '\\') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
996 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
997 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
998 } else if(*o == '<') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
999 r = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1000 } else if(*o == '>') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1001 p = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1002 break; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1003 } else { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1004 innards = g_string_append_c(innards, *o); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1005 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1006 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1007 } \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1008 if(p && !r) { /* got an end of tag and no other < earlier */\
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1009 if(*(p-1) != '/') { \
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1010 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1011 pt->src_tag = x; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1012 pt->dest_tag = y; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1013 tags = g_list_prepend(tags, pt); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1014 } \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1015 if(xhtml) { \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1016 xhtml = g_string_append(xhtml, "<" y); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1017 xhtml = g_string_append(xhtml, innards->str); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1018 xhtml = g_string_append_c(xhtml, '>'); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1019 } \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1020 c = p + 1; \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1021 } else { /* got end of tag with earlier < *or* didn't get anything */ \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1022 if(xhtml) \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1023 xhtml = g_string_append(xhtml, "&lt;"); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1024 if(plain) \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1025 plain = g_string_append_c(plain, '<'); \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1026 c++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1027 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1028 g_string_free(innards, TRUE); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1029 continue; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1030 } \
27880
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1031 if(!g_ascii_strncasecmp(c, "<" x, strlen("<" x)) && \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1032 (*(c+strlen("<" x)) == '>' || \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1033 !g_ascii_strncasecmp(c+strlen("<" x), "/>", 2))) { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1034 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1035 xhtml = g_string_append(xhtml, "<" y); \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1036 c += strlen("<" x); \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1037 if(*c != '/') { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1038 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1); \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1039 pt->src_tag = x; \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1040 pt->dest_tag = y; \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1041 tags = g_list_prepend(tags, pt); \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1042 if(xhtml) \
27880
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1043 xhtml = g_string_append_c(xhtml, '>'); \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1044 } else { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1045 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1046 xhtml = g_string_append(xhtml, "/>");\
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1047 } \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1048 c = strchr(c, '>') + 1; \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1049 continue; \
27896
480578cc87d3 567c0647 introduced an extra backslash at the end of ALLOW_TAG_ALT
Ka-Hing Cheung <khc@pidgin.im>
parents: 27895
diff changeset
1050 }
27892
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1051 /* Don't forget to check the note above for ALLOW_TAG_ALT. */
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1052 #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1053 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1054 purple_markup_html_to_xhtml(const char *html, char **xhtml_out,
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1055 char **plain_out)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1056 {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1057 GString *xhtml = NULL;
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1058 GString *plain = NULL;
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1059 GString *url = NULL;
19327
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1060 GString *cdata = NULL;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1061 GList *tags = NULL, *tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1062 const char *c = html;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1063 char quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1064
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1065 #define CHECK_QUOTE(ptr) if (*(ptr) == '\'' || *(ptr) == '\"') \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1066 quote = *(ptr++); \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1067 else \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1068 quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1069
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1070 #define VALID_CHAR(ptr) (*(ptr) && *(ptr) != quote && (quote || (*(ptr) != ' ' && *(ptr) != '>')))
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1071
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1072 g_return_if_fail(xhtml_out != NULL || plain_out != NULL);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1073
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1074 if(xhtml_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1075 xhtml = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1076 if(plain_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1077 plain = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1078
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1079 while(c && *c) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1080 if(*c == '<') {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1081 if(*(c+1) == '/') { /* closing tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1082 tag = tags;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1083 while(tag) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1084 struct purple_parse_tag *pt = tag->data;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1085 if(!g_ascii_strncasecmp((c+2), pt->src_tag, strlen(pt->src_tag)) && *(c+strlen(pt->src_tag)+2) == '>') {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1086 c += strlen(pt->src_tag) + 3;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1087 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1088 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1089 tag = tag->next;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1090 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1091 if(tag) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1092 while(tags) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1093 struct purple_parse_tag *pt = tags->data;
29227
3e9734bf4422 Fix a corner case where purple_markup_html_to_xhtml generated malformed XHTML.
Paul Aurich <darkrain42@pidgin.im>
parents: 28577
diff changeset
1094 if(xhtml && !pt->ignore)
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1095 g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
25859
b42be7bb9dac Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents: 25854
diff changeset
1096 if(plain && purple_strequal(pt->src_tag, "a")) {
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1097 /* if this is a link, we have to add the url to the plaintext, too */
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1098 if (cdata && url &&
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1099 (!g_string_equal(cdata, url) && (g_ascii_strncasecmp(url->str, "mailto:", 7) != 0 ||
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1100 g_utf8_collate(url->str + 7, cdata->str) != 0)))
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1101 g_string_append_printf(plain, " <%s>", g_strstrip(purple_unescape_html(url->str)));
19327
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1102 if (cdata) {
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1103 g_string_free(cdata, TRUE);
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1104 cdata = NULL;
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1105 }
19585
14b519abcc26 Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <datallah@pidgin.im>
parents: 19327
diff changeset
1106
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1107 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1108 if(tags == tag)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1109 break;
40079
a37a1e349491 Replace g_[s]list_remove with g_[s]list_delete_link.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39987
diff changeset
1110 tags = g_list_delete_link(tags, tags);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1111 g_free(pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1112 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1113 g_free(tag->data);
39467
1f7525086da5 Fix some possible use-after-free.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39437
diff changeset
1114 tags = g_list_delete_link(tags, tag);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1115 } else {
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1116 /* a closing tag we weren't expecting...
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1117 * we'll let it slide, if it's really a tag...if it's
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1118 * just a </ we'll escape it properly */
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1119 const char *end = c+2;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1120 while(*end && g_ascii_isalpha(*end))
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1121 end++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1122 if(*end == '>') {
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1123 c = end+1;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1124 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1125 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1126 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1127 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1128 plain = g_string_append_c(plain, '<');
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1129 c++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1130 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1131 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1132 } else { /* opening tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1133 ALLOW_TAG("blockquote");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1134 ALLOW_TAG("cite");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1135 ALLOW_TAG("div");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1136 ALLOW_TAG("em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1137 ALLOW_TAG("h1");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1138 ALLOW_TAG("h2");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1139 ALLOW_TAG("h3");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1140 ALLOW_TAG("h4");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1141 ALLOW_TAG("h5");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1142 ALLOW_TAG("h6");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1143 /* we only allow html to start the message */
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
1144 if(c == html) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1145 ALLOW_TAG("html");
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
1146 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1147 ALLOW_TAG_ALT("i", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1148 ALLOW_TAG_ALT("italic", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1149 ALLOW_TAG("li");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1150 ALLOW_TAG("ol");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1151 ALLOW_TAG("p");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1152 ALLOW_TAG("pre");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1153 ALLOW_TAG("q");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1154 ALLOW_TAG("span");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1155 ALLOW_TAG("ul");
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1156
19585
14b519abcc26 Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <datallah@pidgin.im>
parents: 19327
diff changeset
1157
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1158 /* we skip <HR> because it's not legal in XHTML-IM. However,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1159 * we still want to send something sensible, so we put a
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1160 * linebreak in its place. <BR> also needs special handling
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1161 * because putting a </BR> to close it would just be dumb. */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1162 if((!g_ascii_strncasecmp(c, "<br", 3)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1163 || !g_ascii_strncasecmp(c, "<hr", 3))
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1164 && (*(c+3) == '>' ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1165 !g_ascii_strncasecmp(c+3, "/>", 2) ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1166 !g_ascii_strncasecmp(c+3, " />", 3))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1167 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1168 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1169 xhtml = g_string_append(xhtml, "<br/>");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1170 if(plain && *c != '\n')
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1171 plain = g_string_append_c(plain, '\n');
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1172 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1173 }
22313
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1174 if(!g_ascii_strncasecmp(c, "<b>", 3) || !g_ascii_strncasecmp(c, "<bold>", strlen("<bold>")) || !g_ascii_strncasecmp(c, "<strong>", strlen("<strong>"))) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1175 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
22313
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1176 if (*(c+2) == '>')
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1177 pt->src_tag = "b";
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1178 else if (*(c+2) == 'o')
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1179 pt->src_tag = "bold";
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1180 else
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1181 pt->src_tag = "strong";
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1182 pt->dest_tag = "span";
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1183 tags = g_list_prepend(tags, pt);
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1184 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1185 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1186 xhtml = g_string_append(xhtml, "<span style='font-weight: bold;'>");
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1187 continue;
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1188 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1189 if(!g_ascii_strncasecmp(c, "<u>", 3) || !g_ascii_strncasecmp(c, "<underline>", strlen("<underline>"))) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1190 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1191 pt->src_tag = *(c+2) == '>' ? "u" : "underline";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1192 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1193 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1194 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1195 if (xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1196 xhtml = g_string_append(xhtml, "<span style='text-decoration: underline;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1197 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1198 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1199 if(!g_ascii_strncasecmp(c, "<s>", 3) || !g_ascii_strncasecmp(c, "<strike>", strlen("<strike>"))) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1200 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1201 pt->src_tag = *(c+2) == '>' ? "s" : "strike";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1202 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1203 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1204 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1205 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1206 xhtml = g_string_append(xhtml, "<span style='text-decoration: line-through;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1207 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1208 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1209 if(!g_ascii_strncasecmp(c, "<sub>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1210 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1211 pt->src_tag = "sub";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1212 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1213 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1214 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1215 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1216 xhtml = g_string_append(xhtml, "<span style='vertical-align:sub;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1217 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1218 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1219 if(!g_ascii_strncasecmp(c, "<sup>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1220 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1221 pt->src_tag = "sup";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1222 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1223 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1224 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1225 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1226 xhtml = g_string_append(xhtml, "<span style='vertical-align:super;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1227 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1228 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1229 if (!g_ascii_strncasecmp(c, "<img", 4) && (*(c+4) == '>' || *(c+4) == ' ')) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1230 const char *p = c + 4;
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1231 GString *src = NULL, *alt = NULL;
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1232 #define ESCAPE(from, to) \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1233 CHECK_QUOTE(from); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1234 while (VALID_CHAR(from)) { \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1235 int len; \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1236 if ((*from == '&') && (purple_markup_unescape_entity(from, &len) == NULL)) \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1237 to = g_string_append(to, "&amp;"); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1238 else if (*from == '\'') \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1239 to = g_string_append(to, "&apos;"); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1240 else \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1241 to = g_string_append_c(to, *from); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1242 from++; \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1243 }
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1244
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1245 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1246 if (!g_ascii_strncasecmp(p, "src=", 4)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1247 const char *q = p + 4;
23028
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1248 if (src)
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1249 g_string_free(src, TRUE);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1250 src = g_string_new("");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1251 ESCAPE(q, src);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1252 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1253 } else if (!g_ascii_strncasecmp(p, "alt=", 4)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1254 const char *q = p + 4;
23028
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1255 if (alt)
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1256 g_string_free(alt, TRUE);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1257 alt = g_string_new("");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1258 ESCAPE(q, alt);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1259 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1260 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1261 p++;
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1262 }
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1263 }
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1264 #undef ESCAPE
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1265 if ((c = strchr(p, '>')) != NULL)
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1266 c++;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1267 else
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1268 c = p;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1269 /* src and alt are required! */
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1270 if(src && xhtml)
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1271 g_string_append_printf(xhtml, "<img src='%s' alt='%s' />", g_strstrip(src->str), alt ? alt->str : "");
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1272 if(alt) {
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1273 if(plain)
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1274 plain = g_string_append(plain, purple_unescape_html(alt->str));
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1275 if(!src && xhtml)
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1276 xhtml = g_string_append(xhtml, alt->str);
21045
3357c6b91a7a Only free the GString "alt" if it's non-null. This was causing an
Mark Doliner <markdoliner@pidgin.im>
parents: 21037
diff changeset
1277 g_string_free(alt, TRUE);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1278 }
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1279 g_string_free(src, TRUE);
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1280 continue;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1281 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1282 if (!g_ascii_strncasecmp(c, "<a", 2) && (*(c+2) == '>' || *(c+2) == ' ')) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1283 const char *p = c + 2;
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1284 struct purple_parse_tag *pt;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1285 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1286 if (!g_ascii_strncasecmp(p, "href=", 5)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1287 const char *q = p + 5;
20656
9a092747dcea Fix some incorrect assertions when G_DEBUG=fatal_warnings is set.
Daniel Atallah <datallah@pidgin.im>
parents: 20611
diff changeset
1288 if (url)
9a092747dcea Fix some incorrect assertions when G_DEBUG=fatal_warnings is set.
Daniel Atallah <datallah@pidgin.im>
parents: 20611
diff changeset
1289 g_string_free(url, TRUE);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1290 url = g_string_new("");
23028
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1291 if (cdata)
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
1292 g_string_free(cdata, TRUE);
19327
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1293 cdata = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1294 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1295 while (VALID_CHAR(q)) {
21468
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1296 int len;
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1297 if ((*q == '&') && (purple_markup_unescape_entity(q, &len) == NULL))
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1298 url = g_string_append(url, "&amp;");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1299 else if (*q == '"')
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1300 url = g_string_append(url, "&quot;");
21468
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1301 else
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1302 url = g_string_append_c(url, *q);
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1303 q++;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1304 }
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1305 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1306 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1307 p++;
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1308 }
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1309 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1310 if ((c = strchr(p, '>')) != NULL)
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1311 c++;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1312 else
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1313 c = p;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1314 pt = g_new0(struct purple_parse_tag, 1);
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1315 pt->src_tag = "a";
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1316 pt->dest_tag = "a";
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1317 tags = g_list_prepend(tags, pt);
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1318 if(xhtml)
27121
0f83953c87b8 According to RFC 1738, "'" is a valid character in a URL.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 26996
diff changeset
1319 g_string_append_printf(xhtml, "<a href=\"%s\">", url ? g_strstrip(url->str) : "");
18741
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1320 continue;
3bce9fc8b8e2 Per request of rlaager, propagated my xhtml-creator fixes to the main branch. This adds two things: proper <img>-handling and appending URLs to the plain text version like this: <http://www.example.com>.
Andreas Monitzer <am@adiumx.com>
parents: 18551
diff changeset
1321 }
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1322 #define ESCAPE(from, to) \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1323 CHECK_QUOTE(from); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1324 while (VALID_CHAR(from)) { \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1325 int len; \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1326 if ((*from == '&') && (purple_markup_unescape_entity(from, &len) == NULL)) \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1327 to = g_string_append(to, "&amp;"); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1328 else if (*from == '\'') \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1329 to = g_string_append_c(to, '\"'); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1330 else \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1331 to = g_string_append_c(to, *from); \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1332 from++; \
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1333 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1334 if(!g_ascii_strncasecmp(c, "<font", 5) && (*(c+5) == '>' || *(c+5) == ' ')) {
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1335 const char *p = c + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1336 GString *style = g_string_new("");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1337 struct purple_parse_tag *pt;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1338 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1339 if (!g_ascii_strncasecmp(p, "back=", 5)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1340 const char *q = p + 5;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1341 GString *color = g_string_new("");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1342 ESCAPE(q, color);
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1343 g_string_append_printf(style, "background: %s; ", color->str);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1344 g_string_free(color, TRUE);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1345 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1346 } else if (!g_ascii_strncasecmp(p, "color=", 6)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1347 const char *q = p + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1348 GString *color = g_string_new("");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1349 ESCAPE(q, color);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1350 g_string_append_printf(style, "color: %s; ", color->str);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1351 g_string_free(color, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1352 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1353 } else if (!g_ascii_strncasecmp(p, "face=", 5)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1354 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1355 GString *face = g_string_new("");
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1356 ESCAPE(q, face);
13836
43be98fd1be0 [gaim-migrate @ 16283]
Brian Chu <roast@users.sourceforge.net>
parents: 13831
diff changeset
1357 g_string_append_printf(style, "font-family: %s; ", g_strstrip(face->str));
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1358 g_string_free(face, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1359 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1360 } else if (!g_ascii_strncasecmp(p, "size=", 5)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1361 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1362 int sz;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1363 const char *size = "medium";
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1364 CHECK_QUOTE(q);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1365 sz = atoi(q);
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1366 switch (sz)
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1367 {
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1368 case 1:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1369 size = "xx-small";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1370 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1371 case 2:
25298
550a02fcd02e Change the font size mapping table in purple_markup_html_to_xhtml() to
Mark Doliner <markdoliner@pidgin.im>
parents: 25276
diff changeset
1372 size = "small";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1373 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1374 case 3:
25298
550a02fcd02e Change the font size mapping table in purple_markup_html_to_xhtml() to
Mark Doliner <markdoliner@pidgin.im>
parents: 25276
diff changeset
1375 size = "medium";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1376 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1377 case 4:
25298
550a02fcd02e Change the font size mapping table in purple_markup_html_to_xhtml() to
Mark Doliner <markdoliner@pidgin.im>
parents: 25276
diff changeset
1378 size = "large";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1379 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1380 case 5:
25298
550a02fcd02e Change the font size mapping table in purple_markup_html_to_xhtml() to
Mark Doliner <markdoliner@pidgin.im>
parents: 25276
diff changeset
1381 size = "x-large";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1382 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1383 case 6:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1384 case 7:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1385 size = "xx-large";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1386 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1387 default:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1388 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1389 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1390 g_string_append_printf(style, "font-size: %s; ", size);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1391 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1392 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1393 p++;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1394 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1395 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1396 if ((c = strchr(p, '>')) != NULL)
10593
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1397 c++;
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1398 else
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1399 c = p;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1400 pt = g_new0(struct purple_parse_tag, 1);
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1401 pt->src_tag = "font";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1402 pt->dest_tag = "span";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1403 tags = g_list_prepend(tags, pt);
21104
77fb353b5140 Avoid g_log warnings when there's no xhtml to append to, and remove a
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21091
diff changeset
1404 if(style->len && xhtml)
18108
cb8669f16994 merge of 'bab0b0bcb66485f4114afcd894f2f45d4b4ef15e'
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18105 18104
diff changeset
1405 g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str));
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1406 else
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1407 pt->ignore = TRUE;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1408 g_string_free(style, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1409 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1410 }
33380
c600a505402d patch from loic to fix some bad html -> xhtml conversion
Nathan Walp <nwalp@pidgin.im>
parents: 33090
diff changeset
1411 #undef ESCAPE
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1412 if (!g_ascii_strncasecmp(c, "<body ", 6)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1413 const char *p = c + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1414 gboolean did_something = FALSE;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1415 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1416 if (!g_ascii_strncasecmp(p, "bgcolor=", 8)) {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1417 const char *q = p + 8;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1418 struct purple_parse_tag *pt = g_new0(struct purple_parse_tag, 1);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1419 GString *color = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1420 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1421 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1422 color = g_string_append_c(color, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1423 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1424 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1425 if (xhtml)
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1426 g_string_append_printf(xhtml, "<span style='background: %s;'>", g_strstrip(color->str));
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1427 g_string_free(color, TRUE);
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1428 if ((c = strchr(p, '>')) != NULL)
10623
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1429 c++;
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1430 else
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1431 c = p;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1432 pt->src_tag = "body";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1433 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1434 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1435 did_something = TRUE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1436 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1437 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1438 p++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1439 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1440 if (did_something) continue;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1441 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1442 /* this has to come after the special case for bgcolor */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1443 ALLOW_TAG("body");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1444 if(!g_ascii_strncasecmp(c, "<!--", strlen("<!--"))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1445 char *p = strstr(c + strlen("<!--"), "-->");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1446 if(p) {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1447 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1448 xhtml = g_string_append(xhtml, "<!--");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1449 c += strlen("<!--");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1450 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1451 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1452 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1453
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1454 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1455 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1456 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1457 plain = g_string_append_c(plain, '<');
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1458 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1459 }
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1460 } else if(*c == '&') {
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1461 char buf[7];
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1462 const char *pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1463 int len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1464
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1465 if ((pln = purple_markup_unescape_entity(c, &len)) == NULL) {
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1466 len = 1;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1467 g_snprintf(buf, sizeof(buf), "%c", *c);
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1468 pln = buf;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1469 }
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1470 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1471 xhtml = g_string_append_len(xhtml, c, len);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1472 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1473 plain = g_string_append(plain, pln);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1474 if(cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1475 cdata = g_string_append_len(cdata, c, len);
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1476 c += len;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1477 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1478 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1479 xhtml = g_string_append_c(xhtml, *c);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1480 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1481 plain = g_string_append_c(plain, *c);
19327
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1482 if(cdata)
9e4780ab2d46 When converting to xhtml, only add URLs in angle brackets if it doesn't match the cdata. Fixes #2445
Sean Egan <seanegan@pidgin.im>
parents: 18871
diff changeset
1483 cdata = g_string_append_c(cdata, *c);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1484 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1485 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1486 }
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1487 if(xhtml) {
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1488 for (tag = tags; tag ; tag = tag->next) {
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1489 struct purple_parse_tag *pt = tag->data;
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1490 if(!pt->ignore)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1491 g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1492 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1493 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1494 g_list_free(tags);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1495 if(xhtml_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1496 *xhtml_out = g_string_free(xhtml, FALSE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1497 if(plain_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1498 *plain_out = g_string_free(plain, FALSE);
18813
5be99af1b48b This was crashing for me when writing a system message when logging
Mark Doliner <markdoliner@pidgin.im>
parents: 18741
diff changeset
1499 if(url)
5be99af1b48b This was crashing for me when writing a system message when logging
Mark Doliner <markdoliner@pidgin.im>
parents: 18741
diff changeset
1500 g_string_free(url, TRUE);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1501 if (cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1502 g_string_free(cdata, TRUE);
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1503 #undef CHECK_QUOTE
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1504 #undef VALID_CHAR
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1505 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1506
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1507 /* The following are probably reasonable changes:
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1508 * - \n should be converted to a normal space
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1509 * - in addition to <br>, <p> and <div> etc. should also be converted into \n
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1510 * - We want to turn </td>#whitespace<td> sequences into a single tab
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1511 * - We want to turn </tr>#whitespace<tr> sequences into a single \n
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1512 * - <script>...</script> and <style>...</style> should be completely removed
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1513 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1514
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1515 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1516 purple_markup_strip_html(const char *str)
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1517 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1518 int i, j, k, entlen;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1519 gboolean visible = TRUE;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1520 gboolean closing_td_p = FALSE;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1521 gchar *str2;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1522 const gchar *cdata_close_tag = NULL, *ent;
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1523 gchar *href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1524 int href_st = 0;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1525
7110
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1526 if(!str)
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1527 return NULL;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1528
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1529 str2 = g_strdup(str);
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1530
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1531 for (i = 0, j = 0; str2[i]; i++)
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1532 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1533 if (str2[i] == '<')
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1534 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1535 if (cdata_close_tag)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1536 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1537 /* Note: Don't even assume any other tag is a tag in CDATA */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1538 if (g_ascii_strncasecmp(str2 + i, cdata_close_tag,
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1539 strlen(cdata_close_tag)) == 0)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1540 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1541 i += strlen(cdata_close_tag) - 1;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1542 cdata_close_tag = NULL;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1543 }
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1544 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1545 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1546 else if (g_ascii_strncasecmp(str2 + i, "<td", 3) == 0 && closing_td_p)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1547 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1548 str2[j++] = '\t';
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1549 visible = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1550 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1551 else if (g_ascii_strncasecmp(str2 + i, "</td>", 5) == 0)
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1552 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1553 closing_td_p = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1554 visible = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1555 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1556 else
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1557 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1558 closing_td_p = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1559 visible = TRUE;
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1560 }
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1561
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1562 k = i + 1;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1563
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1564 if(g_ascii_isspace(str2[k]))
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1565 visible = TRUE;
9170
18732ae70740 [gaim-migrate @ 9955]
Tim Ringenbach <marv@pidgin.im>
parents: 9161
diff changeset
1566 else if (str2[k])
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1567 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1568 /* Scan until we end the tag either implicitly (closed start
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1569 * tag) or explicitly, using a sloppy method (i.e., < or >
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1570 * inside quoted attributes will screw us up)
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1571 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1572 while (str2[k] && str2[k] != '<' && str2[k] != '>')
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1573 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1574 k++;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1575 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1576
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1577 /* If we've got an <a> tag with an href, save the address
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1578 * to print later. */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1579 if (g_ascii_strncasecmp(str2 + i, "<a", 2) == 0 &&
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1580 g_ascii_isspace(str2[i+2]))
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1581 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1582 int st; /* start of href, inclusive [ */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1583 int end; /* end of href, exclusive ) */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1584 char delim = ' ';
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1585 /* Find start of href */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1586 for (st = i + 3; st < k; st++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1587 {
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1588 if (g_ascii_strncasecmp(str2+st, "href=", 5) == 0)
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1589 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1590 st += 5;
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
1591 if (str2[st] == '"' || str2[st] == '\'')
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1592 {
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
1593 delim = str2[st];
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1594 st++;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1595 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1596 break;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1597 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1598 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1599 /* find end of address */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1600 for (end = st; end < k && str2[end] != delim; end++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1601 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1602 /* All the work is done in the loop construct above. */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1603 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1604
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1605 /* If there's an address, save it. If there was
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1606 * already one saved, kill it. */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1607 if (st < k)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1608 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1609 char *tmp;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1610 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1611 tmp = g_strndup(str2 + st, end - st);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1612 href = purple_unescape_html(tmp);
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1613 g_free(tmp);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1614 href_st = j;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1615 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1616 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1617
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1618 /* Replace </a> with an ascii representation of the
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1619 * address the link was pointing to. */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1620 else if (href != NULL && g_ascii_strncasecmp(str2 + i, "</a>", 4) == 0)
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1621 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1622 size_t hrlen = strlen(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1623
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1624 /* Only insert the href if it's different from the CDATA. */
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
1625 if ((hrlen != (gsize)(j - href_st) ||
12640
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
1626 strncmp(str2 + href_st, href, hrlen)) &&
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
1627 (hrlen != (gsize)(j - href_st + 7) || /* 7 == strlen("http://") */
12640
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
1628 strncmp(str2 + href_st, href + 7, hrlen - 7)))
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1629 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1630 str2[j++] = ' ';
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
1631 str2[j++] = '(';
39222
493e458b5943 util: Remove usage of deprecated g_memmove()
Mike Ruprecht <cmaiku@gmail.com>
parents: 39120
diff changeset
1632 memmove(str2 + j, href, hrlen);
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1633 j += hrlen;
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
1634 str2[j++] = ')';
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1635 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1636 href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1637 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1638 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1639
29924
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1640 /* Check for tags which should be mapped to newline (but ignore some of
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1641 * the tags at the beginning of the text) */
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1642 else if ((j && (g_ascii_strncasecmp(str2 + i, "<p>", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1643 || g_ascii_strncasecmp(str2 + i, "<tr", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1644 || g_ascii_strncasecmp(str2 + i, "<hr", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1645 || g_ascii_strncasecmp(str2 + i, "<li", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
1646 || g_ascii_strncasecmp(str2 + i, "<div", 4) == 0))
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1647 || g_ascii_strncasecmp(str2 + i, "<br", 3) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1648 || g_ascii_strncasecmp(str2 + i, "</table>", 8) == 0)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1649 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1650 str2[j++] = '\n';
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1651 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1652 /* Check for tags which begin CDATA and need to be closed */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1653 else if (g_ascii_strncasecmp(str2 + i, "<script", 7) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1654 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1655 cdata_close_tag = "</script>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1656 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1657 else if (g_ascii_strncasecmp(str2 + i, "<style", 6) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1658 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1659 cdata_close_tag = "</style>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1660 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1661 /* Update the index and continue checking after the tag */
10731
8d817cb4268b [gaim-migrate @ 12333]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10700
diff changeset
1662 i = (str2[k] == '<' || str2[k] == '\0')? k - 1: k;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1663 continue;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1664 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1665 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1666 else if (cdata_close_tag)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1667 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1668 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1669 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1670 else if (!g_ascii_isspace(str2[i]))
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1671 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1672 visible = TRUE;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1673 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1674
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1675 if (str2[i] == '&' && (ent = purple_markup_unescape_entity(str2 + i, &entlen)) != NULL)
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1676 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1677 while (*ent)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1678 str2[j++] = *ent++;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1679 i += entlen - 1;
9273
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
1680 continue;
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
1681 }
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
1682
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1683 if (visible)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1684 str2[j++] = g_ascii_isspace(str2[i])? ' ': str2[i];
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1685 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1686
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1687 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1688
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1689 str2[j] = '\0';
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1690
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1691 return str2;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1692 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1693
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1694 static gboolean
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1695 badchar(char c)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1696 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1697 switch (c) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1698 case ' ':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1699 case ',':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1700 case '\0':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1701 case '\n':
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
1702 case '\r':
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1703 case '<':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1704 case '>':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1705 case '"':
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1706 return TRUE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1707 default:
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1708 return FALSE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1709 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1710 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
1711
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1712 static gboolean
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1713 badentity(const char *c)
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1714 {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1715 if (!g_ascii_strncasecmp(c, "&lt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1716 !g_ascii_strncasecmp(c, "&gt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1717 !g_ascii_strncasecmp(c, "&quot;", 6)) {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1718 return TRUE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1719 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1720 return FALSE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1721 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1722
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1723 static const char *
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1724 process_link(GString *ret,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1725 const char *start, const char *c,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1726 int matchlen,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1727 const char *urlprefix,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1728 int inside_paren)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1729 {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1730 char *url_buf, *tmpurlbuf;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1731 const char *t;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1732
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1733 for (t = c;; t++) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1734 if (!badchar(*t) && !badentity(t))
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1735 continue;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1736
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1737 if (t - c == matchlen)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1738 break;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1739
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1740 if (*t == ',' && *(t + 1) != ' ') {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1741 continue;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1742 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1743
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1744 if (t > start && *(t - 1) == '.')
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1745 t--;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1746 if (t > start && *(t - 1) == ')' && inside_paren > 0)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1747 t--;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1748
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1749 url_buf = g_strndup(c, t - c);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1750 tmpurlbuf = purple_unescape_html(url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1751 g_string_append_printf(ret, "<A HREF=\"%s%s\">%s</A>",
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1752 urlprefix,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1753 tmpurlbuf, url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1754 g_free(tmpurlbuf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1755 g_free(url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1756 return t;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1757 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1758
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1759 return c;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1760 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1761
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1762 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1763 purple_markup_linkify(const char *text)
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1764 {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1765 const char *c, *t, *q = NULL;
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1766 char *tmpurlbuf, *url_buf;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1767 gunichar g;
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1768 gboolean inside_html = FALSE;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1769 int inside_paren = 0;
23979
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1770 GString *ret;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1771
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1772 if (text == NULL)
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1773 return NULL;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1774
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
1775 ret = g_string_new("");
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1776
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1777 c = text;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1778 while (*c) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1779
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1780 if(*c == '(' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1781 inside_paren++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1782 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1783 c++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1784 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1785
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1786 if(inside_html) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1787 if(*c == '>') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1788 inside_html = FALSE;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1789 } else if(!q && (*c == '\"' || *c == '\'')) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1790 q = c;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1791 } else if(q) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1792 if(*c == *q)
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1793 q = NULL;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1794 }
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1795 } else if(*c == '<') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
1796 inside_html = TRUE;
9077
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1797 if (!g_ascii_strncasecmp(c, "<A", 2)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1798 while (1) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1799 if (!g_ascii_strncasecmp(c, "/A>", 3)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1800 inside_html = FALSE;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1801 break;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1802 }
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1803 ret = g_string_append_c(ret, *c);
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1804 c++;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1805 if (!(*c))
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
1806 break;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1807 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1808 }
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1809 } else if (!g_ascii_strncasecmp(c, "http://", 7)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1810 c = process_link(ret, text, c, 7, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1811 } else if (!g_ascii_strncasecmp(c, "https://", 8)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1812 c = process_link(ret, text, c, 8, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1813 } else if (!g_ascii_strncasecmp(c, "ftp://", 6)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1814 c = process_link(ret, text, c, 6, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1815 } else if (!g_ascii_strncasecmp(c, "sftp://", 7)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1816 c = process_link(ret, text, c, 7, "", inside_paren);
30412
b5992fc34f0f Linkify file://
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30411
diff changeset
1817 } else if (!g_ascii_strncasecmp(c, "file://", 7)) {
b5992fc34f0f Linkify file://
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30411
diff changeset
1818 c = process_link(ret, text, c, 7, "", inside_paren);
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1819 } else if (!g_ascii_strncasecmp(c, "www.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1820 c = process_link(ret, text, c, 4, "http://", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1821 } else if (!g_ascii_strncasecmp(c, "ftp.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1822 c = process_link(ret, text, c, 4, "ftp://", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1823 } else if (!g_ascii_strncasecmp(c, "xmpp:", 5) && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
1824 c = process_link(ret, text, c, 5, "", inside_paren);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1825 } else if (!g_ascii_strncasecmp(c, "mailto:", 7)) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1826 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1827 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1828 if (badchar(*t) || badentity(t)) {
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1829 char *d;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1830 if (t - c == 7) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1831 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1832 }
30413
01ee7dd615b7 Prevent an invalid read when a message starts with 'mailto:'.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30412
diff changeset
1833 if (t > text && *(t - 1) == '.')
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1834 t--;
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1835 if ((d = strstr(c + 7, "?")) != NULL && d < t)
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1836 url_buf = g_strndup(c + 7, d - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1837 else
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1838 url_buf = g_strndup(c + 7, t - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1839 if (!purple_email_is_valid(url_buf)) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1840 g_free(url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1841 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1842 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
1843 g_free(url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1844 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1845 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1846 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
1847 tmpurlbuf, url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1848 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
1849 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1850 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1851 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1852 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1853 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1854 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1855 } else if (c != text && (*c == '@')) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1856 int flag;
10905
56943fe311c2 [gaim-migrate @ 12634]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10902
diff changeset
1857 GString *gurl_buf = NULL;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1858 const char illegal_chars[] = "!@#$%^&*()[]{}/|\\<>\":;\r\n \0";
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1859
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1860 if (strchr(illegal_chars,*(c - 1)) || strchr(illegal_chars, *(c + 1)))
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1861 flag = 0;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1862 else {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1863 flag = 1;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1864 gurl_buf = g_string_new("");
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1865 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1866
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1867 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1868 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1869 /* iterate backwards grabbing the local part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1870 g = g_utf8_get_char(t);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1871 if (badchar(*t) || (g >= 127) || (*t == '(') ||
11176
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
1872 ((*t == ';') && ((t > (text+2) && (!g_ascii_strncasecmp(t - 3, "&lt;", 4) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
1873 !g_ascii_strncasecmp(t - 3, "&gt;", 4))) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
1874 (t > (text+4) && (!g_ascii_strncasecmp(t - 5, "&quot;", 6)))))) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1875 /* local part will already be part of ret, strip it out */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1876 ret = g_string_truncate(ret, ret->len - (c - t));
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1877 ret = g_string_append_unichar(ret, g);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1878 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1879 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1880 g_string_prepend_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1881 t = g_utf8_find_prev_char(text, t);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1882 if (t < text) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1883 ret = g_string_assign(ret, "");
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1884 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1885 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1886 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1887 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1888
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1889 t = g_utf8_find_next_char(c, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1890
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1891 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1892 /* iterate forwards grabbing the domain part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1893 g = g_utf8_get_char(t);
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
1894 if (badchar(*t) || (g >= 127) || (*t == ')') || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1895 char *d;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1896
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1897 url_buf = g_string_free(gurl_buf, FALSE);
39918
1c8e11f9274f Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39913
diff changeset
1898 gurl_buf = NULL;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1899
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1900 /* strip off trailing periods */
32189
3af8d41121b6 Don't use strlen() when all you're trying to do is check if the string
Mark Doliner <markdoliner@pidgin.im>
parents: 32147
diff changeset
1901 if (*url_buf) {
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1902 for (d = url_buf + strlen(url_buf) - 1; *d == '.'; d--, t--)
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1903 *d = '\0';
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1904 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1905
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1906 tmpurlbuf = purple_unescape_html(url_buf);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1907 if (purple_email_is_valid(tmpurlbuf)) {
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
1908 g_string_append_printf(ret, "<A HREF=\"mailto:%s\">%s</A>",
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
1909 tmpurlbuf, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
1910 } else {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
1911 g_string_append(ret, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
1912 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
1913 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
1914 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1915 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1916
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1917 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1918 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1919 g_string_append_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1920 t = g_utf8_find_next_char(t, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1921 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1922 }
39918
1c8e11f9274f Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39913
diff changeset
1923
1c8e11f9274f Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39913
diff changeset
1924 if (gurl_buf) {
1c8e11f9274f Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39913
diff changeset
1925 g_string_free(gurl_buf, TRUE);
1c8e11f9274f Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39913
diff changeset
1926 }
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1927 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1928
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1929 if(*c == ')' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1930 inside_paren--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1931 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
1932 c++;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1933 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1934
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1935 if (*c == 0)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1936 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1937
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1938 ret = g_string_append_c(ret, *c);
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1939 c++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1940
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1941 }
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1942 return g_string_free(ret, FALSE);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1943 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
1944
29697
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1945 char *purple_unescape_text(const char *in)
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1946 {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1947 GString *ret;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1948 const char *c = in;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1949
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1950 if (in == NULL)
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1951 return NULL;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1952
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1953 ret = g_string_new("");
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1954 while (*c) {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1955 int len;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1956 const char *ent;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1957
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1958 if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1959 g_string_append(ret, ent);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1960 c += len;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1961 } else {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1962 g_string_append_c(ret, *c);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1963 c++;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1964 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1965 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1966
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1967 return g_string_free(ret, FALSE);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1968 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
1969
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1970 char *purple_unescape_html(const char *html)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1971 {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1972 GString *ret;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1973 const char *c = html;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1974
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1975 if (html == NULL)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1976 return NULL;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1977
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1978 ret = g_string_new("");
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1979 while (*c) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1980 int len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1981 const char *ent;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1982
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1983 if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1984 g_string_append(ret, ent);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1985 c += len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1986 } else if (!strncmp(c, "<br>", 4)) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1987 g_string_append_c(ret, '\n');
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1988 c += 4;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1989 } else {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1990 g_string_append_c(ret, *c);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1991 c++;
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
1992 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
1993 }
14101
89a79c2a971e [gaim-migrate @ 16643]
Mark Doliner <markdoliner@pidgin.im>
parents: 14097
diff changeset
1994
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
1995 return g_string_free(ret, FALSE);
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
1996 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
1997
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
1998 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1999 purple_markup_slice(const char *str, guint x, guint y)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2000 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2001 GString *ret;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2002 GQueue *q;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2003 guint z = 0;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2004 gboolean appended = FALSE;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2005 gunichar c;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2006 char *tag;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2007
24641
ad3f1852b35a Fix CID #389
Richard Laager <rlaager@pidgin.im>
parents: 24492
diff changeset
2008 g_return_val_if_fail(str != NULL, NULL);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2009 g_return_val_if_fail(x <= y, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2010
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2011 if (x == y)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2012 return g_strdup("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2013
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2014 ret = g_string_new("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2015 q = g_queue_new();
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2016
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2017 while (*str && (z < y)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2018 c = g_utf8_get_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2019
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2020 if (c == '<') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2021 char *end = strchr(str, '>');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2022
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2023 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2024 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2025 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2026 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2027 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2028 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2029 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2030
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2031 if (!g_ascii_strncasecmp(str, "<img ", 5)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2032 z += strlen("[Image]");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2033 } else if (!g_ascii_strncasecmp(str, "<br", 3)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2034 z += 1;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2035 } else if (!g_ascii_strncasecmp(str, "<hr>", 4)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2036 z += strlen("\n---\n");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2037 } else if (!g_ascii_strncasecmp(str, "</", 2)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2038 /* pop stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2039 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2040
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2041 tmp = g_queue_pop_head(q);
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2042 g_free(tmp);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2043 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2044 } else {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2045 /* push it unto the stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2046 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2047
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2048 tmp = g_strndup(str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2049 g_queue_push_head(q, tmp);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2050 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2051 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2052
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2053 if (z >= x) {
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2054 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2055 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2056
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2057 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2058 } else if (c == '&') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2059 char *end = strchr(str, ';');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2060 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2061 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2062 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2063 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2064 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2065
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2066 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2067 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2068
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2069 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2070 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2071
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2072 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2073 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2074 } else {
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2075 if (z == x && z > 0 && !appended) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2076 GList *l = q->tail;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2077
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2078 while (l) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2079 tag = l->data;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2080 g_string_append(ret, tag);
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2081 l = l->prev;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2082 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2083 appended = TRUE;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2084 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2085
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2086 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2087 g_string_append_unichar(ret, c);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2088 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2089 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2090
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2091 str = g_utf8_next_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2092 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2093
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2094 while ((tag = g_queue_pop_head(q))) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2095 char *name;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2096
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2097 name = purple_markup_get_tag_name(tag);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2098 g_string_append_printf(ret, "</%s>", name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2099 g_free(name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2100 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2101 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2102
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2103 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2104 return g_string_free(ret, FALSE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2105 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2106
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2107 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2108 purple_markup_get_tag_name(const char *tag)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2109 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2110 int i;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2111 g_return_val_if_fail(tag != NULL, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2112 g_return_val_if_fail(*tag == '<', NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2113
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2114 for (i = 1; tag[i]; i++)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2115 if (tag[i] == '>' || tag[i] == ' ' || tag[i] == '/')
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2116 break;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2117
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2118 return g_strndup(tag+1, i-1);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2119 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2120
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2121 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2122 * Path/Filename Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2123 **************************************************************************/
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2124 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2125 purple_home_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2126 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2127 #ifndef _WIN32
11665
6b80cef9b563 [gaim-migrate @ 13950]
Michael Carlson <corfe83@users.sourceforge.net>
parents: 11656
diff changeset
2128 return g_get_home_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2129 #else
35864
a9dfa29e3382 cross-win32: correct PURPLE_DATADIR location, rename misleading wpurple_data_dir()
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35837
diff changeset
2130 return wpurple_home_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2131 #endif
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2132 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2133
16415
8cbcd9756090 Use ~/.purple only, never ~/.gaim. This is a revert of the functional
Richard Laager <rlaager@pidgin.im>
parents: 16230
diff changeset
2134 /* Returns the argument passed to -c IFF it was present, or ~/.purple. */
10332
62ed0121db22 [gaim-migrate @ 11539]
Mark Doliner <markdoliner@pidgin.im>
parents: 10258
diff changeset
2135 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2136 purple_user_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2137 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2138 if (custom_user_dir != NULL)
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2139 return custom_user_dir;
20345
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2140 else if (!user_dir)
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2141 user_dir = g_build_filename(purple_home_dir(), ".purple", NULL);
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2142
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2143 return user_dir;
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2144 }
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2145
38892
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2146 static const gchar *
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2147 purple_xdg_dir(gchar **xdg_dir, const gchar *xdg_base_dir, const gchar *xdg_type)
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2148 {
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2149 if (!*xdg_dir) {
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2150 if (!custom_user_dir) {
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2151 *xdg_dir = g_build_filename(xdg_base_dir, "purple", NULL);
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2152 } else {
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2153 *xdg_dir = g_build_filename(custom_user_dir, xdg_type, NULL);
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2154 }
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2155 }
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2156
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2157 return *xdg_dir;
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2158 }
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2159
38890
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
2160 const gchar *
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2161 purple_cache_dir(void)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2162 {
38892
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2163 return purple_xdg_dir(&cache_dir, g_get_user_cache_dir(), "cache");
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2164 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2165
38890
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
2166 const gchar *
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2167 purple_config_dir(void)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2168 {
38892
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2169 return purple_xdg_dir(&config_dir, g_get_user_config_dir(), "config");
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2170 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2171
38890
d2408369eb7c Use gchar for xdg dirs variables
qarkai <qarkai@gmail.com>
parents: 38880
diff changeset
2172 const gchar *
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2173 purple_data_dir(void)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2174 {
38892
eff4283fc188 Use common function for getting XDG specific directory
qarkai <qarkai@gmail.com>
parents: 38890
diff changeset
2175 return purple_xdg_dir(&data_dir, g_get_user_data_dir(), "data");
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2176 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2177
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2178 gboolean
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2179 purple_move_to_xdg_base_dir(const char *purple_xdg_dir, char *path)
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2180 {
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2181 gint mkdir_res;
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2182 gchar *xdg_path;
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2183 gboolean xdg_path_exists;
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2184
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2185 /* Create destination directory */
40124
cdce45867b10 Replace purple_build_dir with g_mkdir_with_parents.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 40123
diff changeset
2186 mkdir_res = g_mkdir_with_parents(purple_xdg_dir, S_IRWXU);
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2187 if (mkdir_res == -1) {
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2188 purple_debug_error("util", "Error creating xdg directory %s: %s; failed migration\n",
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2189 purple_xdg_dir, g_strerror(errno));
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2190 return FALSE;
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2191 }
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2192
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2193 xdg_path = g_build_filename(purple_xdg_dir, path, NULL);
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2194 xdg_path_exists = g_file_test(xdg_path, G_FILE_TEST_EXISTS);
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2195 if (!xdg_path_exists) {
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2196 gchar *old_path;
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2197 gboolean old_path_exists;
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2198
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2199 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2200 old_path = g_build_filename(purple_user_dir(), path, NULL);
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2201 G_GNUC_END_IGNORE_DEPRECATIONS
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2202 old_path_exists = g_file_test(old_path, G_FILE_TEST_EXISTS);
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2203 if (old_path_exists) {
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2204 int rename_res;
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2205
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2206 rename_res = g_rename(old_path, xdg_path);
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2207 if (rename_res == -1) {
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2208 purple_debug_error("util", "Error renaming %s to %s; failed migration\n",
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2209 old_path, xdg_path);
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2210 g_free(old_path);
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2211 g_free(xdg_path);
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2212
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2213 return FALSE;
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2214 }
38874
0fc4ba7fa2be Make XDG dir structure inside custom user dir
qarkai <qarkai@gmail.com>
parents: 38872
diff changeset
2215 }
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2216
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2217 g_free(old_path);
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2218 }
38871
87a902172ff8 Respect -c option
qarkai <qarkai@gmail.com>
parents: 38870
diff changeset
2219
38878
6d800b496317 Migrate xmpp-caps.xml to XDG cache dir
qarkai <qarkai@gmail.com>
parents: 38877
diff changeset
2220 g_free(xdg_path);
38893
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2221
ea7c40572374 Move migration to core, check for errors
qarkai <qarkai@gmail.com>
parents: 38892
diff changeset
2222 return TRUE;
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2223 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2224
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2225 void purple_util_set_user_dir(const char *dir)
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2226 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2227 g_free(custom_user_dir);
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2228
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2229 if (dir != NULL && *dir)
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2230 custom_user_dir = g_strdup(dir);
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2231 else
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2232 custom_user_dir = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2233 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2234
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2235 static gboolean
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2236 purple_util_write_data_to_file_common(const char *dir, const char *filename, const char *data, gssize size)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2237 {
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2238 gchar *filename_full;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2239 gboolean ret = FALSE;
38872
af422a3fb924 Add purple_util_write_data_to_*_file declarations
qarkai <qarkai@gmail.com>
parents: 38871
diff changeset
2240
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2241 g_return_val_if_fail(dir != NULL, FALSE);
38872
af422a3fb924 Add purple_util_write_data_to_*_file declarations
qarkai <qarkai@gmail.com>
parents: 38871
diff changeset
2242
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2243 purple_debug_misc("util", "Writing file %s to directory %s",
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2244 filename, dir);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2245
38874
0fc4ba7fa2be Make XDG dir structure inside custom user dir
qarkai <qarkai@gmail.com>
parents: 38872
diff changeset
2246 /* Ensure the directory exists */
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2247 if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2248 {
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2249 if (g_mkdir(dir, S_IRUSR | S_IWUSR | S_IXUSR) == -1)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2250 {
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2251 purple_debug_error("util", "Error creating directory %s: %s\n",
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2252 dir, g_strerror(errno));
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2253 return FALSE;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2254 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2255 }
38872
af422a3fb924 Add purple_util_write_data_to_*_file declarations
qarkai <qarkai@gmail.com>
parents: 38871
diff changeset
2256
38899
73b49f76016a Some fixes
qarkai <qarkai@gmail.com>
parents: 38893
diff changeset
2257 filename_full = g_build_filename(dir, filename, NULL);
38872
af422a3fb924 Add purple_util_write_data_to_*_file declarations
qarkai <qarkai@gmail.com>
parents: 38871
diff changeset
2258
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2259 ret = purple_util_write_data_to_file_absolute(filename_full, data, size);
38872
af422a3fb924 Add purple_util_write_data_to_*_file declarations
qarkai <qarkai@gmail.com>
parents: 38871
diff changeset
2260
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2261 g_free(filename_full);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2262 return ret;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2263 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2264
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2265 gboolean
19585
14b519abcc26 Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <datallah@pidgin.im>
parents: 19327
diff changeset
2266 purple_util_write_data_to_file(const char *filename, const char *data, gssize size)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2267 {
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2268 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2269 const char *user_dir = purple_user_dir();
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2270 G_GNUC_END_IGNORE_DEPRECATIONS
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2271 gboolean ret = purple_util_write_data_to_file_common(user_dir, filename, data, size);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2272
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2273 return ret;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2274 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2275
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2276 gboolean
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2277 purple_util_write_data_to_cache_file(const char *filename, const char *data, gssize size)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2278 {
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2279 const char *cache_dir = purple_cache_dir();
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2280 gboolean ret = purple_util_write_data_to_file_common(cache_dir, filename, data, size);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2281
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2282 return ret;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2283 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2284
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2285 gboolean
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2286 purple_util_write_data_to_config_file(const char *filename, const char *data, gssize size)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2287 {
38881
25cb836b9cec Use proper directories for writing data.
Arkadiy Illarionov <qarkai@gmail.com>
parents: 38874
diff changeset
2288 const char *config_dir = purple_config_dir();
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2289 gboolean ret = purple_util_write_data_to_file_common(config_dir, filename, data, size);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2290
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2291 return ret;
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2292 }
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2293
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2294 gboolean
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2295 purple_util_write_data_to_data_file(const char *filename, const char *data, gssize size)
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2296 {
38881
25cb836b9cec Use proper directories for writing data.
Arkadiy Illarionov <qarkai@gmail.com>
parents: 38874
diff changeset
2297 const char *data_dir = purple_data_dir();
38870
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2298 gboolean ret = purple_util_write_data_to_file_common(data_dir, filename, data, size);
575e41bfc15e Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents: 38051
diff changeset
2299
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2300 return ret;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2301 }
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2302
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2303 gboolean
20931
27b539a198ce purple_util_write_data_to_file_absolute() should take a signed argument for the size as -1 is used to indicate that the string is nul-delimited. This resolves CID 330.
Daniel Atallah <datallah@pidgin.im>
parents: 20747
diff changeset
2304 purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, gssize size)
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2305 {
38998
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2306 GFile *file;
38996
01ac2f470b5f util: Simplify purple_util_write_data_to_file_absolute()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38929
diff changeset
2307 GError *err = NULL;
01ac2f470b5f util: Simplify purple_util_write_data_to_file_absolute()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38929
diff changeset
2308
38998
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2309 g_return_val_if_fail(size >= -1, FALSE);
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2310
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2311 if (size == -1) {
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2312 size = strlen(data);
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2313 }
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2314
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2315 file = g_file_new_for_path(filename_full);
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2316
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2317 if (!g_file_replace_contents(file, data, size, NULL, FALSE,
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2318 G_FILE_CREATE_PRIVATE, NULL, NULL, &err)) {
38996
01ac2f470b5f util: Simplify purple_util_write_data_to_file_absolute()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38929
diff changeset
2319 purple_debug_error("util", "Error writing file: %s: %s\n",
01ac2f470b5f util: Simplify purple_util_write_data_to_file_absolute()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38929
diff changeset
2320 filename_full, err->message);
01ac2f470b5f util: Simplify purple_util_write_data_to_file_absolute()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38929
diff changeset
2321 g_clear_error(&err);
38998
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2322 g_object_unref(file);
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2323 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2324 }
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2325
38998
5d5fb6bce103 util: Write files with permission mode 0600 again
Mike Ruprecht <cmaiku@gmail.com>
parents: 38996
diff changeset
2326 g_object_unref(file);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2327 return TRUE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2328 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2329
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34892
diff changeset
2330 PurpleXmlNode *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2331 purple_util_read_xml_from_file(const char *filename, const char *description)
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2332 {
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2333 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
34935
686fa55b0deb Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents: 34892
diff changeset
2334 return purple_xmlnode_from_file(purple_user_dir(), filename, description, "util");
39437
9ab3a99af8d0 Mark deprecated functions with G_DEPRECATED_FOR.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39323
diff changeset
2335 G_GNUC_END_IGNORE_DEPRECATIONS
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2336 }
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2337
38877
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2338 PurpleXmlNode *
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2339 purple_util_read_xml_from_cache_file(const char *filename, const char *description)
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2340 {
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2341 return purple_xmlnode_from_file(purple_cache_dir(), filename, description, "util");
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2342 }
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2343
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2344 PurpleXmlNode *
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2345 purple_util_read_xml_from_config_file(const char *filename, const char *description)
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2346 {
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2347 return purple_xmlnode_from_file(purple_config_dir(), filename, description, "util");
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2348 }
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2349
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2350 PurpleXmlNode *
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2351 purple_util_read_xml_from_data_file(const char *filename, const char *description)
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2352 {
4e9c691a1d2d Add functions for reading XML files from XDG dirs
qarkai <qarkai@gmail.com>
parents: 38876
diff changeset
2353 return purple_xmlnode_from_file(purple_data_dir(), filename, description, "util");
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2354 }
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2355
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2356 /*
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2357 * Like mkstemp() but returns a file pointer, uses a pre-set template,
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2358 * uses the semantics of tempnam() for the directory to use and allocates
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2359 * the space for the filepath.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2360 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2361 * Caller is responsible for closing the file and removing it when done,
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2362 * as well as freeing the space pointed-to by "path" with g_free().
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2363 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2364 * Returns NULL on failure and cleans up after itself if so.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2365 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2366 static const char *purple_mkstemp_templ = {"purpleXXXXXX"};
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2367
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2368 FILE *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2369 purple_mkstemp(char **fpath, gboolean binary)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2370 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2371 const gchar *tmpdir;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2372 int fd;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2373 FILE *fp = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2374
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2375 g_return_val_if_fail(fpath != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2376
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2377 if((tmpdir = (gchar*)g_get_tmp_dir()) != NULL) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2378 if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, purple_mkstemp_templ)) != NULL) {
16915
a2d4de1d8ca2 _mktmp() sucks, so use g_mkstemp() instead. This probably doesn't have to be done differently for win32 and elsewhere, but I don't want to be changing things right now.
Daniel Atallah <datallah@pidgin.im>
parents: 16610
diff changeset
2379 fd = g_mkstemp(*fpath);
a2d4de1d8ca2 _mktmp() sucks, so use g_mkstemp() instead. This probably doesn't have to be done differently for win32 and elsewhere, but I don't want to be changing things right now.
Daniel Atallah <datallah@pidgin.im>
parents: 16610
diff changeset
2380 if(fd == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2381 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2382 "Couldn't make \"%s\", error: %d\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2383 *fpath, errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2384 } else {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2385 if((fp = fdopen(fd, "r+")) == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2386 close(fd);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2387 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2388 "Couldn't fdopen(), error: %d\n", errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2389 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2390 }
16915
a2d4de1d8ca2 _mktmp() sucks, so use g_mkstemp() instead. This probably doesn't have to be done differently for win32 and elsewhere, but I don't want to be changing things right now.
Daniel Atallah <datallah@pidgin.im>
parents: 16610
diff changeset
2391
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2392 if(!fp) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2393 g_free(*fpath);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2394 *fpath = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2395 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2396 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2397 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2398 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
13985
9d115b698045 [gaim-migrate @ 16439]
Mark Doliner <markdoliner@pidgin.im>
parents: 13836
diff changeset
2399 "g_get_tmp_dir() failed!\n");
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2400 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2401
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2402 return fp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2403 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2404
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2405 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2406 purple_program_is_valid(const char *program)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2407 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2408 GError *error = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2409 char **argv;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2410 gchar *progname;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2411 gboolean is_valid = FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2412
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2413 g_return_val_if_fail(program != NULL, FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2414 g_return_val_if_fail(*program != '\0', FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2415
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2416 if (!g_shell_parse_argv(program, NULL, &argv, &error)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2417 purple_debug(PURPLE_DEBUG_ERROR, "program_is_valid",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2418 "Could not parse program '%s': %s\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2419 program, error->message);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2420 g_error_free(error);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2421 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2422 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2423
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2424 if (argv == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2425 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2426 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2427
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2428 progname = g_find_program_in_path(argv[0]);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2429 is_valid = (progname != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2430
30797
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2431 if(purple_debug_is_verbose())
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2432 purple_debug_info("program_is_valid", "Tested program %s. %s.\n", program,
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2433 is_valid ? "Valid" : "Invalid");
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2434
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2435 g_strfreev(argv);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2436 g_free(progname);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2437
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2438 return is_valid;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2439 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2440
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2441
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2442 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2443 purple_running_gnome(void)
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2444 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2445 #ifndef _WIN32
38043
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2446 gchar *tmp = g_find_program_in_path("gvfs-open");
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2447
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2448 if (tmp == NULL) {
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2449 tmp = g_find_program_in_path("gnome-open");
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2450
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2451 if (tmp == NULL) {
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2452 return FALSE;
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2453 }
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2454 }
3549ff786eab util: Fix purple_running_gnome() to check for gvfs-open too
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
2455
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2456 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2457
21665
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
2458 tmp = (gchar *)g_getenv("GNOME_DESKTOP_SESSION_ID");
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
2459
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
2460 return ((tmp != NULL) && (*tmp != '\0'));
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2461 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2462 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2463 #endif
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2464 }
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2465
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2466 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2467 purple_running_kde(void)
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2468 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2469 #ifndef _WIN32
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2470 gchar *tmp = g_find_program_in_path("kfmclient");
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2471 const char *session;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2472
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2473 if (tmp == NULL)
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2474 return FALSE;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2475 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2476
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2477 session = g_getenv("KDE_FULL_SESSION");
25859
b42be7bb9dac Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents: 25854
diff changeset
2478 if (purple_strequal(session, "true"))
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2479 return TRUE;
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2480
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2481 /* If you run Purple from Konsole under !KDE, this will provide a
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2482 * a false positive. Since we do the GNOME checks first, this is
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2483 * only a problem if you're running something !(KDE || GNOME) and
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2484 * you run Purple from Konsole. This really shouldn't be a problem. */
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2485 return ((g_getenv("KDEDIR") != NULL) || g_getenv("KDEDIRS") != NULL);
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2486 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2487 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2488 #endif
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2489 }
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2490
15016
bdc3f402b3a0 [gaim-migrate @ 17733]
Luke Schierer <lschiere@pidgin.im>
parents: 14940
diff changeset
2491 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2492 purple_running_osx(void)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2493 {
16557
b0e9ddccdbb9 Fix purple_util_get_image_extension()'s data param. to be correctly marked as constant.
Daniel Atallah <datallah@pidgin.im>
parents: 16545
diff changeset
2494 #if defined(__APPLE__)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2495 return TRUE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2496 #else
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2497 return FALSE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2498 #endif
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2499 }
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2500
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2501 typedef union purple_sockaddr {
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2502 struct sockaddr sa;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2503 struct sockaddr_in sa_in;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2504 #if defined(AF_INET6)
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2505 struct sockaddr_in6 sa_in6;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2506 #endif
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2507 struct sockaddr_storage sa_stor;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2508 } PurpleSockaddr;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2509
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2510 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2511 purple_fd_get_ip(int fd)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2512 {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2513 PurpleSockaddr addr;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2514 socklen_t namelen = sizeof(addr);
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2515 int family;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2516
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2517 g_return_val_if_fail(fd != 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2518
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2519 if (getsockname(fd, &(addr.sa), &namelen))
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2520 return NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2521
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2522 family = addr.sa.sa_family;
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2523
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2524 if (family == AF_INET) {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2525 return g_strdup(inet_ntoa(addr.sa_in.sin_addr));
30026
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
2526 }
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
2527 #if defined(AF_INET6) && defined(HAVE_INET_NTOP)
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
2528 else if (family == AF_INET6) {
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2529 char host[INET6_ADDRSTRLEN];
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2530 const char *tmp;
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2531
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2532 tmp = inet_ntop(family, &(addr.sa_in6.sin6_addr), host, sizeof(host));
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2533 return g_strdup(tmp);
30026
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
2534 }
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2535 #endif
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2536
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
2537 return NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2538 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2539
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2540 int
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2541 purple_socket_get_family(int fd)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2542 {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2543 PurpleSockaddr addr;
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2544 socklen_t len = sizeof(addr);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2545
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2546 g_return_val_if_fail(fd >= 0, -1);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2547
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2548 if (getsockname(fd, &(addr.sa), &len))
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2549 return -1;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2550
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2551 return addr.sa.sa_family;
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2552 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2553
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2554 gboolean
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2555 purple_socket_speaks_ipv4(int fd)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2556 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2557 int family;
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2558
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2559 g_return_val_if_fail(fd >= 0, FALSE);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2560
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2561 family = purple_socket_get_family(fd);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2562
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2563 switch (family) {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2564 case AF_INET:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2565 return TRUE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2566 #if defined(IPV6_V6ONLY)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2567 case AF_INET6:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2568 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2569 int val = 0;
33884
3fd1628aa718 Fixing warnings (win32, glib, others)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2570 socklen_t len = sizeof(val);
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2571
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2572 if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2573 return FALSE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2574 return !val;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2575 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2576 #endif
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2577 default:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2578 return FALSE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2579 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
2580 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2581
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2582 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2583 * String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2584 **************************************************************************/
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
2585 const char *
39514
9c7715998bbc Cleanup account.[ch] and status.[ch] to remove g_type_class_add_private and other cleans including remove const from accessors
Gary Kramlich <grim@reaperworld.com>
parents: 39479
diff changeset
2586 purple_normalize(PurpleAccount *account, const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2587 {
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
2588 const char *ret = NULL;
16610
815ce4002357 sadrul fixed the next but not last crash
Luke Schierer <lschiere@pidgin.im>
parents: 16557
diff changeset
2589 static char buf[BUF_LEN];
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
2590
28410
184838e7f0c4 As darkrain pointed out this isnt caused by that certain bug in glib. My mistake. Recomment, and change how I test str to be NULL and return NULL.
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28407
diff changeset
2591 /* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
184838e7f0c4 As darkrain pointed out this isnt caused by that certain bug in glib. My mistake. Recomment, and change how I test str to be NULL and return NULL.
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28407
diff changeset
2592 g_return_val_if_fail(str != NULL, "");
28407
821a151ef20c g_utf8_normalize() for glib ver < 2.15.0 causes a crash when an invalid utf8 string is passed to it (http://bugzilla.gnome.org/show_bug.cgi?id=501997).
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28390
diff changeset
2593
13620
1374da61a5e2 [gaim-migrate @ 16005]
Richard Laager <rlaager@pidgin.im>
parents: 13616
diff changeset
2594 if (account != NULL)
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
2595 {
36544
1bf8b6ef5aea Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents: 36543
diff changeset
2596 PurpleProtocol *protocol =
36626
18fc361b3704 Renamed purple_find_protocol_info to purple_protocols_find
Ankit Vani <a@nevitus.org>
parents: 36606
diff changeset
2597 purple_protocols_find(purple_account_get_protocol_id(account));
36369
0e67a57e7077 Refactored util to use PurplePluginProtocolInfo instead of prpl
Ankit Vani <a@nevitus.org>
parents: 36361
diff changeset
2598
36630
ff356949df25 Refactored the rest of libpurple to use the new protocol API
Ankit Vani <a@nevitus.org>
parents: 36626
diff changeset
2599 if (protocol != NULL)
36719
0d7682bdf828 Updated protocol iface calls
Ankit Vani <a@nevitus.org>
parents: 36692
diff changeset
2600 ret = purple_protocol_client_iface_normalize(protocol, account, str);
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
2601 }
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
2602
13621
788d329bdfa0 [gaim-migrate @ 16006]
Richard Laager <rlaager@pidgin.im>
parents: 13620
diff changeset
2603 if (ret == NULL)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2604 {
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
2605 char *tmp;
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2606
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2607 tmp = g_utf8_normalize(str, -1, G_NORMALIZE_DEFAULT);
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
2608 g_snprintf(buf, sizeof(buf), "%s", tmp);
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
2609 g_free(tmp);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2610
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
2611 ret = buf;
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
2612 }
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2613
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
2614 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2615 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2616
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2617 /*
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2618 * You probably don't want to call this directly, it is
36637
9b0109ae118d Renamed some prpl stuff to protocol stuff.
Ankit Vani <a@nevitus.org>
parents: 36630
diff changeset
2619 * mainly for use as a protocol callback function. See the
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2620 * comments in util.h.
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2621 */
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2622 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2623 purple_normalize_nocase(const PurpleAccount *account, const char *str)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2624 {
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2625 static char buf[BUF_LEN];
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2626 char *tmp1, *tmp2;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2627
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2628 g_return_val_if_fail(str != NULL, NULL);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2629
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2630 tmp1 = g_utf8_strdown(str, -1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2631 tmp2 = g_utf8_normalize(tmp1, -1, G_NORMALIZE_DEFAULT);
13646
3bf958a5e352 [gaim-migrate @ 16043]
Daniel Atallah <datallah@pidgin.im>
parents: 13644
diff changeset
2632 g_snprintf(buf, sizeof(buf), "%s", tmp2 ? tmp2 : "");
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2633 g_free(tmp2);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2634 g_free(tmp1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2635
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2636 return buf;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2637 }
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
2638
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2639 gboolean
36544
1bf8b6ef5aea Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents: 36543
diff changeset
2640 purple_validate(const PurpleProtocol *protocol, const char *str)
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2641 {
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2642 const char *normalized;
33090
99d719d058df Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 33087
diff changeset
2643
36544
1bf8b6ef5aea Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents: 36543
diff changeset
2644 g_return_val_if_fail(protocol != NULL, FALSE);
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2645 g_return_val_if_fail(str != NULL, FALSE);
33090
99d719d058df Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 33087
diff changeset
2646
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2647 if (str[0] == '\0')
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2648 return FALSE;
33090
99d719d058df Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 33087
diff changeset
2649
39759
ea1401483849 Rename *_GET_*_IFACE to more standard *_GET_IFACE.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 39527
diff changeset
2650 if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, CLIENT, normalize))
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2651 return TRUE;
33090
99d719d058df Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 33087
diff changeset
2652
36719
0d7682bdf828 Updated protocol iface calls
Ankit Vani <a@nevitus.org>
parents: 36692
diff changeset
2653 normalized = purple_protocol_client_iface_normalize(PURPLE_PROTOCOL(protocol),
36630
ff356949df25 Refactored the rest of libpurple to use the new protocol API
Ankit Vani <a@nevitus.org>
parents: 36626
diff changeset
2654 NULL, str);
33090
99d719d058df Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 33087
diff changeset
2655
33087
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2656 return (NULL != normalized);
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2657 }
182da0516150 Libpurple: username validation support; Pidgin: use it in account setup dialog
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33066
diff changeset
2658
8700
0c9288c5e40e [gaim-migrate @ 9453]
Mark Doliner <markdoliner@pidgin.im>
parents: 8686
diff changeset
2659 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2660 purple_strdup_withhtml(const gchar *src)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2661 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2662 gulong destsize, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2663 gchar *dest;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2664
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2665 g_return_val_if_fail(src != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2666
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2667 /* New length is (length of src) + (number of \n's * 3) - (number of \r's) + 1 */
14002
fb323d3eefee [gaim-migrate @ 16475]
Mark Doliner <markdoliner@pidgin.im>
parents: 13994
diff changeset
2668 destsize = 1;
fb323d3eefee [gaim-migrate @ 16475]
Mark Doliner <markdoliner@pidgin.im>
parents: 13994
diff changeset
2669 for (i = 0; src[i] != '\0'; i++)
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2670 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2671 if (src[i] == '\n')
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2672 destsize += 4;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2673 else if (src[i] != '\r')
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2674 destsize++;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2675 }
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2676
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2677 dest = g_malloc(destsize);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2678
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2679 /* Copy stuff, ignoring \r's, because they are dumb */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2680 for (i = 0, j = 0; src[i] != '\0'; i++) {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2681 if (src[i] == '\n') {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2682 strcpy(&dest[j], "<BR>");
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2683 j += 4;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2684 } else if (src[i] != '\r')
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2685 dest[j++] = src[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2686 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2687
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2688 dest[destsize-1] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2689
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2690 return dest;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2691 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2692
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
2693 gboolean
35734
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2694 purple_str_has_caseprefix(const gchar *s, const gchar *p)
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2695 {
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2696 g_return_val_if_fail(s, FALSE);
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2697 g_return_val_if_fail(p, FALSE);
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2698
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2699 return (g_ascii_strncasecmp(s, p, strlen(p)) == 0);
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2700 }
ddad7176a0ec Smiley manager: drag and drop
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35706
diff changeset
2701
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2702 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2703 purple_str_add_cr(const char *text)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2704 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2705 char *ret = NULL;
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
2706 int count = 0, j;
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
2707 guint i;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2708
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2709 g_return_val_if_fail(text != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2710
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2711 if (text[0] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2712 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2713 for (i = 1; i < strlen(text); i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2714 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2715 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2716
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2717 if (count == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2718 return g_strdup(text);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2719
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2720 ret = g_malloc0(strlen(text) + count + 1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2721
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2722 i = 0; j = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2723 if (text[i] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2724 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2725 ret[j++] = text[i++];
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2726 for (; i < strlen(text); i++) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2727 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2728 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2729 ret[j++] = text[i];
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2730 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2731
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2732 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2733 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2734
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2735 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2736 purple_str_strip_char(char *text, char thechar)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2737 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2738 int i, j;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2739
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2740 g_return_if_fail(text != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2741
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2742 for (i = 0, j = 0; text[i]; i++)
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2743 if (text[i] != thechar)
11142
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
2744 text[j++] = text[i];
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
2745
30702
8a1938367841 These are dead increments.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30515
diff changeset
2746 text[j] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2747 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2748
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2749 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2750 purple_util_chrreplace(char *string, char delimiter,
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2751 char replacement)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2752 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2753 int i = 0;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2754
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2755 g_return_if_fail(string != NULL);
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2756
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2757 while (string[i] != '\0')
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2758 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2759 if (string[i] == delimiter)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2760 string[i] = replacement;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2761 i++;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2762 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2763 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
2764
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2765 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2766 purple_strreplace(const char *string, const char *delimiter,
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2767 const char *replacement)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2768 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2769 gchar **split;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2770 gchar *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2771
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2772 g_return_val_if_fail(string != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2773 g_return_val_if_fail(delimiter != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2774 g_return_val_if_fail(replacement != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2775
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2776 split = g_strsplit(string, delimiter, 0);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2777 ret = g_strjoinv(replacement, split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2778 g_strfreev(split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2779
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2780 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2781 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2782
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2783 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2784 purple_strcasereplace(const char *string, const char *delimiter,
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2785 const char *replacement)
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2786 {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2787 gchar *ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2788 int length_del, length_rep, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2789
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2790 g_return_val_if_fail(string != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2791 g_return_val_if_fail(delimiter != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2792 g_return_val_if_fail(replacement != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2793
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2794 length_del = strlen(delimiter);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2795 length_rep = strlen(replacement);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2796
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2797 /* Count how many times the delimiter appears */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2798 i = 0; /* position in the source string */
8735
01248ea222d3 [gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents: 8700
diff changeset
2799 j = 0; /* number of occurrences of "delimiter" */
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2800 while (string[i] != '\0') {
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2801 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2802 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2803 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2804 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2805 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2806 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2807 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2808 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2809
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2810 ret = g_malloc(j+1);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2811
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2812 i = 0; /* position in the source string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2813 j = 0; /* position in the destination string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2814 while (string[i] != '\0') {
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2815 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2816 strncpy(&ret[j], replacement, length_rep);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2817 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2818 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2819 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2820 ret[j] = string[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2821 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2822 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2823 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2824 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2825
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2826 ret[j] = '\0';
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2827
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2828 return ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2829 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
2830
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2831 /** TODO: Expose this when we can add API */
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2832 static const char *
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2833 purple_strcasestr_len(const char *haystack, gssize hlen, const char *needle, gssize nlen)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2834 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2835 const char *tmp, *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2836
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2837 g_return_val_if_fail(haystack != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2838 g_return_val_if_fail(needle != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2839
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2840 if (hlen == -1)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2841 hlen = strlen(haystack);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2842 if (nlen == -1)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2843 nlen = strlen(needle);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2844 tmp = haystack,
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2845 ret = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2846
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2847 g_return_val_if_fail(hlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2848 g_return_val_if_fail(nlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2849
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2850 while (*tmp && !ret && (hlen - (tmp - haystack)) >= nlen) {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2851 if (!g_ascii_strncasecmp(needle, tmp, nlen))
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2852 ret = tmp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2853 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2854 tmp++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2855 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2856
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2857 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2858 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2859
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2860 const char *
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2861 purple_strcasestr(const char *haystack, const char *needle)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2862 {
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2863 return purple_strcasestr_len(haystack, -1, needle, -1);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2864 }
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
2865
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2866 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2867 purple_str_seconds_to_string(guint secs)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2868 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2869 char *ret = NULL;
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2870 guint days, hrs, mins;
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2871
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
2872 if (secs < 60)
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
2873 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2874 return g_strdup_printf(dngettext(PACKAGE, "%d second", "%d seconds", secs), secs);
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
2875 }
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
2876
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2877 days = secs / (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2878 secs = secs % (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2879 hrs = secs / (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2880 secs = secs % (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2881 mins = secs / 60;
35382
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
2882 /* secs = secs % 60; */
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2883
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2884 if (days > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2885 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2886 ret = g_strdup_printf(dngettext(PACKAGE, "%d day", "%d days", days), days);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2887 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2888
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2889 if (hrs > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2890 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2891 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2892 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2893 char *tmp = g_strdup_printf(
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2894 dngettext(PACKAGE, "%s, %d hour", "%s, %d hours", hrs),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2895 ret, hrs);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2896 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2897 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2898 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2899 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2900 ret = g_strdup_printf(dngettext(PACKAGE, "%d hour", "%d hours", hrs), hrs);
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2901 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2902
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2903 if (mins > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2904 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2905 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2906 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2907 char *tmp = g_strdup_printf(
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2908 dngettext(PACKAGE, "%s, %d minute", "%s, %d minutes", mins),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2909 ret, mins);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2910 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2911 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2912 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2913 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
2914 ret = g_strdup_printf(dngettext(PACKAGE, "%d minute", "%d minutes", mins), mins);
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2915 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
2916
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
2917 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2918 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2919
9277
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
2920
34171
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2921 size_t
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2922 purple_utf16_size(const gunichar2 *str)
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2923 {
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2924 /* UTF16 cannot contain two consequent NUL bytes starting at even
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2925 * position - see Unicode standards Chapter 3.9 D91 or RFC2781
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2926 * Chapter 2.
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2927 */
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2928
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2929 size_t i = 0;
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2930
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2931 g_return_val_if_fail(str != NULL, 0);
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2932
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2933 while (str[i++]);
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2934
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2935 return i * sizeof(gunichar2);
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2936 }
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2937
34145
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2938 void
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2939 purple_str_wipe(gchar *str)
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2940 {
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2941 if (str == NULL)
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2942 return;
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2943 memset(str, 0, strlen(str));
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2944 g_free(str);
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2945 }
fa72f1e5cd77 Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 33824
diff changeset
2946
34171
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2947 void
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2948 purple_utf16_wipe(gunichar2 *str)
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2949 {
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2950 if (str == NULL)
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2951 return;
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2952 memset(str, 0, purple_utf16_size(str));
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2953 g_free(str);
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2954 }
a23f3228c465 New keyring: store passwords using Windows credentials
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34148
diff changeset
2955
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2956 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2957 * URI/URL Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2958 **************************************************************************/
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2959
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2960 void purple_got_protocol_handler_uri(const char *uri)
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2961 {
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2962 char proto[11];
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2963 char delimiter;
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2964 const char *tmp, *param_string;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2965 char *cmd;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2966 GHashTable *params = NULL;
34304
faf0414a8b51 Fix most of libpurple warnings about -Wsign-compare
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 34297
diff changeset
2967 gsize len;
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2968 if (!(tmp = strchr(uri, ':')) || tmp == uri) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2969 purple_debug_error("util", "Malformed protocol handler message - missing protocol.\n");
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2970 return;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2971 }
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2972
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
2973 len = MIN(sizeof(proto) - 1, (gsize)(tmp - uri));
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2974
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2975 strncpy(proto, uri, len);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2976 proto[len] = '\0';
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2977
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2978 tmp++;
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2979
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38229
diff changeset
2980 if (purple_strequal(proto, "xmpp"))
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2981 delimiter = ';';
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2982 else
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2983 delimiter = '&';
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2984
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2985 purple_debug_info("util", "Processing message '%s' for protocol '%s' using delimiter '%c'.\n", tmp, proto, delimiter);
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2986
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2987 if ((param_string = strchr(tmp, '?'))) {
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2988 const char *keyend = NULL, *pairstart;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2989 char *key, *value = NULL;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2990
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2991 cmd = g_strndup(tmp, (param_string - tmp));
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2992 param_string++;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2993
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2994 params = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2995 pairstart = tmp = param_string;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2996
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2997 while (*tmp || *pairstart) {
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
2998 if (*tmp == delimiter || !(*tmp)) {
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
2999 /* If there is no explicit value */
35382
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
3000 if (keyend == NULL) {
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3001 keyend = tmp;
35382
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
3002 }
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
3003 /* without these brackets, clang won't
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
3004 * recognize tmp as a non-NULL
1b75f8a4129c Fix some clang static analysis warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35298
diff changeset
3005 */
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3006
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3007 if (keyend && keyend != pairstart) {
17145
463085404f54 Patch #756 from EvilSporkMan. Use Datallah's url handling for Dbus
Sean Egan <seanegan@pidgin.im>
parents: 17143
diff changeset
3008 char *p;
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3009 key = g_strndup(pairstart, (keyend - pairstart));
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3010 /* If there is an explicit value */
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3011 if (keyend != tmp && keyend != (tmp - 1))
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3012 value = g_strndup(keyend + 1, (tmp - keyend - 1));
17145
463085404f54 Patch #756 from EvilSporkMan. Use Datallah's url handling for Dbus
Sean Egan <seanegan@pidgin.im>
parents: 17143
diff changeset
3013 for (p = key; *p; ++p)
463085404f54 Patch #756 from EvilSporkMan. Use Datallah's url handling for Dbus
Sean Egan <seanegan@pidgin.im>
parents: 17143
diff changeset
3014 *p = g_ascii_tolower(*p);
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3015 g_hash_table_insert(params, key, value);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3016 }
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3017 keyend = value = NULL;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3018 pairstart = (*tmp) ? tmp + 1 : tmp;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3019 } else if (*tmp == '=')
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3020 keyend = tmp;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3021
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3022 if (*tmp)
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3023 tmp++;
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3024 }
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3025 } else
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3026 cmd = g_strdup(tmp);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3027
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3028 purple_signal_emit_return_1(purple_get_core(), "uri-handler", proto, cmd, params);
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3029
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3030 g_free(cmd);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3031 if (params)
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3032 g_hash_table_destroy(params);
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3033 }
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3034
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
3035 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3036 purple_url_decode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3037 {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3038 static char buf[BUF_LEN];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3039 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3040 char *bum;
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3041 char hex[3];
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3042
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3043 g_return_val_if_fail(str != NULL, NULL);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3044
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3045 /*
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3046 * XXX - This check could be removed and buf could be made
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3047 * dynamically allocated, but this is easier.
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3048 */
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3049 if (strlen(str) >= BUF_LEN)
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3050 return NULL;
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
3051
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3052 for (i = 0; i < strlen(str); i++) {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3053
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3054 if (str[i] != '%')
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3055 buf[j++] = str[i];
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3056 else {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3057 strncpy(hex, str + ++i, 2);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3058 hex[2] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3059
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3060 /* i is pointing to the start of the number */
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3061 i++;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3062
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3063 /*
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3064 * Now it's at the end and at the start of the for loop
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3065 * will be at the next character.
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3066 */
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3067 buf[j++] = strtol(hex, NULL, 16);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3068 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3069 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3070
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3071 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3072
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3073 if (!g_utf8_validate(buf, -1, (const char **)&bum))
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3074 *bum = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3075
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3076 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3077 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3078
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
3079 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3080 purple_url_encode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3081 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3082 const char *iter;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3083 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3084 char utf_char[6];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3085 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3086
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3087 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3088 g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3089
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3090 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3091 for (; *iter && j < (BUF_LEN - 1) ; iter = g_utf8_next_char(iter)) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3092 gunichar c = g_utf8_get_char(iter);
10800
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
3093 /* If the character is an ASCII character and is alphanumeric
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
3094 * no need to escape */
28538
fb879aa298ee Change purple_url_encode() to not encode . _ - ~ because it's not
Mark Doliner <markdoliner@pidgin.im>
parents: 28438
diff changeset
3095 if (c < 128 && (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~')) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3096 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3097 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3098 int bytes = g_unichar_to_utf8(c, utf_char);
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3099 for (i = 0; (int)i < bytes; i++) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3100 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3101 break;
36037
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3102 if (i >= sizeof(utf_char)) {
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3103 g_warn_if_reached();
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3104 break;
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3105 }
28538
fb879aa298ee Change purple_url_encode() to not encode . _ - ~ because it's not
Mark Doliner <markdoliner@pidgin.im>
parents: 28438
diff changeset
3106 sprintf(buf + j, "%%%02X", utf_char[i] & 0xff);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3107 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3108 }
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3109 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3110 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3111
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3112 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3113
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3114 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
3115 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3116
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3117 /* Originally lifted from
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3118 * http://www.oreillynet.com/pub/a/network/excerpt/spcookbook_chap03/index3.html
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3119 * ... and slightly modified to be a bit more rfc822 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3120 * ... and modified a bit more to make domain checking rfc1035 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3121 * with the exception permitted in rfc1101 for domains to start with digit
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3122 * but not completely checking to avoid conflicts with IP addresses
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3123 */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3124 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3125 purple_email_is_valid(const char *address)
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3126 {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3127 const char *c, *domain;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3128 static char *rfc822_specials = "()<>@,;:\\\"[]";
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3129
24645
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
3130 g_return_val_if_fail(address != NULL, FALSE);
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
3131
30444
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
3132 if (*address == '.') return FALSE;
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
3133
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3134 /* first we validate the name portion (name@domain) (rfc822)*/
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3135 for (c = address; *c; c++) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3136 if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3137 while (*++c) {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3138 if (*c == '\\') {
38922
9f05d7f41a53 purple_email_is_valid: fix out of bounds read
dx <dx@dxzone.com.ar>
parents: 38737
diff changeset
3139 if (*c++ && *c < 127 && *c > 0 && *c != '\n' && *c != '\r') continue;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3140 else return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3141 }
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3142 if (*c == '\"') break;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3143 if (*c < ' ' || *c >= 127) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3144 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3145 if (!*c++) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3146 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3147 if (*c != '.') return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3148 continue;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3149 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3150 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3151 if (*c <= ' ' || *c >= 127) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3152 if (strchr(rfc822_specials, *c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3153 }
18871
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
3154
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
3155 /* It's obviously not an email address if we didn't find an '@' above */
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
3156 if (*c == '\0') return FALSE;
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
3157
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3158 /* strictly we should return false if (*(c - 1) == '.') too, but I think
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3159 * we should permit user.@domain type addresses - they do work :) */
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3160 if (c == address) return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3161
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3162 /* next we validate the domain portion (name@domain) (rfc1035 & rfc1011) */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3163 if (!*(domain = ++c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3164 do {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3165 if (*c == '.' && (c == domain || *(c - 1) == '.' || *(c - 1) == '-'))
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3166 return FALSE;
30444
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
3167 if (*c == '-' && (*(c - 1) == '.' || *(c - 1) == '@')) return FALSE;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3168 if ((*c < '0' && *c != '-' && *c != '.') || (*c > '9' && *c < 'A') ||
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3169 (*c > 'Z' && *c < 'a') || (*c > 'z')) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3170 } while (*++c);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3171
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3172 if (*(c - 1) == '-') return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3173
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3174 return ((c - domain) > 3 ? TRUE : FALSE);
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3175 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
3176
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3177 /* Stolen from gnome_uri_list_extract_uris */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3178 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3179 purple_uri_list_extract_uris(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3180 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3181 const gchar *p, *q;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3182 gchar *retval;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3183 GList *result = NULL;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3184
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3185 g_return_val_if_fail (uri_list != NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3186
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3187 p = uri_list;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3188
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3189 /* We don't actually try to validate the URI according to RFC
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3190 * 2396, or even check for allowed characters - we just ignore
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3191 * comments and trim whitespace off the ends. We also
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3192 * allow LF delimination as well as the specified CRLF.
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3193 */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3194 while (p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3195 if (*p != '#') {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3196 while (isspace(*p))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3197 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3198
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3199 q = p;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3200 while (*q && (*q != '\n') && (*q != '\r'))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3201 q++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3202
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3203 if (q > p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3204 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3205 while (q > p && isspace(*q))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3206 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3207
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3208 retval = (gchar*)g_malloc (q - p + 2);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3209 strncpy (retval, p, q - p + 1);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3210 retval[q - p + 1] = '\0';
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3211
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3212 result = g_list_prepend (result, retval);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3213 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3214 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3215 p = strchr (p, '\n');
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3216 if (p)
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3217 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3218 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3219
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3220 return g_list_reverse (result);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3221 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3222
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3223
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3224 /* Stolen from gnome_uri_list_extract_filenames */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3225 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3226 purple_uri_list_extract_filenames(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
3227 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3228 GList *tmp_list, *node, *result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3229
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3230 g_return_val_if_fail (uri_list != NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3231
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3232 result = purple_uri_list_extract_uris(uri_list);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3233
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3234 tmp_list = result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3235 while (tmp_list) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3236 gchar *s = (gchar*)tmp_list->data;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3237
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3238 node = tmp_list;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3239 tmp_list = tmp_list->next;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3240
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3241 if (!strncmp (s, "file:", 5)) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3242 node->data = g_filename_from_uri (s, NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3243 /* not sure if this fallback is useful at all */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3244 if (!node->data) node->data = g_strdup (s+5);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3245 } else {
23028
b17c77748d6d Fix some potential leakage in the craziness called purple_markup_html_to_xhtml().
Daniel Atallah <datallah@pidgin.im>
parents: 22622
diff changeset
3246 result = g_list_delete_link(result, node);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3247 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3248 g_free (s);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3249 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3250 return result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
3251 }
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
3252
38737
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3253 char *
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3254 purple_uri_escape_for_open(const char *unescaped)
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3255 {
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3256 /* Replace some special characters like $ with their percent-encoded value.
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3257 * This shouldn't be necessary because we shell-escape the entire arg before
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3258 * exec'ing the browser, however, we had a report that a URL containing
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3259 * $(xterm) was causing xterm to start on his system. This is obviously a
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3260 * bug on his system, but it's pretty easy for us to protect against it. */
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3261 return g_uri_escape_string(unescaped, "[]:;/%#,+?=&@", FALSE);
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3262 }
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
3263
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3264 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3265 * UTF8 String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3266 **************************************************************************/
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3267 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3268 purple_utf8_try_convert(const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3269 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3270 gsize converted;
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3271 gchar *utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3272
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3273 g_return_val_if_fail(str != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3274
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3275 if (g_utf8_validate(str, -1, NULL)) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3276 return g_strdup(str);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3277 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3278
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3279 utf8 = g_locale_to_utf8(str, -1, &converted, NULL, NULL);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3280 if (utf8 != NULL)
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3281 return utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3282
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3283 utf8 = g_convert(str, -1, "UTF-8", "ISO-8859-15", &converted, NULL, NULL);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3284 if ((utf8 != NULL) && (converted == strlen(str)))
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3285 return utf8;
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3286
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
3287 g_free(utf8);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3288
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
3289 return NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3290 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3291
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3292 #define utf8_first(x) ((x & 0x80) == 0 || (x & 0xe0) == 0xc0 \
33802
448dd56e312d Fix purple_utf8_salvage() to correctly identify the 4-byte start byte
Daniel Atallah <datallah@pidgin.im>
parents: 31731
diff changeset
3293 || (x & 0xf0) == 0xe0 || (x & 0xf8) == 0xf0)
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3294 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3295 purple_utf8_salvage(const char *str)
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3296 {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3297 GString *workstr;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3298 const char *end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3299
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3300 g_return_val_if_fail(str != NULL, NULL);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3301
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3302 workstr = g_string_sized_new(strlen(str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3303
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3304 do {
35991
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
3305 (void)g_utf8_validate(str, -1, &end);
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3306 workstr = g_string_append_len(workstr, str, end - str);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3307 str = end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3308 if (*str == '\0')
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3309 break;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3310 do {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3311 workstr = g_string_append_c(workstr, '?');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3312 str++;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3313 } while (!utf8_first(*str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3314 } while (*str != '\0');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3315
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3316 return g_string_free(workstr, FALSE);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3317 }
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
3318
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3319 gchar *
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3320 purple_utf8_strip_unprintables(const gchar *str)
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3321 {
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3322 gchar *workstr, *iter;
28389
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3323 const gchar *bad;
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3324
27243
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
3325 if (str == NULL)
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
3326 /* Act like g_strdup */
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
3327 return NULL;
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
3328
28390
5c701ddc9c81 Oops, I think it's either sleep or coffee time.
Paul Aurich <darkrain42@pidgin.im>
parents: 28389
diff changeset
3329 if (!g_utf8_validate(str, -1, &bad)) {
28389
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3330 purple_debug_error("util", "purple_utf8_strip_unprintables(%s) failed; "
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3331 "first bad character was %02x (%c)\n",
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3332 str, *bad, *bad);
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3333 g_return_val_if_reached(NULL);
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
3334 }
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3335
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3336 workstr = iter = g_new(gchar, strlen(str) + 1);
30143
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3337 while (*str) {
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3338 gunichar ch = g_utf8_get_char(str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3339 gchar *next = g_utf8_next_char(str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3340 /*
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3341 * Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3342 * [#x10000-#x10FFFF]
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3343 */
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3344 if ((ch == '\t' || ch == '\n' || ch == '\r') ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3345 (ch >= 0x20 && ch <= 0xD7FF) ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3346 (ch >= 0xE000 && ch <= 0xFFFD) ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3347 (ch >= 0x10000 && ch <= 0x10FFFF)) {
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3348 memcpy(iter, str, next - str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3349 iter += (next - str);
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3350 }
30143
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3351
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
3352 str = next;
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3353 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3354
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3355 /* nul-terminate the new string */
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3356 *iter = '\0';
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3357
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3358 return workstr;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3359 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
3360
21978
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
3361 /*
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
3362 * This function is copied from g_strerror() but changed to use
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
3363 * gai_strerror().
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
3364 */
32737
44c6902e2348 G_CONST_RETURN has been deprecated, use const instead
Gary Kramlich <grim@reaperworld.com>
parents: 32663
diff changeset
3365 const gchar *
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3366 purple_gai_strerror(gint errnum)
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3367 {
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
3368 static GPrivate msg_private = G_PRIVATE_INIT(g_free);
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3369 char *msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3370 int saved_errno = errno;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3371
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3372 const char *msg_locale;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3373
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3374 msg_locale = gai_strerror(errnum);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3375 if (g_get_charset(NULL))
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3376 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3377 /* This string is already UTF-8--great! */
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3378 errno = saved_errno;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3379 return msg_locale;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3380 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3381 else
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3382 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3383 gchar *msg_utf8 = g_locale_to_utf8(msg_locale, -1, NULL, NULL, NULL);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3384 if (msg_utf8)
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3385 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3386 /* Stick in the quark table so that we can return a static result */
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3387 GQuark msg_quark = g_quark_from_string(msg_utf8);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3388 g_free(msg_utf8);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3389
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3390 msg_utf8 = (gchar *)g_quark_to_string(msg_quark);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3391 errno = saved_errno;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3392 return msg_utf8;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3393 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3394 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3395
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
3396 msg = g_private_get(&msg_private);
38045
6e8b223df524 Remove GLIB_CHECK_VERSION <= 2.36 calls
Mike Ruprecht <cmaiku@gmail.com>
parents: 37160
diff changeset
3397
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3398 if (!msg)
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3399 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3400 msg = g_new(gchar, 64);
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
3401 g_private_set(&msg_private, msg);
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3402 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3403
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3404 sprintf(msg, "unknown error (%d)", errnum);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3405
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3406 errno = saved_errno;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3407 return msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
3408 }
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3409
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3410 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3411 purple_utf8_ncr_encode(const char *str)
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3412 {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3413 GString *out;
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3414
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3415 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3416 g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3417
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3418 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3419
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3420 for(; *str; str = g_utf8_next_char(str)) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3421 gunichar wc = g_utf8_get_char(str);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3422
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3423 /* super simple check. hopefully not too wrong. */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3424 if(wc >= 0x80) {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3425 g_string_append_printf(out, "&#%u;", (guint32) wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3426 } else {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3427 g_string_append_unichar(out, wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3428 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3429 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3430
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3431 return g_string_free(out, FALSE);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3432 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3433
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3434
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3435 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3436 purple_utf8_ncr_decode(const char *str)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3437 {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3438 GString *out;
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3439 char *buf, *b;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3440
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3441 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3442 g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3443
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3444 buf = (char *) str;
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3445 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
3446
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3447 while( (b = strstr(buf, "&#")) ) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3448 gunichar wc;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3449 int base = 0;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3450
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3451 /* append everything leading up to the &# */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3452 g_string_append_len(out, buf, b-buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3453
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3454 b += 2; /* skip past the &# */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3455
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
3456 /* strtoul will treat 0x prefix as hex, but not just x */
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
3457 if(*b == 'x' || *b == 'X') {
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3458 base = 16;
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
3459 b++;
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
3460 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3461
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3462 /* advances buf to the end of the ncr segment */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3463 wc = (gunichar) strtoul(b, &buf, base);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3464
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3465 /* this mimics the previous impl of ncr_decode */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3466 if(*buf == ';') {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3467 g_string_append_unichar(out, wc);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3468 buf++;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3469 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3470 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3471
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3472 /* append whatever's left */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3473 g_string_append(out, buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3474
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3475 return g_string_free(out, FALSE);
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3476 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
3477
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
3478
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3479 int
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3480 purple_utf8_strcasecmp(const char *a, const char *b)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3481 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3482 char *a_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3483 char *b_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3484 int ret = -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3485
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3486 if(!a && b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3487 return -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3488 else if(!b && a)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3489 return 1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3490 else if(!a && !b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3491 return 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3492
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3493 if(!g_utf8_validate(a, -1, NULL) || !g_utf8_validate(b, -1, NULL))
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3494 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3495 purple_debug_error("purple_utf8_strcasecmp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3496 "One or both parameters are invalid UTF8\n");
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3497 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3498 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3499
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3500 a_norm = g_utf8_casefold(a, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3501 b_norm = g_utf8_casefold(b, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3502 ret = g_utf8_collate(a_norm, b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3503 g_free(a_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3504 g_free(b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3505
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3506 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3507 }
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
3508
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3509 /* previously conversation::find_nick() */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3510 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3511 purple_utf8_has_word(const char *haystack, const char *needle)
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3512 {
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3513 char *hay, *pin, *p;
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3514 const char *start, *prev_char;
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3515 gunichar before, after;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3516 int n;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3517 gboolean ret = FALSE;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3518
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3519 start = hay = g_utf8_strdown(haystack, -1);
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3520
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3521 pin = g_utf8_strdown(needle, -1);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3522 n = strlen(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3523
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3524 while ((p = strstr(start, pin)) != NULL) {
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3525 prev_char = g_utf8_find_prev_char(hay, p);
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3526 before = -2;
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3527 if (prev_char) {
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3528 before = g_utf8_get_char(prev_char);
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3529 }
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3530 after = g_utf8_get_char_validated(p + n, - 1);
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3531
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3532 if ((p == hay ||
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3533 /* The character before is a reasonable guess for a word boundary
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3534 ("!g_unichar_isalnum()" is not a valid way to determine word
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3535 boundaries, but it is the only reasonable thing to do here),
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3536 and isn't the '&' from a "&amp;" or some such entity*/
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3537 (before != (gunichar)-2 && !g_unichar_isalnum(before) && *(p - 1) != '&'))
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3538 && after != (gunichar)-2 && !g_unichar_isalnum(after)) {
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3539 ret = TRUE;
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3540 break;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3541 }
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
3542 start = p + 1;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3543 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3544
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3545 g_free(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3546 g_free(hay);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3547
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3548 return ret;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3549 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
3550
19585
14b519abcc26 Fix some conversion warnings about using negative values with unsigned types. There are more, but these were easy fixes. You may think that I'm changing the API, but I'm really not - it was just wrong.
Daniel Atallah <datallah@pidgin.im>
parents: 19327
diff changeset
3551 gboolean purple_message_meify(char *message, gssize len)
7564
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3552 {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3553 char *c;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3554 gboolean inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3555
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3556 g_return_val_if_fail(message != NULL, FALSE);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3557
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3558 if(len == -1)
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3559 len = strlen(message);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3560
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3561 for (c = message; *c; c++, len--) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3562 if(inside_html) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3563 if(*c == '>')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3564 inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3565 } else {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3566 if(*c == '<')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3567 inside_html = TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3568 else
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3569 break;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3570 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3571 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3572
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3573 if(*c && !g_ascii_strncasecmp(c, "/me ", 4)) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3574 memmove(c, c+4, len-3);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3575 return TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3576 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3577
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3578 return FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3579 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
3580
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3581 char *purple_text_strip_mnemonic(const char *in)
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3582 {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3583 char *out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3584 char *a;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3585 char *a0;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3586 const char *b;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3587
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3588 g_return_val_if_fail(in != NULL, NULL);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3589
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3590 out = g_malloc(strlen(in)+1);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3591 a = out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3592 b = in;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3593
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3594 a0 = a; /* The last non-space char seen so far, or the first char */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3595
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3596 while(*b) {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3597 if(*b == '_') {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3598 if(a > out && b > in && *(b-1) == '(' && *(b+1) && !(*(b+1) & 0x80) && *(b+2) == ')') {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3599 /* Detected CJK style shortcut (Bug 875311) */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3600 a = a0; /* undo the left parenthesis */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3601 b += 3; /* and skip the whole mess */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3602 } else if(*(b+1) == '_') {
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3603 *(a++) = '_';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3604 b += 2;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3605 a0 = a;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3606 } else {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3607 b++;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3608 }
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3609 /* We don't want to corrupt the middle of UTF-8 characters */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3610 } else if (!(*b & 0x80)) { /* other 1-byte char */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3611 if (*b != ' ')
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3612 a0 = a;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3613 *(a++) = *(b++);
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3614 } else {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3615 /* Multibyte utf8 char, don't look for _ inside these */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3616 int n = 0;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3617 int i;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3618 if ((*b & 0xe0) == 0xc0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3619 n = 2;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3620 } else if ((*b & 0xf0) == 0xe0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3621 n = 3;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3622 } else if ((*b & 0xf8) == 0xf0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3623 n = 4;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3624 } else if ((*b & 0xfc) == 0xf8) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3625 n = 5;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3626 } else if ((*b & 0xfe) == 0xfc) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3627 n = 6;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3628 } else { /* Illegal utf8 */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3629 n = 1;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3630 }
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3631 a0 = a; /* unless we want to delete CJK spaces too */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3632 for (i = 0; i < n && *b; i += 1) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3633 *(a++) = *(b++);
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
3634 }
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3635 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3636 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3637 *a = '\0';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3638
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3639 return out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3640 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
3641
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3642 const char* purple_unescape_filename(const char *escaped) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3643 return purple_url_decode(escaped);
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3644 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3645
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3646
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3647 /* this is almost identical to purple_url_encode (hence purple_url_decode
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3648 * being used above), but we want to keep certain characters unescaped
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3649 * for compat reasons */
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3650 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3651 purple_escape_filename(const char *str)
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3652 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3653 const char *iter;
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3654 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3655 char utf_char[6];
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3656 guint i, j = 0;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3657
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3658 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3659 g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3660
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3661 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3662 for (; *iter && j < (BUF_LEN - 1) ; iter = g_utf8_next_char(iter)) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3663 gunichar c = g_utf8_get_char(iter);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3664 /* If the character is an ASCII character and is alphanumeric,
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3665 * or one of the specified values, no need to escape */
17261
65aa3164dcce If we're operating on ASCII characters only, we should use g_ascii_isalnum.
Richard Laager <rlaager@pidgin.im>
parents: 17254
diff changeset
3666 if (c < 128 && (g_ascii_isalnum(c) || c == '@' || c == '-' ||
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3667 c == '_' || c == '.' || c == '#')) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3668 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3669 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3670 int bytes = g_unichar_to_utf8(c, utf_char);
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3671 for (i = 0; (int)i < bytes; i++) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3672 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3673 break;
36037
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3674 if (i >= sizeof(utf_char)) {
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3675 g_warn_if_reached();
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3676 break;
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
3677 }
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3678 sprintf(buf + j, "%%%02x", utf_char[i] & 0xff);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3679 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
3680 }
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3681 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3682 }
30414
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3683 #ifdef _WIN32
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3684 /* File/Directory names in windows cannot end in periods/spaces.
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3685 * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3686 */
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3687 while (j > 0 && (buf[j - 1] == '.' || buf[j - 1] == ' '))
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3688 j--;
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
3689 #endif
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3690 buf[j] = '\0';
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3691
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3692 return buf;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3693 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
3694
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3695 void purple_restore_default_signal_handlers(void)
15707
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3696 {
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
3697 #ifndef _WIN32
15707
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3698 signal(SIGHUP, SIG_DFL); /* 1: terminal line hangup */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3699 signal(SIGINT, SIG_DFL); /* 2: interrupt program */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3700 signal(SIGQUIT, SIG_DFL); /* 3: quit program */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3701 signal(SIGILL, SIG_DFL); /* 4: illegal instruction (not reset when caught) */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3702 signal(SIGTRAP, SIG_DFL); /* 5: trace trap (not reset when caught) */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3703 signal(SIGABRT, SIG_DFL); /* 6: abort program */
15723
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3704
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3705 #ifdef SIGPOLL
16557
b0e9ddccdbb9 Fix purple_util_get_image_extension()'s data param. to be correctly marked as constant.
Daniel Atallah <datallah@pidgin.im>
parents: 16545
diff changeset
3706 signal(SIGPOLL, SIG_DFL); /* 7: pollable event (POSIX) */
15723
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3707 #endif /* SIGPOLL */
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3708
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3709 #ifdef SIGEMT
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3710 signal(SIGEMT, SIG_DFL); /* 7: EMT instruction (Non-POSIX) */
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3711 #endif /* SIGEMT */
feaa3efdab08 SIGEMT is not available on non-POSIX systems; SIGPOLL is present, instead. Thanks to Richard for catching this.
Evan Schoenberg <evands@pidgin.im>
parents: 15707
diff changeset
3712
15707
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3713 signal(SIGFPE, SIG_DFL); /* 8: floating point exception */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3714 signal(SIGBUS, SIG_DFL); /* 10: bus error */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3715 signal(SIGSEGV, SIG_DFL); /* 11: segmentation violation */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3716 signal(SIGSYS, SIG_DFL); /* 12: bad argument to system call */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3717 signal(SIGPIPE, SIG_DFL); /* 13: write on a pipe with no reader */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3718 signal(SIGALRM, SIG_DFL); /* 14: real-time timer expired */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3719 signal(SIGTERM, SIG_DFL); /* 15: software termination signal */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3720 signal(SIGCHLD, SIG_DFL); /* 20: child status has changed */
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3721 signal(SIGXCPU, SIG_DFL); /* 24: exceeded CPU time limit */
16557
b0e9ddccdbb9 Fix purple_util_get_image_extension()'s data param. to be correctly marked as constant.
Daniel Atallah <datallah@pidgin.im>
parents: 16545
diff changeset
3722 signal(SIGXFSZ, SIG_DFL); /* 25: exceeded file size limit */
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
3723 #endif /* !_WIN32 */
15707
e9d3280caf69 Restore default signal handlers in fork()'d children. This adds a gaim_restore_default_signal_handlers() utility function since children are made in multiple places.
Evan Schoenberg <evands@pidgin.im>
parents: 15678
diff changeset
3724 }
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3725
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3726 static void
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3727 set_status_with_attrs(PurpleStatus *status, ...)
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3728 {
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3729 va_list args;
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3730 va_start(args, status);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3731 purple_status_set_active_with_attrs(status, TRUE, args);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3732 va_end(args);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3733 }
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3734
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3735 void purple_util_set_current_song(const char *title, const char *artist, const char *album)
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3736 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3737 GList *list = purple_accounts_get_all();
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3738 for (; list; list = list->next) {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3739 PurplePresence *presence;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3740 PurpleStatus *tune;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3741 PurpleAccount *account = list->data;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3742 if (!purple_account_get_enabled(account, purple_core_get_ui()))
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3743 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3744
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3745 presence = purple_account_get_presence(account);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3746 tune = purple_presence_get_status(presence, "tune");
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3747 if (!tune)
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3748 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3749 if (title) {
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3750 set_status_with_attrs(tune,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3751 PURPLE_TUNE_TITLE, title,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3752 PURPLE_TUNE_ARTIST, artist,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3753 PURPLE_TUNE_ALBUM, album,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
3754 NULL);
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3755 } else {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3756 purple_status_set_active(tune, FALSE);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3757 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3758 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3759 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3760
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3761 char * purple_util_format_song_info(const char *title, const char *artist, const char *album, gpointer unused)
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3762 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3763 GString *string;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3764 char *esc;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3765
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
3766 if (!title || !*title)
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3767 return NULL;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3768
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3769 esc = g_markup_escape_text(title, -1);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3770 string = g_string_new("");
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3771 g_string_append_printf(string, "%s", esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3772 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3773
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
3774 if (artist && *artist) {
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3775 esc = g_markup_escape_text(artist, -1);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3776 g_string_append_printf(string, _(" - %s"), esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3777 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3778 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3779
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
3780 if (album && *album) {
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3781 esc = g_markup_escape_text(album, -1);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3782 g_string_append_printf(string, _(" (%s)"), esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3783 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3784 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3785
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3786 return g_string_free(string, FALSE);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3787 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
3788
29538
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3789 gchar *
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3790 purple_uuid_random(void)
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3791 {
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3792 guint32 tmp, a, b;
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3793
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3794 tmp = g_random_int();
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3795 a = 0x4000 | (tmp & 0xFFF); /* 0x4000 to 0x4FFF */
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3796 tmp >>= 12;
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3797 b = ((1 << 3) << 12) | (tmp & 0x3FFF); /* 0x8000 to 0xBFFF */
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3798
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3799 tmp = g_random_int();
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3800
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3801 return g_strdup_printf("%08x-%04x-%04x-%04x-%04x%08x",
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3802 g_random_int(),
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3803 tmp & 0xFFFF,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3804 a,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3805 b,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3806 (tmp >> 16) & 0xFFFF, g_random_int());
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
3807 }
34479
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3808
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3809 void purple_callback_set_zero(gpointer data)
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3810 {
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3811 gpointer *ptr = data;
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3812
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3813 g_return_if_fail(ptr != NULL);
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3814
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3815 *ptr = NULL;
7d4651f1035e Plugins API: add an option to provide plugin configuration using Request API
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 34457
diff changeset
3816 }
35045
bb1643dab0c5 Merged default branch
Ankit Vani <a@nevitus.org>
parents: 35029 34479
diff changeset
3817
34808
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3818 GValue *
35005
bff56dfca65d Renamed purple_g_value_* to purple_value_*
Ankit Vani <a@nevitus.org>
parents: 35001
diff changeset
3819 purple_value_new(GType type)
34808
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3820 {
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3821 GValue *ret;
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3822
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3823 g_return_val_if_fail(type != G_TYPE_NONE, NULL);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3824
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3825 ret = g_new0(GValue, 1);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3826 g_value_init(ret, type);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3827
34822
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3828 return ret;
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3829 }
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3830
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3831 GValue *
35005
bff56dfca65d Renamed purple_g_value_* to purple_value_*
Ankit Vani <a@nevitus.org>
parents: 35001
diff changeset
3832 purple_value_dup(GValue *value)
34822
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3833 {
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3834 GValue *ret;
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3835
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3836 g_return_val_if_fail(value != NULL, NULL);
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3837
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3838 ret = g_new0(GValue, 1);
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3839 g_value_init(ret, G_VALUE_TYPE(value));
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3840 g_value_copy(value, ret);
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3841
5c3970547cda Added purple_g_value_dup() to util
Ankit Vani <a@nevitus.org>
parents: 34808
diff changeset
3842 return ret;
34808
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3843 }
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3844
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3845 void
35005
bff56dfca65d Renamed purple_g_value_* to purple_value_*
Ankit Vani <a@nevitus.org>
parents: 35001
diff changeset
3846 purple_value_free(GValue *value)
34808
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3847 {
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3848 g_return_if_fail(value != NULL);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3849
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3850 g_value_unset(value);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3851 g_free(value);
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3852 }
442af3e72671 Added purple_g_value_new() and purple_g_value_free() to util
Ankit Vani <a@nevitus.org>
parents: 34754
diff changeset
3853
36034
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3854 int
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3855 _purple_fstat(int fd, GStatBuf *st)
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3856 {
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3857 int ret;
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3858
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3859 g_return_val_if_fail(st != NULL, -1);
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3860
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3861 #ifdef _WIN32
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3862 ret = _fstat(fd, st);
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3863 #else
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3864 ret = fstat(fd, st);
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3865 #endif
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3866
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3867 return ret;
4bba5ea5d08a Provide a portable alternative for fstat
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36031
diff changeset
3868 }

mercurial