libpurple/util.c

Sun, 19 Jul 2009 16:28:32 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Sun, 19 Jul 2009 16:28:32 +0000
changeset 27880
16fe15b82347
parent 27831
f04462da519d
child 27881
7cd763960c56
permissions
-rw-r--r--

Correct the indentation of this macro by removing one level of indentation
here

1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
1 /*
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
2 * @file util.h Utility Functions
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3 * @ingroup core
20330
650a7af9c238 remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
4 */
650a7af9c238 remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
5
650a7af9c238 remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents: 19859
diff changeset
6 /* 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
7 * 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
8 * source distribution.
1
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 free software; you can redistribute it and/or modify
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
11 * 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
12 * the Free Software Foundation; either version 2 of the License, or
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
13 * (at your option) any later version.
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 * This program is distributed in the hope that it will be useful,
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
18 * GNU General Public License for more details.
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
19 *
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
20 * You should have received a copy of the GNU General Public License
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
21 * 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
22 * 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
23 */
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
24 #include "internal.h"
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
25
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
26 #include "cipher.h"
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
27 #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
28 #include "core.h"
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5826
diff changeset
29 #include "debug.h"
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
30 #include "notify.h"
1575
220b4d845309 [gaim-migrate @ 1585]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1560
diff changeset
31 #include "prpl.h"
5545
a8b1a1262402 [gaim-migrate @ 5946]
Christian Hammond <chipx86@chipx86.com>
parents: 5532
diff changeset
32 #include "prefs.h"
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
33 #include "util.h"
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
34
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
35 struct _PurpleUtilFetchUrlData
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
36 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
37 PurpleUtilFetchUrlCallback callback;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
38 void *user_data;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
39
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
40 struct
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
41 {
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
42 char *user;
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
43 char *passwd;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
44 char *address;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
45 int port;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
46 char *page;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
47
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
48 } website;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
49
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
50 char *url;
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
51 int num_times_redirected;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
52 gboolean full;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
53 char *user_agent;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
54 gboolean http11;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
55 char *request;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
56 gsize request_written;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
57 gboolean include_headers;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
58
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
59 gboolean is_ssl;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
60 PurpleSslConnection *ssl_connection;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
61 PurpleProxyConnectData *connect_data;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
62 int fd;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
63 guint inpa;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
64
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
65 gboolean got_headers;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
66 gboolean has_explicit_data_len;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
67 char *webdata;
27704
f3b2bca8c5b6 This fixes this compile warning:
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27662
diff changeset
68 gsize len;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
69 unsigned long data_len;
24011
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
70 gssize max_len;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
71 gboolean chunked;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
72 };
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
73
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
74 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
75 static char *user_dir = NULL;
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
76
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
77
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
78 PurpleMenuAction *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
79 purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
12919
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
80 GList *children)
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
81 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
82 PurpleMenuAction *act = g_new0(PurpleMenuAction, 1);
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
83 act->label = g_strdup(label);
12919
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
84 act->callback = callback;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
85 act->data = data;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
86 act->children = children;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
87 return act;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
88 }
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
89
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
90 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
91 purple_menu_action_free(PurpleMenuAction *act)
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
92 {
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
93 g_return_if_fail(act != NULL);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
94
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
95 g_free(act->label);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
96 g_free(act);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
97 }
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
98
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
99 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
100 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
101 {
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
102 /* This does nothing right now. It exists for symmetry with
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
103 * purple_util_uninit() and forwards compatibility. */
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
104 }
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
105
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
106 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
107 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
108 {
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
109 /* 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
110
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
111 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
112 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
113
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
114 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
115 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
116 }
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
117
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
118 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
119 * Base16 Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
120 **************************************************************************/
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
121 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
122 purple_base16_encode(const guchar *data, gsize len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
123 {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
124 int i;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
125 gchar *ascii = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
126
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
127 g_return_val_if_fail(data != NULL, NULL);
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
128 g_return_val_if_fail(len > 0, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
129
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
130 ascii = g_malloc(len * 2 + 1);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
131
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
132 for (i = 0; i < len; i++)
27116
19dff7b3ed0f A patch from Scott Wolchok to replace snprintf() with g_snprintf() and
Richard Laager <rlaager@pidgin.im>
parents: 26996
diff changeset
133 g_snprintf(&ascii[i * 2], 3, "%02hhx", data[i]);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
134
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
135 return ascii;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
136 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
137
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
138 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
139 purple_base16_decode(const char *str, gsize *ret_len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
140 {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
141 int len, i, accumulator = 0;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
142 guchar *data;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
143
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
144 g_return_val_if_fail(str != NULL, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
145
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
146 len = strlen(str);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
147
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
148 g_return_val_if_fail(strlen(str) > 0, 0);
15101
6fc73c8a0f4d [gaim-migrate @ 17822]
Nathan Walp <nwalp@pidgin.im>
parents: 15059
diff changeset
149 g_return_val_if_fail(len % 2 == 0, 0);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
150
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
151 data = g_malloc(len / 2);
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
152
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
153 for (i = 0; i < len; i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
154 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
155 if ((i % 2) == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
156 accumulator = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
157 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
158 accumulator <<= 4;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
159
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
160 if (isdigit(str[i]))
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
161 accumulator |= str[i] - 48;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
162 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
163 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
164 switch(tolower(str[i]))
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
165 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
166 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
167 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
168 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
169 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
170 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
171 case 'f': accumulator |= 15; break;
1826
2353dd376dcf [gaim-migrate @ 1836]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1815
diff changeset
172 }
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
173 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
174
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
175 if (i % 2)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
176 data[(i - 1) / 2] = accumulator;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
177 }
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
178
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
179 if (ret_len != NULL)
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
180 *ret_len = len / 2;
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
181
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
182 return data;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
183 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
184
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
185 gchar *
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
186 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
187 {
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
188 int i;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
189 gchar *ascii = NULL;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
190
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
191 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
192 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
193
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
194 /* 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
195 * 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
196 * 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
197 */
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
198 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
199
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
200 for (i = 0; i < len; i++)
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
201 g_snprintf(&ascii[i * 3], 4, "%02hhx:", data[i]);
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
202
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
203 /* 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
204 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
205
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
206 return ascii;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
207 }
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
208
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
209
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
210 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
211 * Base64 Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
212 **************************************************************************/
4888
09f16a932490 [gaim-migrate @ 5218]
Christian Hammond <chipx86@chipx86.com>
parents: 4853
diff changeset
213 static const char alphabet[] =
09f16a932490 [gaim-migrate @ 5218]
Christian Hammond <chipx86@chipx86.com>
parents: 4853
diff changeset
214 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
09f16a932490 [gaim-migrate @ 5218]
Christian Hammond <chipx86@chipx86.com>
parents: 4853
diff changeset
215 "0123456789+/";
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
216
8929
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
217 static const char xdigits[] =
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
218 "0123456789abcdef";
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
219
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
220 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
221 purple_base64_encode(const guchar *data, gsize len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
222 {
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
223 #if GLIB_CHECK_VERSION(2,12,0)
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
224 return g_base64_encode(data, len);
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
225 #else
6872
61144295083e [gaim-migrate @ 7418]
Nathan Walp <nwalp@pidgin.im>
parents: 6861
diff changeset
226 char *out, *rv;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
227
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
228 g_return_val_if_fail(data != NULL, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
229 g_return_val_if_fail(len > 0, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
230
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
231 rv = out = g_malloc(((len/3)+1)*4 + 1);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
232
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
233 for (; len >= 3; len -= 3)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
234 {
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
235 *out++ = alphabet[data[0] >> 2];
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
236 *out++ = alphabet[((data[0] << 4) & 0x30) | (data[1] >> 4)];
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
237 *out++ = alphabet[((data[1] << 2) & 0x3c) | (data[2] >> 6)];
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
238 *out++ = alphabet[data[2] & 0x3f];
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
239 data += 3;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
240 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
241
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
242 if (len > 0)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
243 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
244 unsigned char fragment;
6872
61144295083e [gaim-migrate @ 7418]
Nathan Walp <nwalp@pidgin.im>
parents: 6861
diff changeset
245
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
246 *out++ = alphabet[data[0] >> 2];
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
247 fragment = (data[0] << 4) & 0x30;
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
248
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
249 if (len > 1)
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
250 fragment |= data[1] >> 4;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
251
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
252 *out++ = alphabet[fragment];
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
253 *out++ = (len < 2) ? '=' : alphabet[(data[1] << 2) & 0x3c];
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
254 *out++ = '=';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
255 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
256
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
257 *out = '\0';
5426
b9b571cd1e57 [gaim-migrate @ 5805]
Nathan Walp <nwalp@pidgin.im>
parents: 5341
diff changeset
258
b9b571cd1e57 [gaim-migrate @ 5805]
Nathan Walp <nwalp@pidgin.im>
parents: 5341
diff changeset
259 return rv;
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
260 #endif /* GLIB < 2.12.0 */
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
261 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
262
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
263 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
264 purple_base64_decode(const char *str, gsize *ret_len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
265 {
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
266 #if GLIB_CHECK_VERSION(2,12,0)
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
267 /*
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
268 * We want to allow ret_len to be NULL for backward compatibility,
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
269 * but g_base64_decode() requires a valid length variable. So if
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
270 * ret_len is NULL then pass in a dummy variable.
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
271 */
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
272 gsize unused;
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
273 return g_base64_decode(str, ret_len != NULL ? ret_len : &unused);
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
274 #else
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
275 guchar *out = NULL;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
276 char tmp = 0;
1920
8e86151db7dc [gaim-migrate @ 1930]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1878
diff changeset
277 const char *c;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
278 gint32 tmp2 = 0;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
279 int len = 0, n = 0;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
280
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
281 g_return_val_if_fail(str != NULL, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
282
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
283 c = str;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
284
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
285 while (*c) {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
286 if (*c >= 'A' && *c <= 'Z') {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
287 tmp = *c - 'A';
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
288 } else if (*c >= 'a' && *c <= 'z') {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
289 tmp = 26 + (*c - 'a');
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
290 } else if (*c >= '0' && *c <= 57) {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
291 tmp = 52 + (*c - '0');
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
292 } else if (*c == '+') {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
293 tmp = 62;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
294 } else if (*c == '/') {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
295 tmp = 63;
5289
2713360bfed5 [gaim-migrate @ 5661]
Nathan Walp <nwalp@pidgin.im>
parents: 5247
diff changeset
296 } else if (*c == '\r' || *c == '\n') {
2713360bfed5 [gaim-migrate @ 5661]
Nathan Walp <nwalp@pidgin.im>
parents: 5247
diff changeset
297 c++;
2713360bfed5 [gaim-migrate @ 5661]
Nathan Walp <nwalp@pidgin.im>
parents: 5247
diff changeset
298 continue;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
299 } else if (*c == '=') {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
300 if (n == 3) {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
301 out = g_realloc(out, len + 2);
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
302 out[len] = (guchar)(tmp2 >> 10) & 0xff;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
303 len++;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
304 out[len] = (guchar)(tmp2 >> 2) & 0xff;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
305 len++;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
306 } else if (n == 2) {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
307 out = g_realloc(out, len + 1);
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
308 out[len] = (guchar)(tmp2 >> 4) & 0xff;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
309 len++;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
310 }
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
311 break;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
312 }
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
313 tmp2 = ((tmp2 << 6) | (tmp & 0xff));
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
314 n++;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
315 if (n == 4) {
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
316 out = g_realloc(out, len + 3);
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
317 out[len] = (guchar)((tmp2 >> 16) & 0xff);
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
318 len++;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
319 out[len] = (guchar)((tmp2 >> 8) & 0xff);
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
320 len++;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
321 out[len] = (guchar)(tmp2 & 0xff);
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
322 len++;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
323 tmp2 = 0;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
324 n = 0;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
325 }
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
326 c++;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
327 }
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
328
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
329 out = g_realloc(out, len + 1);
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
330 out[len] = 0;
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
331
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
332 if (ret_len != NULL)
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
333 *ret_len = len;
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
334
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
335 return out;
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
336 #endif /* GLIB < 2.12.0 */
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
337 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
338
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
339 /**************************************************************************
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
340 * Quoted Printable Functions (see RFC 2045).
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
341 **************************************************************************/
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
342 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
343 purple_quotedp_decode(const char *str, gsize *ret_len)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
344 {
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
345 char *n, *new;
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
346 const char *end, *p;
7722
ddcc8366697e [gaim-migrate @ 8367]
Nathan Walp <nwalp@pidgin.im>
parents: 7679
diff changeset
347
8005
de2b2ad34ee5 [gaim-migrate @ 8682]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7956
diff changeset
348 n = new = g_malloc(strlen (str) + 1);
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
349 end = str + strlen(str);
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
350
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
351 for (p = str; p < end; p++, n++) {
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
352 if (*p == '=') {
8929
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
353 if (p[1] == '\r' && p[2] == '\n') { /* 5.1 #5 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
354 n -= 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
355 p += 2;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
356 } else if (p[1] == '\n') { /* fuzzy case for 5.1 #5 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
357 n -= 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
358 p += 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
359 } else if (p[1] && p[2]) {
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
360 char *nibble1 = strchr(xdigits, tolower(p[1]));
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
361 char *nibble2 = strchr(xdigits, tolower(p[2]));
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
362 if (nibble1 && nibble2) { /* 5.1 #1 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
363 *n = ((nibble1 - xdigits) << 4) | (nibble2 - xdigits);
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
364 p += 2;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
365 } else { /* This should never happen */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
366 *n = *p;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
367 }
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
368 } else { /* This should never happen */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
369 *n = *p;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
370 }
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
371 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
372 else if (*p == '_')
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
373 *n = ' ';
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
374 else
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
375 *n = *p;
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
376 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
377
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
378 *n = '\0';
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
379
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
380 if (ret_len != NULL)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
381 *ret_len = n - new;
7722
ddcc8366697e [gaim-migrate @ 8367]
Nathan Walp <nwalp@pidgin.im>
parents: 7679
diff changeset
382
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
383 /* Resize to take less space */
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
384 /* new = realloc(new, n - new); */
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
385
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
386 return (guchar *)new;
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
387 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
388
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
389 /**************************************************************************
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
390 * MIME Functions
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
391 **************************************************************************/
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
392 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
393 purple_mime_decode_field(const char *str)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
394 {
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
395 /*
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
396 * This is wing's version, partially based on revo/shx's version
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
397 * See RFC2047 [which apparently obsoletes RFC1342]
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
398 */
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
399 typedef enum {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
400 state_start, state_equal1, state_question1,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
401 state_charset, state_question2,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
402 state_encoding, state_question3,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
403 state_encoded_text, state_question4, state_equal2 = state_start
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
404 } encoded_word_state_t;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
405 encoded_word_state_t state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
406 const char *cur, *mark;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
407 const char *charset0 = NULL, *encoding0 = NULL, *encoded_text0 = NULL;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
408 char *n, *new;
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
409
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
410 /* token can be any CHAR (supposedly ISO8859-1/ISO2022), not just ASCII */
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
411 #define token_char_p(c) \
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
412 (c != ' ' && !iscntrl(c) && !strchr("()<>@,;:\"/[]?.=", c))
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
413
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
414 /* But encoded-text must be ASCII; alas, isascii() may not exist */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
415 #define encoded_text_char_p(c) \
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
416 ((c & 0x80) == 0 && c != '?' && c != ' ' && isgraph(c))
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
417
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
418 #define RECOVER_MARKED_TEXT strncpy(n, mark, cur - mark + 1); \
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
419 n += cur - mark + 1
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
420
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
421 g_return_val_if_fail(str != NULL, NULL);
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
422
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
423 /* NOTE: Assuming that we need just strlen(str)+1 *may* be wrong.
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
424 * It would be wrong if one byte (in some unknown encoding) could
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
425 * expand to >=4 bytes of UTF-8; I don't know if there are such things.
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
426 */
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
427 n = new = g_malloc(strlen(str) + 1);
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
428
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
429 /* Here we will be looking for encoded words and if they seem to be
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
430 * valid then decode them.
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
431 * They are of this form: =?charset?encoding?text?=
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
432 */
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
433
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
434 for (cur = str, mark = NULL; *cur; cur += 1) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
435 switch (state) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
436 case state_equal1:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
437 if (*cur == '?') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
438 state = state_question1;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
439 } else {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
440 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
441 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
442 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
443 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
444 case state_question1:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
445 if (token_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
446 charset0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
447 state = state_charset;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
448 } else { /* This should never happen */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
449 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
450 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
451 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
452 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
453 case state_charset:
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
454 if (*cur == '?') {
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
455 state = state_question2;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
456 } else if (!token_char_p(*cur)) { /* This should never happen */
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
457 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
458 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
459 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
460 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
461 case state_question2:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
462 if (token_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
463 encoding0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
464 state = state_encoding;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
465 } else { /* This should never happen */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
466 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
467 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
468 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
469 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
470 case state_encoding:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
471 if (*cur == '?') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
472 state = state_question3;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
473 } else if (!token_char_p(*cur)) { /* This should never happen */
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
474 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
475 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
476 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
477 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
478 case state_question3:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
479 if (encoded_text_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
480 encoded_text0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
481 state = state_encoded_text;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
482 } else if (*cur == '?') { /* empty string */
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
483 encoded_text0 = cur;
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
484 state = state_question4;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
485 } else { /* This should never happen */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
486 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
487 state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
488 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
489 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
490 case state_encoded_text:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
491 if (*cur == '?') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
492 state = state_question4;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
493 } else if (!encoded_text_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
494 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
495 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
496 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
497 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
498 case state_question4:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
499 if (*cur == '=') { /* Got the whole encoded-word */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
500 char *charset = g_strndup(charset0, encoding0 - charset0 - 1);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
501 char *encoding = g_strndup(encoding0, encoded_text0 - encoding0 - 1);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
502 char *encoded_text = g_strndup(encoded_text0, cur - encoded_text0 - 1);
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
503 guchar *decoded = NULL;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
504 gsize dec_len;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
505 if (g_ascii_strcasecmp(encoding, "Q") == 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
506 decoded = purple_quotedp_decode(encoded_text, &dec_len);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
507 else if (g_ascii_strcasecmp(encoding, "B") == 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
508 decoded = purple_base64_decode(encoded_text, &dec_len);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
509 else
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
510 decoded = NULL;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
511 if (decoded) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
512 gsize len;
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
513 char *converted = g_convert((const gchar *)decoded, dec_len, "utf-8", charset, NULL, &len, NULL);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
514
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
515 if (converted) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
516 n = strncpy(n, converted, len) + len;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
517 g_free(converted);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
518 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
519 g_free(decoded);
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
520 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
521 g_free(charset);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
522 g_free(encoding);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
523 g_free(encoded_text);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
524 state = state_equal2; /* Restart the FSM */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
525 } else { /* This should never happen */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
526 RECOVER_MARKED_TEXT;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
527 state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
528 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
529 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
530 default:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
531 if (*cur == '=') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
532 mark = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
533 state = state_equal1;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
534 } else {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
535 /* Some unencoded text. */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
536 *n = *cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
537 n += 1;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
538 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
539 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
540 } /* switch */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
541 } /* for */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
542
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
543 if (state != state_start) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
544 RECOVER_MARKED_TEXT;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
545 }
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
546 *n = '\0';
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
547
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
548 return new;
7840
6a145f8cea82 [gaim-migrate @ 8493]
Mark Doliner <markdoliner@pidgin.im>
parents: 7824
diff changeset
549 }
7824
8ac3a78f2ec0 [gaim-migrate @ 8476]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7820
diff changeset
550
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
551
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
552 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
553 * Date/Time Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
554 **************************************************************************/
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
555
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
556 const char *purple_get_tzoff_str(const struct tm *tm, gboolean iso)
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
557 {
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
558 static char buf[7];
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
559 long off;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
560 gint8 min;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
561 gint8 hrs;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
562 struct tm new_tm = *tm;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
563
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
564 mktime(&new_tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
565
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
566 if (new_tm.tm_isdst < 0)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
567 g_return_val_if_reached("");
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
568
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
569 #ifdef _WIN32
20587
55af483c9e86 3rd time the charm? Fixes #2990, maybe
Ka-Hing Cheung <khc@pidgin.im>
parents: 19662
diff changeset
570 if ((off = wpurple_get_tz_offset()) == -1)
13427
9830277962aa [gaim-migrate @ 15801]
Daniel Atallah <datallah@pidgin.im>
parents: 13400
diff changeset
571 return "";
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
572 #else
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
573 # ifdef HAVE_TM_GMTOFF
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
574 off = new_tm.tm_gmtoff;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
575 # else
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
576 # ifdef HAVE_TIMEZONE
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
577 tzset();
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
578 off = -1 * timezone;
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
579 # endif /* HAVE_TIMEZONE */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
580 # endif /* !HAVE_TM_GMTOFF */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
581 #endif /* _WIN32 */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
582
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
583 min = (off / 60) % 60;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
584 hrs = ((off / 60) - min) / 60;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
585
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
586 if(iso) {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
587 if (0 == off) {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
588 strcpy(buf, "Z");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
589 } else {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
590 /* please leave the colons...they're optional for iso, but jabber
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
591 * wants them */
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
592 if(g_snprintf(buf, sizeof(buf), "%+03d:%02d", hrs, ABS(min)) > 6)
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
593 g_return_val_if_reached("");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
594 }
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
595 } else {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
596 if (g_snprintf(buf, sizeof(buf), "%+03d%02d", hrs, ABS(min)) > 5)
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
597 g_return_val_if_reached("");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
598 }
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
599
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
600 return buf;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
601 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
602
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
603 /* Windows doesn't HAVE_STRFTIME_Z_FORMAT, but this seems clearer. -- rlaager */
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
604 #if !defined(HAVE_STRFTIME_Z_FORMAT) || defined(_WIN32)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
605 static size_t purple_internal_strftime(char *s, size_t max, const char *format, const struct tm *tm)
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
606 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
607 const char *start;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
608 const char *c;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
609 char *fmt = NULL;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
610
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
611 /* Yes, this is checked in purple_utf8_strftime(),
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
612 * but better safe than sorry. -- rlaager */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
613 g_return_val_if_fail(format != NULL, 0);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
614
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
615 /* This is fairly efficient, and it only gets
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
616 * executed on Windows or if the underlying
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
617 * system doesn't support the %z format string,
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
618 * for strftime() so I think it's good enough.
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
619 * -- rlaager */
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
620 for (c = start = format; *c ; c++)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
621 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
622 if (*c != '%')
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
623 continue;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
624
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
625 c++;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
626
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
627 #ifndef HAVE_STRFTIME_Z_FORMAT
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
628 if (*c == 'z')
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
629 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
630 char *tmp = g_strdup_printf("%s%.*s%s",
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
631 fmt ? fmt : "",
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
632 c - start - 1,
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
633 start,
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
634 purple_get_tzoff_str(tm, FALSE));
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
635 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
636 fmt = tmp;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
637 start = c + 1;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
638 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
639 #endif
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
640 #ifdef _WIN32
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
641 if (*c == 'Z')
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
642 {
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
643 char *tmp = g_strdup_printf("%s%.*s%s",
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
644 fmt ? fmt : "",
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
645 c - start - 1,
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
646 start,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
647 wpurple_get_timezone_abbreviation(tm));
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
648 g_free(fmt);
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
649 fmt = tmp;
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
650 start = c + 1;
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
651 }
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
652 #endif
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
653 }
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
654
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
655 if (fmt != NULL)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
656 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
657 size_t ret;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
658
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
659 if (*start)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
660 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
661 char *tmp = g_strconcat(fmt, start, NULL);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
662 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
663 fmt = tmp;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
664 }
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
665
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
666 ret = strftime(s, max, fmt, tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
667 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
668
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
669 return ret;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
670 }
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
671
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
672 return strftime(s, max, format, tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
673 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
674 #else /* HAVE_STRFTIME_Z_FORMAT && !_WIN32 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
675 #define purple_internal_strftime strftime
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
676 #endif
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
677
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
678 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
679 purple_utf8_strftime(const char *format, const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
680 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
681 static char buf[128];
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
682 char *locale;
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
683 GError *err = NULL;
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
684 int len;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
685 char *utf8;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
686
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
687 g_return_val_if_fail(format != NULL, NULL);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
688
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
689 if (tm == NULL)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
690 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
691 time_t now = time(NULL);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
692 tm = localtime(&now);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
693 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
694
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
695 locale = g_locale_from_utf8(format, -1, NULL, NULL, &err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
696 if (err != NULL)
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
697 {
19832
84b69b21672b Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 19766
diff changeset
698 purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s\n", err->message);
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
699 g_error_free(err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
700 locale = g_strdup(format);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
701 }
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
702
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
703 /* A return value of 0 is either an error (in
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
704 * which case, the contents of the buffer are
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
705 * undefined) or the empty string (in which
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
706 * case, no harm is done here). */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
707 if ((len = purple_internal_strftime(buf, sizeof(buf), locale, tm)) == 0)
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
708 {
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
709 g_free(locale);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
710 return "";
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
711 }
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
712
13308
e6882a87f32d [gaim-migrate @ 15673]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 13216
diff changeset
713 g_free(locale);
e6882a87f32d [gaim-migrate @ 15673]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 13216
diff changeset
714
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
715 utf8 = g_locale_to_utf8(buf, len, NULL, NULL, &err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
716 if (err != NULL)
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
717 {
19832
84b69b21672b Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 19766
diff changeset
718 purple_debug_error("util", "Result conversion failed in purple_utf8_strftime(): %s\n", err->message);
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
719 g_error_free(err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
720 }
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
721 else
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
722 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
723 purple_strlcpy(buf, utf8);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
724 g_free(utf8);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
725 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
726
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
727 return buf;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
728 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
729
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
730 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
731 purple_date_format_short(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
732 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
733 return purple_utf8_strftime("%x", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
734 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
735
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
736 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
737 purple_date_format_long(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
738 {
23995
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
739 /*
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
740 * 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
741 * 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
742 * 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
743 * 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
744 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
745 return purple_utf8_strftime(_("%x %X"), tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
746 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
747
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
748 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
749 purple_date_format_full(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
750 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
751 return purple_utf8_strftime("%c", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
752 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
753
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
754 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
755 purple_time_format(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
756 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
757 return purple_utf8_strftime("%X", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
758 }
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
759
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
760 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
761 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
762 {
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
763 struct tm tm;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
764
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
765 tm.tm_year = year - 1900;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
766 tm.tm_mon = month - 1;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
767 tm.tm_mday = day;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
768 tm.tm_hour = hour;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
769 tm.tm_min = min;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
770 tm.tm_sec = sec >= 0 ? sec : time(NULL) % 60;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
771
1805
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
772 return mktime(&tm);
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
773 }
3230
6d0e07333504 [gaim-migrate @ 3247]
Jim Seymour <jseymour@users.sourceforge.net>
parents: 3153
diff changeset
774
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
775 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
776 purple_str_to_time(const char *timestamp, gboolean utc,
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
777 struct tm *tm, long *tz_off, const char **rest)
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
778 {
9722
c1072806bcae [gaim-migrate @ 10583]
Mark Doliner <markdoliner@pidgin.im>
parents: 9716
diff changeset
779 time_t retval = 0;
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
780 static struct tm t;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
781 const char *c = timestamp;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
782 int year = 0;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
783 long tzoff = PURPLE_NO_TZ_OFF;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
784
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
785 time(&retval);
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
786 localtime_r(&retval, &t);
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
787
24177
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
788 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
789 *rest = NULL;
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
790
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
791 /* 4 digit year */
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
792 if (sscanf(c, "%04d", &year) && year > 1900)
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
793 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
794 c += 4;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
795 if (*c == '-')
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
796 c++;
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
797 t.tm_year = year - 1900;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
798 }
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
799
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
800 /* 2 digit month */
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
801 if (!sscanf(c, "%02d", &t.tm_mon))
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
802 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
803 if (rest != NULL && *c != '\0')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
804 *rest = c;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
805 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
806 }
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
807 c += 2;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
808 if (*c == '-' || *c == '/')
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
809 c++;
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
810 t.tm_mon -= 1;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
811
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
812 /* 2 digit day */
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
813 if (!sscanf(c, "%02d", &t.tm_mday))
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
814 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
815 if (rest != NULL && *c != '\0')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
816 *rest = c;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
817 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
818 }
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
819 c += 2;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
820 if (*c == '/')
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
821 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
822 c++;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
823
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
824 if (!sscanf(c, "%04d", &t.tm_year))
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
825 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
826 if (rest != NULL && *c != '\0')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
827 *rest = c;
13465
259b56595409 [gaim-migrate @ 15839]
Richard Laager <rlaager@pidgin.im>
parents: 13444
diff changeset
828 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
829 }
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
830 t.tm_year -= 1900;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
831 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
832 else if (*c == 'T' || *c == '.')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
833 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
834 c++;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
835 /* we have more than a date, keep going */
9725
4383542a4291 [gaim-migrate @ 10586]
Mark Doliner <markdoliner@pidgin.im>
parents: 9722
diff changeset
836
4383542a4291 [gaim-migrate @ 10586]
Mark Doliner <markdoliner@pidgin.im>
parents: 9722
diff changeset
837 /* 2 digit hour */
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
838 if ((sscanf(c, "%02d:%02d:%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3 && (c = c + 8)) ||
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
839 (sscanf(c, "%02d%02d%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3 && (c = c + 6)))
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
840 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
841 gboolean offset_positive = FALSE;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
842 int tzhrs;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
843 int tzmins;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
844
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
845 t.tm_isdst = -1;
10876
276eb05e6276 [gaim-migrate @ 12567]
Nathan Walp <nwalp@pidgin.im>
parents: 10871
diff changeset
846
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
847 if (*c == '.') {
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
848 do {
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
849 c++;
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
850 } while (*c >= '0' && *c <= '9'); /* dealing with precision we don't care about */
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
851 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
852 if (*c == '+')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
853 offset_positive = TRUE;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
854 if (((*c == '+' || *c == '-') && (c = c + 1)) &&
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
855 ((sscanf(c, "%02d:%02d", &tzhrs, &tzmins) == 2 && (c = c + 5)) ||
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
856 (sscanf(c, "%02d%02d", &tzhrs, &tzmins) == 2 && (c = c + 4))))
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
857 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
858 tzoff = tzhrs*60*60 + tzmins*60;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
859 if (offset_positive)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
860 tzoff *= -1;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
861 }
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
862 else if ((*c == 'Z') && (c = c + 1))
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
863 {
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
864 /* 'Z' = Zulu = UTC */
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
865 tzoff = 0;
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
866 }
15059
73305cb095c7 [gaim-migrate @ 17776]
Richard Laager <rlaager@pidgin.im>
parents: 15021
diff changeset
867 else if (utc)
73305cb095c7 [gaim-migrate @ 17776]
Richard Laager <rlaager@pidgin.im>
parents: 15021
diff changeset
868 {
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
869 static struct tm tmptm;
21697
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
870 time_t tmp;
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
871 tmp = mktime(&t);
21697
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
872 /* we care about whether it *was* dst, and the offset, here on this
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
873 * date, not whether we are currently observing dst locally *now*.
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
874 * This isn't perfect, because we would need to know in advance the
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
875 * offset we are trying to work out in advance to be sure this
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
876 * works for times around dst transitions but it'll have to do. */
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
877 localtime_r(&tmp, &tmptm);
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
878 t.tm_isdst = tmptm.tm_isdst;
21697
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
879 #ifdef HAVE_TM_GMTOFF
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
880 t.tm_gmtoff = tmptm.tm_gmtoff;
21697
c865512e913f Fix the bug in purple_str_to_time() that was causing 'make check' to fail.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21696
diff changeset
881 #endif
15059
73305cb095c7 [gaim-migrate @ 17776]
Richard Laager <rlaager@pidgin.im>
parents: 15021
diff changeset
882 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
883
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
884 if (rest != NULL && *c != '\0')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
885 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
886 if (*c == ' ')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
887 c++;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
888 if (*c != '\0')
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
889 *rest = c;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
890 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
891
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
892 if (tzoff != PURPLE_NO_TZ_OFF || utc)
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
893 {
13585
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
894 #if defined(_WIN32)
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
895 long sys_tzoff;
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
896 #endif
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
897
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
898 #if defined(_WIN32) || defined(HAVE_TM_GMTOFF) || defined (HAVE_TIMEZONE)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
899 if (tzoff == PURPLE_NO_TZ_OFF)
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
900 tzoff = 0;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
901 #endif
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
902
10987
50b656536923 [gaim-migrate @ 12824]
Daniel Atallah <datallah@pidgin.im>
parents: 10948
diff changeset
903 #ifdef _WIN32
20587
55af483c9e86 3rd time the charm? Fixes #2990, maybe
Ka-Hing Cheung <khc@pidgin.im>
parents: 19662
diff changeset
904 if ((sys_tzoff = wpurple_get_tz_offset()) == -1)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
905 tzoff = PURPLE_NO_TZ_OFF;
13585
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
906 else
b0752c839d60 [gaim-migrate @ 15966]
Richard Laager <rlaager@pidgin.im>
parents: 13521
diff changeset
907 tzoff += sys_tzoff;
10987
50b656536923 [gaim-migrate @ 12824]
Daniel Atallah <datallah@pidgin.im>
parents: 10948
diff changeset
908 #else
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
909 #ifdef HAVE_TM_GMTOFF
21698
a63eace78d68 'man 3 ctime' says of localtime() (and friends):
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21697
diff changeset
910 tzoff += t.tm_gmtoff;
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
911 #else
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
912 # ifdef HAVE_TIMEZONE
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
913 tzset(); /* making sure */
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
914 tzoff -= timezone;
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
915 # endif
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
916 #endif
10987
50b656536923 [gaim-migrate @ 12824]
Daniel Atallah <datallah@pidgin.im>
parents: 10948
diff changeset
917 #endif /* _WIN32 */
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
918 }
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
919 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
920 else
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
921 {
13400
a23782f450d2 [gaim-migrate @ 15773]
Richard Laager <rlaager@pidgin.im>
parents: 13368
diff changeset
922 if (rest != NULL && *c != '\0')
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
923 *rest = c;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
924 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
925 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
926
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
927 retval = mktime(&t);
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
928
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
929 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
930 *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
931
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
932 if (tzoff != PURPLE_NO_TZ_OFF)
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
933 retval += tzoff;
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
934
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
935 if (tz_off != NULL)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
936 *tz_off = tzoff;
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
937
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
938 return retval;
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
939 }
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
940
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
941 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
942 * Markup Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
943 **************************************************************************/
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
944
27652
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
945 /*
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
946 * 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
947 * 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
948 */
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
949 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
950 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
951 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
952 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
953 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
954 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
955
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
956 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
957 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
958
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
959 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
960 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
961 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
962 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
963
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
964 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
965 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
966 case '&':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
967 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
968 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
969
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
970 case '<':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
971 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
972 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
973
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
974 case '>':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
975 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
976 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
977
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
978 case '"':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
979 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
980 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
981
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
982 default:
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
983 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
984 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
985 (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
986 (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
987 (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
988 (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
989 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
990 else
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
991 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
992 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
993 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
994
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
995 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
996 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
997 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
998
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
999 /* 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
1000 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
1001 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1002 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
1003
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1004 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
1005
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1006 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
1007 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
1008
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1009 /* 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
1010 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
1011 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
1012
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1013 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
1014 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
1015
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1016 const char *
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1017 purple_markup_unescape_entity(const char *text, int *length)
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1018 {
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1019 const char *pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1020 int len, pound;
21909
0fa4d1107182 Patch #3848 from Eion Robb: "purple_markup_unescape_entity doesn't escape hexadecimal references", with changes from QuLogic.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21707
diff changeset
1021 char temp[2];
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1022
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1023 if (!text || *text != '&')
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1024 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1025
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1026 #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
1027
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1028 if(IS_ENTITY("&amp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1029 pln = "&";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1030 else if(IS_ENTITY("&lt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1031 pln = "<";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1032 else if(IS_ENTITY("&gt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1033 pln = ">";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1034 else if(IS_ENTITY("&nbsp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1035 pln = " ";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1036 else if(IS_ENTITY("&copy;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
1037 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
1038 else if(IS_ENTITY("&quot;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1039 pln = "\"";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1040 else if(IS_ENTITY("&reg;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
1041 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
1042 else if(IS_ENTITY("&apos;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1043 pln = "\'";
21909
0fa4d1107182 Patch #3848 from Eion Robb: "purple_markup_unescape_entity doesn't escape hexadecimal references", with changes from QuLogic.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21707
diff changeset
1044 else if(*(text+1) == '#' &&
22445
457464fe951f Revert some bits of the earlier patch not related to custom smileys.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22444
diff changeset
1045 (sscanf(text, "&#%u%1[;]", &pound, temp) == 2 ||
457464fe951f Revert some bits of the earlier patch not related to custom smileys.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22444
diff changeset
1046 sscanf(text, "&#x%x%1[;]", &pound, temp) == 2) &&
21909
0fa4d1107182 Patch #3848 from Eion Robb: "purple_markup_unescape_entity doesn't escape hexadecimal references", with changes from QuLogic.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21707
diff changeset
1047 pound != 0) {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1048 static char buf[7];
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1049 int buflen = g_unichar_to_utf8((gunichar)pound, buf);
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1050 buf[buflen] = '\0';
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1051 pln = buf;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1052
27528
fab5d97a7bc6 Fix purple_markup_unescape_entity to properly consume '&#x5C;' and similar.
Paul Aurich <darkrain42@pidgin.im>
parents: 27519
diff changeset
1053 len = (*(text+2) == 'x' ? 3 : 2);
fab5d97a7bc6 Fix purple_markup_unescape_entity to properly consume '&#x5C;' and similar.
Paul Aurich <darkrain42@pidgin.im>
parents: 27519
diff changeset
1054 while(isxdigit((gint) text[len])) len++;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1055 if(text[len] == ';') len++;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1056 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1057 else
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1058 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1059
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1060 if (length)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1061 *length = len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1062 return pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1063 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1064
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1065 char *
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1066 purple_markup_get_css_property(const gchar *style,
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1067 const gchar *opt)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1068 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1069 const gchar *css_str = style;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1070 const gchar *css_value_start;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1071 const gchar *css_value_end;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1072 gchar *tmp;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1073 gchar *ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1074
24642
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
1075 g_return_val_if_fail(opt != NULL, NULL);
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
1076
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1077 if (!css_str)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1078 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1079
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1080 /* find the CSS property */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1081 while (1)
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1082 {
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1083 /* skip whitespace characters */
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1084 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
1085 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1086 if (!g_ascii_isalpha(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1087 return NULL;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1088 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
1089 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1090 /* go to next css property positioned after the next ';' */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1091 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1092 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1093 if(*css_str != ';')
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1094 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1095 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1096 }
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1097 else
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1098 break;
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1099 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1100
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1101 /* find the CSS value position in the string */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1102 css_str += strlen(opt);
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1103 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
1104 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1105 if (*css_str != ':')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1106 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1107 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1108 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
1109 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1110 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
1111 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1112
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1113 /* mark the CSS value */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1114 css_value_start = css_str;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1115 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1116 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1117 css_value_end = css_str - 1;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1118
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1119 /* Removes trailing whitespace */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1120 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
1121 css_value_end--;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1122
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1123 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
1124 ret = purple_unescape_html(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1125 g_free(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1126
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1127 return ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1128 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1129
27234
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1130 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
1131 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1132 GData *attributes;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1133 const gchar *start, *end;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1134 gboolean res = FALSE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1135
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1136 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
1137 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1138 /* 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
1139 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
1140 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
1141 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1142 if (!res)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1143 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1144 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
1145 if (tmp)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1146 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1147 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
1148 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
1149 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1150 g_free(tmp2);
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1151 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1152
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1153 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1154 g_datalist_clear(&attributes);
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1155 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1156 return res;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1157 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1158
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1159 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1160 purple_markup_find_tag(const char *needle, const char *haystack,
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1161 const char **start, const char **end, GData **attributes)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1162 {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1163 GData *attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1164 const char *cur = haystack;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1165 char *name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1166 gboolean found = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1167 gboolean in_tag = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1168 gboolean in_attr = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1169 const char *in_quotes = NULL;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1170 size_t needlelen;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1171
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1172 g_return_val_if_fail( needle != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1173 g_return_val_if_fail( *needle != '\0', FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1174 g_return_val_if_fail( haystack != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1175 g_return_val_if_fail( start != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1176 g_return_val_if_fail( end != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1177 g_return_val_if_fail(attributes != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1178
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1179 needlelen = strlen(needle);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1180 g_datalist_init(&attribs);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1181
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1182 while (*cur && !found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1183 if (in_tag) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1184 if (in_quotes) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1185 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1186
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1187 while (*close && *close != *in_quotes)
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1188 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1189
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1190 /* 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
1191 * 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
1192 * and we're outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1193 if (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1194 /* only store a value if we have an attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1195 if (name) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1196 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1197 char *val = g_strndup(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1198
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1199 g_datalist_set_data_full(&attribs, name, val, g_free);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1200 g_free(name);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1201 name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1202 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1203
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1204 in_quotes = NULL;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1205 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1206 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1207 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1208 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1209 } else if (in_attr) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1210 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1211
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1212 while (*close && *close != '>' && *close != '"' &&
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1213 *close != '\'' && *close != ' ' && *close != '=')
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1214 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1215
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1216 /* 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
1217 * the quote, save the attribute and go straight to quote mode.
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1218 * 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
1219 * so we can get outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1220 switch (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1221 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1222 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1223 in_quotes = close;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1224 case '=':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1225 {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1226 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1227
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1228 /* don't store a blank attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1229 if (len) {
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1230 g_free(name);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1231 name = g_ascii_strdown(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1232 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1233
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1234 in_attr = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1235 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1236 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1237 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1238 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1239 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1240 in_attr = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1241 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1242 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1243 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1244 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1245 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1246 switch (*cur) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1247 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1248 /* swallow extra spaces inside tag */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1249 while (*cur && *cur == ' ') cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1250 in_attr = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1251 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1252 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1253 found = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1254 *end = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1255 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1256 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1257 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1258 in_quotes = cur;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1259 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1260 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1261 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1262 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1263 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1264 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1265 /* if we hit a < followed by the name of our tag... */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1266 if (*cur == '<' && !g_ascii_strncasecmp(cur + 1, needle, needlelen)) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1267 *start = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1268 cur = cur + needlelen + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1269
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1270 /* 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
1271 * 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
1272 * >, but not being distracted by >s inside quotes. */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1273 if (*cur == ' ' || *cur == '>') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1274 in_tag = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1275 } else {
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1276 while (*cur && *cur != '"' && *cur != '\'' && *cur != '>') {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1277 if (*cur == '"') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1278 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1279 while (*cur && *cur != '"')
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1280 cur++;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1281 } else if (*cur == '\'') {
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1282 cur++;
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1283 while (*cur && *cur != '\'')
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1284 cur++;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1285 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1286 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1287 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1288 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1289 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1290 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1291 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1292 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1293 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1294 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1295
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1296 /* clean up any attribute name from a premature termination */
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1297 g_free(name);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1298
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1299 if (found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1300 *attributes = attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1301 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1302 *start = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1303 *end = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1304 *attributes = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1305 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1306
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1307 return found;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1308 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1309
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1310 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1311 purple_markup_extract_info_field(const char *str, int len, PurpleNotifyUserInfo *user_info,
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1312 const char *start_token, int skip,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1313 const char *end_token, char check_value,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1314 const char *no_value_token,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1315 const char *display_name, gboolean is_link,
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1316 const char *link_prefix,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1317 PurpleInfoFieldFormatCallback format_cb)
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1318 {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1319 const char *p, *q;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1320
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1321 g_return_val_if_fail(str != NULL, FALSE);
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1322 g_return_val_if_fail(user_info != NULL, FALSE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1323 g_return_val_if_fail(start_token != NULL, FALSE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1324 g_return_val_if_fail(end_token != NULL, FALSE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1325 g_return_val_if_fail(display_name != NULL, FALSE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1326
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1327 p = strstr(str, start_token);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1328
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1329 if (p == NULL)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1330 return FALSE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1331
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1332 p += strlen(start_token) + skip;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1333
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1334 if (p >= str + len)
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1335 return FALSE;
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1336
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1337 if (check_value != '\0' && *p == check_value)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1338 return FALSE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1339
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1340 q = strstr(p, end_token);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1341
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1342 /* Trim leading blanks */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1343 while (*p != '\n' && g_ascii_isspace(*p)) {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1344 p += 1;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1345 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1346
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1347 /* Trim trailing blanks */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1348 while (q > p && g_ascii_isspace(*(q - 1))) {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1349 q -= 1;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1350 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1351
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1352 /* Don't bother with null strings */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1353 if (p == q)
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1354 return FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1355
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1356 if (q != NULL && (!no_value_token ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1357 (no_value_token && strncmp(p, no_value_token,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1358 strlen(no_value_token)))))
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1359 {
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1360 GString *dest = g_string_new("");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1361
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1362 if (is_link)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1363 {
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1364 g_string_append(dest, "<a href=\"");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1365
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1366 if (link_prefix)
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1367 g_string_append(dest, link_prefix);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1368
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1369 if (format_cb != NULL)
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1370 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1371 char *reformatted = format_cb(p, q - p);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1372 g_string_append(dest, reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1373 g_free(reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1374 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1375 else
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1376 g_string_append_len(dest, p, q - p);
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1377 g_string_append(dest, "\">");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1378
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1379 if (link_prefix)
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1380 g_string_append(dest, link_prefix);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1381
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1382 g_string_append_len(dest, p, q - p);
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1383 g_string_append(dest, "</a>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1384 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1385 else
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1386 {
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1387 if (format_cb != NULL)
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1388 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1389 char *reformatted = format_cb(p, q - p);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1390 g_string_append(dest, reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1391 g_free(reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1392 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1393 else
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1394 g_string_append_len(dest, p, q - p);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1395 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1396
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1397 purple_notify_user_info_add_pair(user_info, display_name, dest->str);
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1398 g_string_free(dest, TRUE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1399
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1400 return TRUE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1401 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1402
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1403 return FALSE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1404 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1405
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1406 struct purple_parse_tag {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1407 char *src_tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1408 char *dest_tag;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1409 gboolean ignore;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1410 };
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1411
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1412 #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1413 const char *o = c + strlen("<" x); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1414 const char *p = NULL, *q = NULL, *r = NULL; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1415 GString *innards = g_string_new(""); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1416 while(o && *o) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1417 if(!q && (*o == '\"' || *o == '\'') ) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1418 q = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1419 } else if(q) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1420 if(*o == *q) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1421 char *unescaped = g_strndup(q+1, o-q-1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1422 char *escaped = g_markup_escape_text(unescaped, -1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1423 g_string_append_printf(innards, "%c%s%c", *q, escaped, *q); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1424 g_free(unescaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1425 g_free(escaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1426 q = NULL; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1427 } else if(*c == '\\') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1428 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1429 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1430 } else if(*o == '<') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1431 r = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1432 } else if(*o == '>') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1433 p = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1434 break; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1435 } else { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1436 innards = g_string_append_c(innards, *o); \
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 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1439 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1440 if(p && !r) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1441 if(*(p-1) != '/') { \
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1442 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
1443 pt->src_tag = x; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1444 pt->dest_tag = y; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1445 tags = g_list_prepend(tags, pt); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1446 } \
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, "<" y); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1449 xhtml = g_string_append(xhtml, innards->str); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1450 xhtml = g_string_append_c(xhtml, '>'); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1451 } \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1452 c = p + 1; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1453 } else { \
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 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1460 g_string_free(innards, TRUE); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1461 continue; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1462 } \
27880
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1463 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
1464 (*(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
1465 !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
1466 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1467 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
1468 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
1469 if(*c != '/') { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1470 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
1471 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
1472 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
1473 tags = g_list_prepend(tags, pt); \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1474 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
1475 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
1476 } else { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1477 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1478 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
1479 } \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1480 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
1481 continue; \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1482 } \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1483 #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1484 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1485 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
1486 char **plain_out)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1487 {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1488 GString *xhtml = NULL;
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1489 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
1490 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
1491 GString *cdata = NULL;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1492 GList *tags = NULL, *tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1493 const char *c = html;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1494 char quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1495
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1496 #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
1497 quote = *(ptr++); \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1498 else \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1499 quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1500
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1501 #define VALID_CHAR(ptr) (*(ptr) && *(ptr) != quote && (quote || (*(ptr) != ' ' && *(ptr) != '>')))
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1502
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1503 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
1504
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1505 if(xhtml_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1506 xhtml = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1507 if(plain_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1508 plain = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1509
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1510 while(c && *c) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1511 if(*c == '<') {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1512 if(*(c+1) == '/') { /* closing tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1513 tag = tags;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1514 while(tag) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1515 struct purple_parse_tag *pt = tag->data;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1516 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
1517 c += strlen(pt->src_tag) + 3;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1518 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1519 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1520 tag = tag->next;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1521 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1522 if(tag) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1523 while(tags) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1524 struct purple_parse_tag *pt = tags->data;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1525 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1526 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
1527 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
1528 /* 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
1529 if (cdata && url &&
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1530 (!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
1531 g_utf8_collate(url->str + 7, cdata->str) != 0)))
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
1532 g_string_append_printf(plain, " <%s>", g_strstrip(url->str));
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
1533 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
1534 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
1535 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
1536 }
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
1537
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
1538 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1539 if(tags == tag)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1540 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1541 tags = g_list_remove(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1542 g_free(pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1543 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1544 g_free(tag->data);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1545 tags = g_list_remove(tags, tag->data);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1546 } else {
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1547 /* a closing tag we weren't expecting...
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1548 * 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
1549 * just a </ we'll escape it properly */
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1550 const char *end = c+2;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1551 while(*end && g_ascii_isalpha(*end))
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1552 end++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1553 if(*end == '>') {
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1554 c = end+1;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1555 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1556 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1557 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1558 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1559 plain = g_string_append_c(plain, '<');
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1560 c++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1561 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1562 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1563 } else { /* opening tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1564 ALLOW_TAG("blockquote");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1565 ALLOW_TAG("cite");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1566 ALLOW_TAG("div");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1567 ALLOW_TAG("em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1568 ALLOW_TAG("h1");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1569 ALLOW_TAG("h2");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1570 ALLOW_TAG("h3");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1571 ALLOW_TAG("h4");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1572 ALLOW_TAG("h5");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1573 ALLOW_TAG("h6");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1574 /* we only allow html to start the message */
27831
f04462da519d ALLOW_TAG expands to multiple statements, so we should put braces around
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27732
diff changeset
1575 if(c == html) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1576 ALLOW_TAG("html");
27831
f04462da519d ALLOW_TAG expands to multiple statements, so we should put braces around
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27732
diff changeset
1577 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1578 ALLOW_TAG_ALT("i", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1579 ALLOW_TAG_ALT("italic", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1580 ALLOW_TAG("li");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1581 ALLOW_TAG("ol");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1582 ALLOW_TAG("p");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1583 ALLOW_TAG("pre");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1584 ALLOW_TAG("q");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1585 ALLOW_TAG("span");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1586 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
1587
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
1588
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1589 /* 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
1590 * we still want to send something sensible, so we put a
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1591 * linebreak in its place. <BR> also needs special handling
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1592 * because putting a </BR> to close it would just be dumb. */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1593 if((!g_ascii_strncasecmp(c, "<br", 3)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1594 || !g_ascii_strncasecmp(c, "<hr", 3))
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1595 && (*(c+3) == '>' ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1596 !g_ascii_strncasecmp(c+3, "/>", 2) ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1597 !g_ascii_strncasecmp(c+3, " />", 3))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1598 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1599 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1600 xhtml = g_string_append(xhtml, "<br/>");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1601 if(plain && *c != '\n')
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1602 plain = g_string_append_c(plain, '\n');
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1603 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1604 }
22313
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1605 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
1606 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
1607 if (*(c+2) == '>')
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1608 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
1609 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
1610 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
1611 else
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1612 pt->src_tag = "strong";
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1613 pt->dest_tag = "span";
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1614 tags = g_list_prepend(tags, pt);
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1615 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1616 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1617 xhtml = g_string_append(xhtml, "<span style='font-weight: bold;'>");
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1618 continue;
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1619 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1620 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
1621 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
1622 pt->src_tag = *(c+2) == '>' ? "u" : "underline";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1623 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1624 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1625 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1626 if (xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1627 xhtml = g_string_append(xhtml, "<span style='text-decoration: underline;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1628 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1629 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1630 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
1631 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
1632 pt->src_tag = *(c+2) == '>' ? "s" : "strike";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1633 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1634 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1635 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1636 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1637 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
1638 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1639 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1640 if(!g_ascii_strncasecmp(c, "<sub>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1641 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
1642 pt->src_tag = "sub";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1643 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1644 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1645 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1646 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1647 xhtml = g_string_append(xhtml, "<span style='vertical-align:sub;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1648 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1649 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1650 if(!g_ascii_strncasecmp(c, "<sup>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1651 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
1652 pt->src_tag = "sup";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1653 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1654 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1655 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1656 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1657 xhtml = g_string_append(xhtml, "<span style='vertical-align:super;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1658 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1659 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1660 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
1661 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
1662 GString *src = NULL, *alt = NULL;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1663 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1664 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
1665 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
1666 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
1667 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
1668 src = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1669 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1670 while (VALID_CHAR(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
1671 src = g_string_append_c(src, *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
1672 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
1673 }
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
1674 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1675 } 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
1676 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
1677 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
1678 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
1679 alt = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1680 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1681 while (VALID_CHAR(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
1682 alt = g_string_append_c(alt, *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
1683 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
1684 }
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
1685 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1686 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1687 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
1688 }
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
1689 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1690 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
1691 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
1692 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
1693 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
1694 /* 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
1695 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
1696 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
1697 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
1698 if(plain)
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
1699 plain = g_string_append(plain, 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
1700 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
1701 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
1702 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
1703 }
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
1704 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
1705 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
1706 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1707 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
1708 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
1709 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
1710 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1711 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
1712 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
1713 if (url)
9a092747dcea Fix some incorrect assertions when G_DEBUG=fatal_warnings is set.
Daniel Atallah <datallah@pidgin.im>
parents: 20611
diff changeset
1714 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
1715 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
1716 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
1717 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
1718 cdata = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1719 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1720 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
1721 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
1722 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
1723 url = g_string_append(url, "&amp;");
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1724 else
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1725 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
1726 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
1727 }
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
1728 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1729 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1730 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
1731 }
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
1732 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1733 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
1734 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
1735 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
1736 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
1737 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
1738 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
1739 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
1740 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
1741 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
1742 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
1743 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
1744 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1745 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
1746 const char *p = c + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1747 GString *style = g_string_new("");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1748 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
1749 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1750 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
1751 const char *q = p + 5;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1752 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
1753 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1754 while (VALID_CHAR(q)) {
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1755 color = g_string_append_c(color, *q);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1756 q++;
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1757 }
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1758 g_string_append_printf(style, "background: %s; ", color->str);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1759 g_string_free(color, TRUE);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1760 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1761 } 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
1762 const char *q = p + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1763 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
1764 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1765 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1766 color = g_string_append_c(color, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1767 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1768 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1769 g_string_append_printf(style, "color: %s; ", color->str);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1770 g_string_free(color, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1771 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1772 } 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
1773 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1774 GString *face = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1775 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1776 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1777 face = g_string_append_c(face, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1778 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1779 }
13836
43be98fd1be0 [gaim-migrate @ 16283]
Brian Chu <roast@users.sourceforge.net>
parents: 13831
diff changeset
1780 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
1781 g_string_free(face, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1782 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1783 } 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
1784 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1785 int sz;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1786 const char *size = "medium";
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1787 CHECK_QUOTE(q);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1788 sz = atoi(q);
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1789 switch (sz)
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1790 {
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1791 case 1:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1792 size = "xx-small";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1793 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1794 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
1795 size = "small";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1796 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1797 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
1798 size = "medium";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1799 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1800 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
1801 size = "large";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1802 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1803 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
1804 size = "x-large";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1805 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1806 case 6:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1807 case 7:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1808 size = "xx-large";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1809 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1810 default:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1811 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1812 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1813 g_string_append_printf(style, "font-size: %s; ", size);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1814 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1815 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1816 p++;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1817 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1818 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1819 if ((c = strchr(p, '>')) != NULL)
10593
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1820 c++;
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1821 else
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1822 c = p;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1823 pt = g_new0(struct purple_parse_tag, 1);
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1824 pt->src_tag = "font";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1825 pt->dest_tag = "span";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1826 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
1827 if(style->len && xhtml)
18108
cb8669f16994 merge of 'bab0b0bcb66485f4114afcd894f2f45d4b4ef15e'
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18105 18104
diff changeset
1828 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
1829 else
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1830 pt->ignore = TRUE;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1831 g_string_free(style, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1832 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1833 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1834 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
1835 const char *p = c + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1836 gboolean did_something = FALSE;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1837 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1838 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
1839 const char *q = p + 8;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1840 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
1841 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
1842 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1843 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1844 color = g_string_append_c(color, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1845 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1846 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1847 if (xhtml)
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1848 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
1849 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
1850 if ((c = strchr(p, '>')) != NULL)
10623
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1851 c++;
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1852 else
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1853 c = p;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1854 pt->src_tag = "body";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1855 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1856 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1857 did_something = TRUE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1858 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1859 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1860 p++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1861 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1862 if (did_something) continue;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1863 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1864 /* this has to come after the special case for bgcolor */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1865 ALLOW_TAG("body");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1866 if(!g_ascii_strncasecmp(c, "<!--", strlen("<!--"))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1867 char *p = strstr(c + strlen("<!--"), "-->");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1868 if(p) {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1869 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1870 xhtml = g_string_append(xhtml, "<!--");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1871 c += strlen("<!--");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1872 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1873 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1874 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1875
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1876 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1877 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1878 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1879 plain = g_string_append_c(plain, '<');
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1880 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1881 }
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1882 } else if(*c == '&') {
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1883 char buf[7];
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1884 const char *pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1885 int len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1886
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1887 if ((pln = purple_markup_unescape_entity(c, &len)) == NULL) {
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1888 len = 1;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1889 g_snprintf(buf, sizeof(buf), "%c", *c);
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1890 pln = buf;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1891 }
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1892 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1893 xhtml = g_string_append_len(xhtml, c, len);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1894 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1895 plain = g_string_append(plain, pln);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1896 if(cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1897 cdata = g_string_append_len(cdata, c, len);
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1898 c += len;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1899 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1900 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1901 xhtml = g_string_append_c(xhtml, *c);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1902 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1903 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
1904 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
1905 cdata = g_string_append_c(cdata, *c);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1906 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1907 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1908 }
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1909 if(xhtml) {
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1910 for (tag = tags; tag ; tag = tag->next) {
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1911 struct purple_parse_tag *pt = tag->data;
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1912 if(!pt->ignore)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1913 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
1914 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1915 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1916 g_list_free(tags);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1917 if(xhtml_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1918 *xhtml_out = g_string_free(xhtml, FALSE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1919 if(plain_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1920 *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
1921 if(url)
5be99af1b48b This was crashing for me when writing a system message when logging
Mark Doliner <markdoliner@pidgin.im>
parents: 18741
diff changeset
1922 g_string_free(url, TRUE);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1923 if (cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1924 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
1925 #undef CHECK_QUOTE
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1926 #undef VALID_CHAR
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1927 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1928
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1929 /* The following are probably reasonable changes:
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1930 * - \n should be converted to a normal space
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1931 * - 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
1932 * - We want to turn </td>#whitespace<td> sequences into a single tab
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1933 * - We want to turn <td> into a single tab (for msn profile "parsing")
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1934 * - 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
1935 * - <script>...</script> and <style>...</style> should be completely removed
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1936 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1937
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1938 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1939 purple_markup_strip_html(const char *str)
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1940 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1941 int i, j, k, entlen;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1942 gboolean visible = TRUE;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1943 gboolean closing_td_p = FALSE;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1944 gchar *str2;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1945 const gchar *cdata_close_tag = NULL, *ent;
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1946 gchar *href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1947 int href_st = 0;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1948
7110
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1949 if(!str)
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1950 return NULL;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1951
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1952 str2 = g_strdup(str);
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1953
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1954 for (i = 0, j = 0; str2[i]; i++)
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1955 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1956 if (str2[i] == '<')
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1957 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1958 if (cdata_close_tag)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1959 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1960 /* 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
1961 if (g_ascii_strncasecmp(str2 + i, cdata_close_tag,
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1962 strlen(cdata_close_tag)) == 0)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1963 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1964 i += strlen(cdata_close_tag) - 1;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1965 cdata_close_tag = NULL;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1966 }
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1967 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1968 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1969 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
1970 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1971 str2[j++] = '\t';
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1972 visible = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1973 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1974 else if (g_ascii_strncasecmp(str2 + i, "</td>", 5) == 0)
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1975 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1976 closing_td_p = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1977 visible = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1978 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1979 else
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1980 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1981 closing_td_p = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1982 visible = TRUE;
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1983 }
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1984
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1985 k = i + 1;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1986
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1987 if(g_ascii_isspace(str2[k]))
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1988 visible = TRUE;
9170
18732ae70740 [gaim-migrate @ 9955]
Tim Ringenbach <marv@pidgin.im>
parents: 9161
diff changeset
1989 else if (str2[k])
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1990 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1991 /* Scan until we end the tag either implicitly (closed start
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1992 * tag) or explicitly, using a sloppy method (i.e., < or >
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1993 * inside quoted attributes will screw us up)
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1994 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1995 while (str2[k] && str2[k] != '<' && str2[k] != '>')
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1996 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1997 k++;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1998 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1999
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2000 /* 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
2001 * 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
2002 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
2003 g_ascii_isspace(str2[i+2]))
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2004 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2005 int st; /* start of href, inclusive [ */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2006 int end; /* end of href, exclusive ) */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2007 char delim = ' ';
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2008 /* Find start of href */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2009 for (st = i + 3; st < k; st++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2010 {
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2011 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
2012 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2013 st += 5;
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
2014 if (str2[st] == '"' || str2[st] == '\'')
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2015 {
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
2016 delim = str2[st];
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2017 st++;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2018 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2019 break;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2020 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2021 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2022 /* find end of address */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2023 for (end = st; end < k && str2[end] != delim; end++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2024 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2025 /* 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
2026 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2027
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2028 /* 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
2029 * already one saved, kill it. */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2030 if (st < k)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2031 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2032 char *tmp;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2033 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2034 tmp = g_strndup(str2 + st, end - st);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2035 href = purple_unescape_html(tmp);
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2036 g_free(tmp);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2037 href_st = j;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2038 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2039 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2040
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2041 /* Replace </a> with an ascii representation of the
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2042 * 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
2043 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
2044 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2045
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2046 size_t hrlen = strlen(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2047
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2048 /* Only insert the href if it's different from the CDATA. */
12640
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2049 if ((hrlen != j - href_st ||
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2050 strncmp(str2 + href_st, href, hrlen)) &&
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2051 (hrlen != j - href_st + 7 || /* 7 == strlen("http://") */
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2052 strncmp(str2 + href_st, href + 7, hrlen - 7)))
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2053 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2054 str2[j++] = ' ';
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
2055 str2[j++] = '(';
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2056 g_memmove(str2 + j, href, hrlen);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2057 j += hrlen;
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
2058 str2[j++] = ')';
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2059 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2060 href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2061 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2062 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2063
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2064 /* Check for tags which should be mapped to newline */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2065 else if (g_ascii_strncasecmp(str2 + i, "<p>", 3) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2066 || g_ascii_strncasecmp(str2 + i, "<tr", 3) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2067 || 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
2068 || g_ascii_strncasecmp(str2 + i, "<hr", 3) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2069 || g_ascii_strncasecmp(str2 + i, "<li", 3) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2070 || g_ascii_strncasecmp(str2 + i, "<div", 4) == 0
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2071 || g_ascii_strncasecmp(str2 + i, "</table>", 8) == 0)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2072 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2073 str2[j++] = '\n';
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2074 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2075 /* Check for tags which begin CDATA and need to be closed */
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2076 #if 0 /* FIXME.. option is end tag optional, we can't handle this right now */
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2077 else if (g_ascii_strncasecmp(str2 + i, "<option", 7) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2078 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2079 /* FIXME: We should not do this if the OPTION is SELECT'd */
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2080 cdata_close_tag = "</option>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2081 }
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2082 #endif
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2083 else if (g_ascii_strncasecmp(str2 + i, "<script", 7) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2084 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2085 cdata_close_tag = "</script>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2086 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2087 else if (g_ascii_strncasecmp(str2 + i, "<style", 6) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2088 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2089 cdata_close_tag = "</style>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2090 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2091 /* Update the index and continue checking after the tag */
10731
8d817cb4268b [gaim-migrate @ 12333]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10700
diff changeset
2092 i = (str2[k] == '<' || str2[k] == '\0')? k - 1: k;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2093 continue;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2094 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2095 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2096 else if (cdata_close_tag)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2097 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2098 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2099 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2100 else if (!g_ascii_isspace(str2[i]))
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2101 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2102 visible = TRUE;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2103 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2104
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
2105 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
2106 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2107 while (*ent)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2108 str2[j++] = *ent++;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2109 i += entlen - 1;
9273
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2110 continue;
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2111 }
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2112
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2113 if (visible)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2114 str2[j++] = g_ascii_isspace(str2[i])? ' ': str2[i];
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2115 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2116
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2117 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2118
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2119 str2[j] = '\0';
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2120
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2121 return str2;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
2122 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
2123
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2124 static gboolean
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2125 badchar(char c)
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 switch (c) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2128 case ' ':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2129 case ',':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2130 case '\0':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2131 case '\n':
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2132 case '\r':
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2133 case '<':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2134 case '>':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2135 case '"':
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2136 return TRUE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2137 default:
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2138 return FALSE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2139 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2140 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2141
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2142 static gboolean
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2143 badentity(const char *c)
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2144 {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2145 if (!g_ascii_strncasecmp(c, "&lt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2146 !g_ascii_strncasecmp(c, "&gt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2147 !g_ascii_strncasecmp(c, "&quot;", 6)) {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2148 return TRUE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2149 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2150 return FALSE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2151 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2152
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2153 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2154 purple_markup_linkify(const char *text)
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2155 {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2156 const char *c, *t, *q = NULL;
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2157 char *tmpurlbuf, *url_buf;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2158 gunichar g;
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2159 gboolean inside_html = FALSE;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2160 int inside_paren = 0;
23979
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2161 GString *ret;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2162
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2163 if (text == NULL)
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2164 return NULL;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2165
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2166 ret = g_string_new("");
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2167
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2168 c = text;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2169 while (*c) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2170
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2171 if(*c == '(' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2172 inside_paren++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2173 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2174 c++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2175 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2176
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2177 if(inside_html) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2178 if(*c == '>') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2179 inside_html = FALSE;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2180 } else if(!q && (*c == '\"' || *c == '\'')) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2181 q = c;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2182 } else if(q) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2183 if(*c == *q)
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2184 q = NULL;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2185 }
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2186 } else if(*c == '<') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2187 inside_html = TRUE;
9077
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2188 if (!g_ascii_strncasecmp(c, "<A", 2)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2189 while (1) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2190 if (!g_ascii_strncasecmp(c, "/A>", 3)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2191 inside_html = FALSE;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2192 break;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2193 }
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2194 ret = g_string_append_c(ret, *c);
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2195 c++;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2196 if (!(*c))
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2197 break;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2198 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2199 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2200 } else if ((*c=='h') && (!g_ascii_strncasecmp(c, "http://", 7) ||
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2201 (!g_ascii_strncasecmp(c, "https://", 8)))) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2202 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2203 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2204 if (badchar(*t) || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2205
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2206 if ((!g_ascii_strncasecmp(c, "http://", 7) && (t - c == 7)) ||
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2207 (!g_ascii_strncasecmp(c, "https://", 8) && (t - c == 8))) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2208 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2209 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2210
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2211 if (*(t) == ',' && (*(t + 1) != ' ')) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2212 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2213 continue;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2214 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2215
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2216 if (*(t - 1) == '.')
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2217 t--;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2218 if ((*(t - 1) == ')' && (inside_paren > 0))) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2219 t--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2220 }
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2221
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2222 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2223 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2224 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2225 tmpurlbuf, url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2226 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2227 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2228 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2229 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2230 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2231 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2232
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2233 }
13772
f4c5bc2d6b71 [gaim-migrate @ 16182]
Jérôme Poulin <ticpu@users.sourceforge.net>
parents: 13646
diff changeset
2234 } else if (!g_ascii_strncasecmp(c, "www.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2235 if (c[4] != '.') {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2236 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2237 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2238 if (badchar(*t) || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2239 if (t - c == 4) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2240 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2241 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2242
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2243 if (*(t) == ',' && (*(t + 1) != ' ')) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2244 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2245 continue;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2246 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2247
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2248 if (*(t - 1) == '.')
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2249 t--;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2250 if ((*(t - 1) == ')' && (inside_paren > 0))) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2251 t--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2252 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2253 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2254 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2255 g_string_append_printf(ret,
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2256 "<A HREF=\"http://%s\">%s</A>", tmpurlbuf,
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2257 url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2258 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2259 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2260 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2261 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2262 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2263 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2264 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2265 }
14383
f04770316818 [gaim-migrate @ 17016]
Nathan Walp <nwalp@pidgin.im>
parents: 14254
diff changeset
2266 } else if (!g_ascii_strncasecmp(c, "ftp://", 6) || !g_ascii_strncasecmp(c, "sftp://", 7)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2267 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2268 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2269 if (badchar(*t) || badentity(t)) {
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2270
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2271 if ((!g_ascii_strncasecmp(c, "ftp://", 6) && (t - c == 6)) ||
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2272 (!g_ascii_strncasecmp(c, "sftp://", 7) && (t - c == 7))) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2273 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2274 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2275
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2276 if (*(t - 1) == '.')
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2277 t--;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2278 if ((*(t - 1) == ')' && (inside_paren > 0))) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2279 t--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2280 }
10905
56943fe311c2 [gaim-migrate @ 12634]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10902
diff changeset
2281 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2282 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2283 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2284 tmpurlbuf, url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2285 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2286 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2287 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2288 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2289 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2290 if (!t)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2291 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2292 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2293
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2294 }
13772
f4c5bc2d6b71 [gaim-migrate @ 16182]
Jérôme Poulin <ticpu@users.sourceforge.net>
parents: 13646
diff changeset
2295 } else if (!g_ascii_strncasecmp(c, "ftp.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2296 if (c[4] != '.') {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2297 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2298 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2299 if (badchar(*t) || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2300 if (t - c == 4) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2301 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2302 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2303 if (*(t - 1) == '.')
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2304 t--;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2305 if ((*(t - 1) == ')' && (inside_paren > 0))) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2306 t--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2307 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2308 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2309 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2310 g_string_append_printf(ret,
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2311 "<A HREF=\"ftp://%s\">%s</A>", tmpurlbuf,
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2312 url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2313 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2314 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2315 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2316 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2317 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2318 if (!t)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2319 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2320 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2321 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2322 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2323 } else if (!g_ascii_strncasecmp(c, "mailto:", 7)) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2324 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2325 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2326 if (badchar(*t) || badentity(t)) {
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2327 char *d;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2328 if (t - c == 7) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2329 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2330 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2331 if (*(t - 1) == '.')
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2332 t--;
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2333 if ((d = strstr(c + 7, "?")) != NULL && d < t)
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2334 url_buf = g_strndup(c + 7, d - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2335 else
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2336 url_buf = g_strndup(c + 7, t - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2337 if (!purple_email_is_valid(url_buf)) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2338 g_free(url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2339 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2340 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2341 g_free(url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2342 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2343 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2344 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2345 tmpurlbuf, url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2346 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2347 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2348 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2349 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2350 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2351 if (!t)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2352 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2353 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2354
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2355 }
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2356 } else if ((*c=='x') && (!g_ascii_strncasecmp(c, "xmpp:", 5)) &&
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2357 (c == text || badchar(c[-1]) || badentity(c-1))) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2358 t = c;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2359 while (1) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2360 if (badchar(*t) || badentity(t)) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2361
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2362 if (t - c == 5) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2363 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2364 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2365
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2366 if (*(t) == ',' && (*(t + 1) != ' ')) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2367 t++;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2368 continue;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2369 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2370
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2371 if (*(t - 1) == '.')
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2372 t--;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2373 if ((*(t - 1) == ')' && (inside_paren > 0))) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2374 t--;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2375 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2376
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2377 url_buf = g_strndup(c, t - c);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2378 tmpurlbuf = purple_unescape_html(url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2379 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2380 tmpurlbuf, url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2381 g_free(url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2382 g_free(tmpurlbuf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2383 c = t;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2384 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2385 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2386 t++;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2387
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2388 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2389 } else if (c != text && (*c == '@')) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2390 int flag;
10905
56943fe311c2 [gaim-migrate @ 12634]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10902
diff changeset
2391 GString *gurl_buf = NULL;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2392 const char illegal_chars[] = "!@#$%^&*()[]{}/|\\<>\":;\r\n \0";
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2393
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2394 if (strchr(illegal_chars,*(c - 1)) || strchr(illegal_chars, *(c + 1)))
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2395 flag = 0;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2396 else {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2397 flag = 1;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2398 gurl_buf = g_string_new("");
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2399 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2400
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2401 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2402 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2403 /* iterate backwards grabbing the local part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2404 g = g_utf8_get_char(t);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2405 if (badchar(*t) || (g >= 127) || (*t == '(') ||
11176
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2406 ((*t == ';') && ((t > (text+2) && (!g_ascii_strncasecmp(t - 3, "&lt;", 4) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2407 !g_ascii_strncasecmp(t - 3, "&gt;", 4))) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2408 (t > (text+4) && (!g_ascii_strncasecmp(t - 5, "&quot;", 6)))))) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2409 /* local part will already be part of ret, strip it out */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2410 ret = g_string_truncate(ret, ret->len - (c - t));
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2411 ret = g_string_append_unichar(ret, g);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2412 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2413 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2414 g_string_prepend_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2415 t = g_utf8_find_prev_char(text, t);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2416 if (t < text) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2417 ret = g_string_assign(ret, "");
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2418 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2419 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2420 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2421 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2422
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2423 t = g_utf8_find_next_char(c, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2424
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2425 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2426 /* iterate forwards grabbing the domain part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2427 g = g_utf8_get_char(t);
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2428 if (badchar(*t) || (g >= 127) || (*t == ')') || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2429 char *d;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2430
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2431 url_buf = g_string_free(gurl_buf, FALSE);
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2432
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2433 /* strip off trailing periods */
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2434 if (strlen(url_buf) > 0) {
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2435 for (d = url_buf + strlen(url_buf) - 1; *d == '.'; d--, t--)
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2436 *d = '\0';
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2437 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2438
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2439 tmpurlbuf = purple_unescape_html(url_buf);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2440 if (purple_email_is_valid(tmpurlbuf)) {
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2441 g_string_append_printf(ret, "<A HREF=\"mailto:%s\">%s</A>",
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2442 tmpurlbuf, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2443 } else {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2444 g_string_append(ret, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2445 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2446 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2447 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2448 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2449
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2450 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2451 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2452 g_string_append_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2453 t = g_utf8_find_next_char(t, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2454 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2455 }
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2456 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2457
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2458 if(*c == ')' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2459 inside_paren--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2460 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2461 c++;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2462 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2463
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2464 if (*c == 0)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2465 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2466
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2467 ret = g_string_append_c(ret, *c);
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2468 c++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2469
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2470 }
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2471 return g_string_free(ret, FALSE);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2472 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2473
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2474 char *purple_unescape_html(const char *html)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2475 {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2476 GString *ret;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2477 const char *c = html;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2478
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2479 if (html == NULL)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2480 return NULL;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2481
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2482 ret = g_string_new("");
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2483 while (*c) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2484 int len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2485 const char *ent;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2486
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2487 if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2488 g_string_append(ret, ent);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2489 c += len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2490 } else if (!strncmp(c, "<br>", 4)) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2491 g_string_append_c(ret, '\n');
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2492 c += 4;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2493 } else {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2494 g_string_append_c(ret, *c);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2495 c++;
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2496 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2497 }
14101
89a79c2a971e [gaim-migrate @ 16643]
Mark Doliner <markdoliner@pidgin.im>
parents: 14097
diff changeset
2498
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2499 return g_string_free(ret, FALSE);
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2500 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2501
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2502 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2503 purple_markup_slice(const char *str, guint x, guint y)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2504 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2505 GString *ret;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2506 GQueue *q;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2507 guint z = 0;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2508 gboolean appended = FALSE;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2509 gunichar c;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2510 char *tag;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2511
24641
ad3f1852b35a Fix CID #389
Richard Laager <rlaager@pidgin.im>
parents: 24492
diff changeset
2512 g_return_val_if_fail(str != NULL, NULL);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2513 g_return_val_if_fail(x <= y, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2514
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2515 if (x == y)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2516 return g_strdup("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2517
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2518 ret = g_string_new("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2519 q = g_queue_new();
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2520
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2521 while (*str && (z < y)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2522 c = g_utf8_get_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2523
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2524 if (c == '<') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2525 char *end = strchr(str, '>');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2526
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2527 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2528 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2529 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2530 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2531 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2532 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2533 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2534
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2535 if (!g_ascii_strncasecmp(str, "<img ", 5)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2536 z += strlen("[Image]");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2537 } else if (!g_ascii_strncasecmp(str, "<br", 3)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2538 z += 1;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2539 } else if (!g_ascii_strncasecmp(str, "<hr>", 4)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2540 z += strlen("\n---\n");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2541 } else if (!g_ascii_strncasecmp(str, "</", 2)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2542 /* pop stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2543 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2544
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2545 tmp = g_queue_pop_head(q);
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2546 g_free(tmp);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2547 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2548 } else {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2549 /* push it unto the stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2550 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2551
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2552 tmp = g_strndup(str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2553 g_queue_push_head(q, tmp);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2554 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2555 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2556
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2557 if (z >= x) {
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2558 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2559 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2560
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2561 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2562 } else if (c == '&') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2563 char *end = strchr(str, ';');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2564 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2565 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2566 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2567 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2568 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2569
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2570 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2571 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2572
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2573 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2574 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2575
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2576 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2577 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2578 } else {
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2579 if (z == x && z > 0 && !appended) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2580 GList *l = q->tail;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2581
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2582 while (l) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2583 tag = l->data;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2584 g_string_append(ret, tag);
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2585 l = l->prev;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2586 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2587 appended = TRUE;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2588 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2589
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2590 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2591 g_string_append_unichar(ret, c);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2592 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2593 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2594
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2595 str = g_utf8_next_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2596 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2597
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2598 while ((tag = g_queue_pop_head(q))) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2599 char *name;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2600
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2601 name = purple_markup_get_tag_name(tag);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2602 g_string_append_printf(ret, "</%s>", name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2603 g_free(name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2604 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2605 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2606
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2607 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2608 return g_string_free(ret, FALSE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2609 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2610
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2611 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2612 purple_markup_get_tag_name(const char *tag)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2613 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2614 int i;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2615 g_return_val_if_fail(tag != NULL, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2616 g_return_val_if_fail(*tag == '<', NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2617
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2618 for (i = 1; tag[i]; i++)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2619 if (tag[i] == '>' || tag[i] == ' ' || tag[i] == '/')
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2620 break;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2621
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2622 return g_strndup(tag+1, i-1);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2623 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2624
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2625 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2626 * Path/Filename Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2627 **************************************************************************/
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2628 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2629 purple_home_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2630 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2631 #ifndef _WIN32
11665
6b80cef9b563 [gaim-migrate @ 13950]
Michael Carlson <corfe83@users.sourceforge.net>
parents: 11656
diff changeset
2632 return g_get_home_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2633 #else
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2634 return wpurple_data_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2635 #endif
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2636 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2637
16415
8cbcd9756090 Use ~/.purple only, never ~/.gaim. This is a revert of the functional
Richard Laager <rlaager@pidgin.im>
parents: 16230
diff changeset
2638 /* 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
2639 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2640 purple_user_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2641 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2642 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
2643 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
2644 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
2645 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
2646
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2647 return user_dir;
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2648 }
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2649
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2650 void purple_util_set_user_dir(const char *dir)
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2651 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2652 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
2653
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2654 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
2655 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
2656 else
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2657 custom_user_dir = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2658 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2659
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2660 int purple_build_dir (const char *path, int mode)
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2661 {
11361
b8c9532c9ffe [gaim-migrate @ 13585]
Nathan Walp <nwalp@pidgin.im>
parents: 11237
diff changeset
2662 #if GLIB_CHECK_VERSION(2,8,0)
b8c9532c9ffe [gaim-migrate @ 13585]
Nathan Walp <nwalp@pidgin.im>
parents: 11237
diff changeset
2663 return g_mkdir_with_parents(path, mode);
b8c9532c9ffe [gaim-migrate @ 13585]
Nathan Walp <nwalp@pidgin.im>
parents: 11237
diff changeset
2664 #else
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2665 char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' };
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2666 int cur, len;
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2667
7632
c81dccce23ed [gaim-migrate @ 8257]
Nathan Walp <nwalp@pidgin.im>
parents: 7631
diff changeset
2668 g_return_val_if_fail(path != NULL, -1);
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2669
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2670 dir = g_new0(char, strlen(path) + 1);
7622
8a983ae9204f [gaim-migrate @ 8246]
Nathan Walp <nwalp@pidgin.im>
parents: 7617
diff changeset
2671 components = g_strsplit(path, delim, -1);
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2672 len = 0;
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2673 for (cur = 0; components[cur] != NULL; cur++) {
7633
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2674 /* If you don't know what you're doing on both
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2675 * win32 and *NIX, stay the hell away from this code */
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2676 if(cur > 1)
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2677 dir[len++] = G_DIR_SEPARATOR;
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2678 strcpy(dir + len, components[cur]);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2679 len += strlen(components[cur]);
7633
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2680 if(cur == 0)
653fd7bd7e20 [gaim-migrate @ 8258]
Nathan Walp <nwalp@pidgin.im>
parents: 7632
diff changeset
2681 dir[len++] = G_DIR_SEPARATOR;
7632
c81dccce23ed [gaim-migrate @ 8257]
Nathan Walp <nwalp@pidgin.im>
parents: 7631
diff changeset
2682
c81dccce23ed [gaim-migrate @ 8257]
Nathan Walp <nwalp@pidgin.im>
parents: 7631
diff changeset
2683 if(g_file_test(dir, G_FILE_TEST_IS_DIR)) {
c81dccce23ed [gaim-migrate @ 8257]
Nathan Walp <nwalp@pidgin.im>
parents: 7631
diff changeset
2684 continue;
10948
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2685 #ifdef _WIN32
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2686 /* allow us to create subdirs on UNC paths
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2687 * (\\machinename\path\to\blah)
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2688 * g_file_test() doesn't work on "\\machinename" */
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2689 } else if (cur == 2 && dir[0] == '\\' && dir[1] == '\\'
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2690 && components[cur + 1] != NULL) {
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2691 continue;
3a55085a2f33 [gaim-migrate @ 12747]
Daniel Atallah <datallah@pidgin.im>
parents: 10905
diff changeset
2692 #endif
7632
c81dccce23ed [gaim-migrate @ 8257]
Nathan Walp <nwalp@pidgin.im>
parents: 7631
diff changeset
2693 } else if(g_file_test(dir, G_FILE_TEST_EXISTS)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2694 purple_debug_warning("build_dir", "bad path: %s\n", path);
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2695 g_strfreev(components);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2696 g_free(dir);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2697 return -1;
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2698 }
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2699
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2700 if (g_mkdir(dir, mode) < 0) {
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2701 purple_debug_warning("build_dir", "mkdir: %s\n", g_strerror(errno));
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2702 g_strfreev(components);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2703 g_free(dir);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2704 return -1;
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2705 }
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2706 }
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2707
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2708 g_strfreev(components);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2709 g_free(dir);
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2710 return 0;
11361
b8c9532c9ffe [gaim-migrate @ 13585]
Nathan Walp <nwalp@pidgin.im>
parents: 11237
diff changeset
2711 #endif
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2712 }
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2713
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2714 /*
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2715 * This function is long and beautiful, like my--um, yeah. Anyway,
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2716 * it includes lots of error checking so as we don't overwrite
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2717 * people's settings if there is a problem writing the new values.
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2718 */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2719 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
2720 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
2721 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2722 const char *user_dir = purple_user_dir();
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2723 gchar *filename_full;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2724 gboolean ret = FALSE;
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2725
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2726 g_return_val_if_fail(user_dir != NULL, FALSE);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2727
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2728 purple_debug_info("util", "Writing file %s to directory %s\n",
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2729 filename, user_dir);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2730
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2731 /* Ensure the user directory exists */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2732 if (!g_file_test(user_dir, G_FILE_TEST_IS_DIR))
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2733 {
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2734 if (g_mkdir(user_dir, S_IRUSR | S_IWUSR | S_IXUSR) == -1)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2735 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2736 purple_debug_error("util", "Error creating directory %s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2737 user_dir, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2738 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2739 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2740 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2741
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2742 filename_full = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", user_dir, filename);
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2743
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
2744 ret = purple_util_write_data_to_file_absolute(filename_full, data, size);
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2745
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2746 g_free(filename_full);
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2747 return ret;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2748 }
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2749
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2750 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
2751 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
2752 {
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2753 gchar *filename_temp;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2754 FILE *file;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2755 size_t real_size, byteswritten;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2756 struct stat st;
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2757 #ifndef HAVE_FILENO
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2758 int fd;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2759 #endif
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2760
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2761 purple_debug_info("util", "Writing file %s\n",
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2762 filename_full);
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2763
20992
cac93835d527 nosnilmot points out that this is a better way to ensure the size is valid.
Daniel Atallah <datallah@pidgin.im>
parents: 20991
diff changeset
2764 g_return_val_if_fail((size >= -1), FALSE);
cac93835d527 nosnilmot points out that this is a better way to ensure the size is valid.
Daniel Atallah <datallah@pidgin.im>
parents: 20991
diff changeset
2765
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2766 filename_temp = g_strdup_printf("%s.save", filename_full);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2767
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2768 /* Remove an old temporary file, if one exists */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2769 if (g_file_test(filename_temp, G_FILE_TEST_EXISTS))
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2770 {
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2771 if (g_unlink(filename_temp) == -1)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2772 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2773 purple_debug_error("util", "Error removing old file "
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2774 "%s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2775 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2776 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2777 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2778
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2779 /* Open file */
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2780 file = g_fopen(filename_temp, "wb");
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2781 if (file == NULL)
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2782 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2783 purple_debug_error("util", "Error opening file %s for "
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2784 "writing: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2785 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2786 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2787 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2788 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2789
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2790 /* Write to file */
20992
cac93835d527 nosnilmot points out that this is a better way to ensure the size is valid.
Daniel Atallah <datallah@pidgin.im>
parents: 20991
diff changeset
2791 real_size = (size == -1) ? strlen(data) : (size_t) size;
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2792 byteswritten = fwrite(data, 1, real_size, file);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2793
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2794 #ifdef HAVE_FILENO
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2795 /* Apparently XFS (and possibly other filesystems) do not
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2796 * guarantee that file data is flushed before file metadata,
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2797 * so this procedure is insufficient without some flushage. */
21441
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2798 if (fflush(file) < 0) {
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2799 purple_debug_error("util", "Error flushing %s: %s\n",
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2800 filename_temp, g_strerror(errno));
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2801 g_free(filename_temp);
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2802 fclose(file);
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2803 return FALSE;
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2804 }
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2805 if (fsync(fileno(file)) < 0) {
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2806 purple_debug_error("util", "Error syncing file contents for %s: %s\n",
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2807 filename_temp, g_strerror(errno));
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2808 g_free(filename_temp);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2809 fclose(file);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2810 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2811 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2812 #endif
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
2813
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2814 /* Close file */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2815 if (fclose(file) != 0)
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2816 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2817 purple_debug_error("util", "Error closing file %s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2818 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2819 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2820 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2821 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2822
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2823 #ifndef HAVE_FILENO
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2824 /* This is the same effect (we hope) as the HAVE_FILENO block
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2825 * above, but for systems without fileno(). */
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2826 if ((fd = open(filename_temp, O_RDWR)) < 0) {
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2827 purple_debug_error("util", "Error opening file %s for flush: %s\n",
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2828 filename_temp, g_strerror(errno));
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2829 g_free(filename_temp);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2830 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2831 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2832 if (fsync(fd) < 0) {
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2833 purple_debug_error("util", "Error syncing %s: %s\n",
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2834 filename_temp, g_strerror(errno));
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2835 g_free(filename_temp);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2836 close(fd);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2837 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2838 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2839 if (close(fd) < 0) {
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2840 purple_debug_error("util", "Error closing %s after sync: %s\n",
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2841 filename_temp, g_strerror(errno));
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2842 g_free(filename_temp);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2843 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2844 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2845 #endif
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2846
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2847 /* Ensure the file is the correct size */
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2848 if (byteswritten != real_size)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2849 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2850 purple_debug_error("util", "Error writing to file %s: Wrote %"
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2851 G_GSIZE_FORMAT " bytes "
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2852 "but should have written %" G_GSIZE_FORMAT
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2853 "; is your disk full?\n",
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2854 filename_temp, byteswritten, real_size);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2855 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2856 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2857 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2858 /* Use stat to be absolutely sure. */
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2859 if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size))
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2860 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2861 purple_debug_error("util", "Error writing data to file %s: "
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2862 "Incomplete file written; is your disk "
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2863 "full?\n",
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2864 filename_temp);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2865 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2866 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2867 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2868
12622
55c9c22a3885 [gaim-migrate @ 14958]
Daniel Atallah <datallah@pidgin.im>
parents: 12620
diff changeset
2869 #ifndef _WIN32
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2870 /* Set file permissions */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2871 if (chmod(filename_temp, S_IRUSR | S_IWUSR) == -1)
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2872 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2873 purple_debug_error("util", "Error setting permissions of file %s: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2874 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2875 }
12622
55c9c22a3885 [gaim-migrate @ 14958]
Daniel Atallah <datallah@pidgin.im>
parents: 12620
diff changeset
2876 #endif
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2877
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2878 /* Rename to the REAL name */
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2879 if (g_rename(filename_temp, filename_full) == -1)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2880 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2881 purple_debug_error("util", "Error renaming %s to %s: %s\n",
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2882 filename_temp, filename_full,
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
2883 g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2884 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2885
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2886 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2887
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2888 return TRUE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2889 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2890
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2891 xmlnode *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2892 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
2893 {
23643
4a68ddefa857 added a more generic function to read xml files (and made the util version into a wrapper) so it can be used by the
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents: 23289
diff changeset
2894 return xmlnode_from_file(purple_user_dir(), filename, description, "util");
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2895 }
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2896
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2897 /*
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2898 * 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
2899 * 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
2900 * the space for the filepath.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2901 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2902 * 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
2903 * 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
2904 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2905 * Returns NULL on failure and cleans up after itself if so.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2906 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2907 static const char *purple_mkstemp_templ = {"purpleXXXXXX"};
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2908
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2909 FILE *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2910 purple_mkstemp(char **fpath, gboolean binary)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2911 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2912 const gchar *tmpdir;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2913 int fd;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2914 FILE *fp = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2915
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2916 g_return_val_if_fail(fpath != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2917
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2918 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
2919 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
2920 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
2921 if(fd == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2922 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2923 "Couldn't make \"%s\", error: %d\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2924 *fpath, errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2925 } else {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2926 if((fp = fdopen(fd, "r+")) == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2927 close(fd);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2928 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2929 "Couldn't fdopen(), error: %d\n", errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2930 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2931 }
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
2932
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2933 if(!fp) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2934 g_free(*fpath);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2935 *fpath = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2936 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2937 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2938 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2939 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
13985
9d115b698045 [gaim-migrate @ 16439]
Mark Doliner <markdoliner@pidgin.im>
parents: 13836
diff changeset
2940 "g_get_tmp_dir() failed!\n");
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2941 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2942
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2943 return fp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2944 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2945
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2946 const char *
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
2947 purple_util_get_image_extension(gconstpointer data, size_t len)
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2948 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2949 g_return_val_if_fail(data != NULL, NULL);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2950 g_return_val_if_fail(len > 0, NULL);
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2951
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2952 if (len >= 4)
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2953 {
17602
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2954 if (!strncmp((char *)data, "GIF8", 4))
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2955 return "gif";
17602
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2956 else if (!strncmp((char *)data, "\xff\xd8\xff", 3)) /* 4th may be e0 through ef */
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2957 return "jpg";
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2958 else if (!strncmp((char *)data, "\x89PNG", 4))
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2959 return "png";
17602
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2960 else if (!strncmp((char *)data, "MM", 2) ||
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2961 !strncmp((char *)data, "II", 2))
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2962 return "tif";
17603
22bb998de435 Where did ekse come from?
Richard Laager <rlaager@pidgin.im>
parents: 17602
diff changeset
2963 else if (!strncmp((char *)data, "BM", 2))
17602
b35a8de31e81 Fixed recognition of the extension of certain JPG files. The 4th character may be anything between e0 and ef; the first 3 should be sufficient for a magic number, though a more 'complete' solution would verify that (e0 <= data[3] <= ef). Also, added recognition of TIF files (magic number: MM or II). Refs #725, which gave examples of several JPGs with (data[3] == e1).
Evan Schoenberg <evands@pidgin.im>
parents: 17572
diff changeset
2964 return "bmp";
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2965 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2966
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2967 return "icon";
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2968 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2969
26394
e97f7512b037 Add a note that this function could potentially be faster.
Mark Doliner <markdoliner@pidgin.im>
parents: 25888
diff changeset
2970 /*
27662
afdc8aac00d9 Update this comment. We talked about using CRC32 on the devel list
Mark Doliner <markdoliner@pidgin.im>
parents: 27652
diff changeset
2971 * We thought about using non-cryptographic hashes like CRC32 here.
afdc8aac00d9 Update this comment. We talked about using CRC32 on the devel list
Mark Doliner <markdoliner@pidgin.im>
parents: 27652
diff changeset
2972 * They would be faster, but we think using something more secure is
afdc8aac00d9 Update this comment. We talked about using CRC32 on the devel list
Mark Doliner <markdoliner@pidgin.im>
parents: 27652
diff changeset
2973 * important, so that it is more difficult for someone to maliciously
afdc8aac00d9 Update this comment. We talked about using CRC32 on the devel list
Mark Doliner <markdoliner@pidgin.im>
parents: 27652
diff changeset
2974 * replace one buddy's icon with something else.
26394
e97f7512b037 Add a note that this function could potentially be faster.
Mark Doliner <markdoliner@pidgin.im>
parents: 25888
diff changeset
2975 */
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2976 char *
22443
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
2977 purple_util_get_image_checksum(gconstpointer image_data, size_t image_len)
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2978 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2979 PurpleCipherContext *context;
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2980 gchar digest[41];
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2981
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2982 context = purple_cipher_context_new_by_name("sha1", NULL);
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2983 if (context == NULL)
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2984 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2985 purple_debug_error("util", "Could not find sha1 cipher\n");
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2986 g_return_val_if_reached(NULL);
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2987 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2988
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2989 /* Hash the image data */
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2990 purple_cipher_context_append(context, image_data, image_len);
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2991 if (!purple_cipher_context_digest_to_str(context, sizeof(digest), digest, NULL))
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2992 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2993 purple_debug_error("util", "Failed to get SHA-1 digest.\n");
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2994 g_return_val_if_reached(NULL);
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2995 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2996 purple_cipher_context_destroy(context);
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2997
22443
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
2998 return g_strdup(digest);
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
2999 }
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
3000
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
3001 char *
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
3002 purple_util_get_image_filename(gconstpointer image_data, size_t image_len)
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
3003 {
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
3004 /* Return the filename */
22444
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
3005 char *checksum = purple_util_get_image_checksum(image_data, image_len);
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
3006 char *filename = g_strdup_printf("%s.%s", checksum,
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
3007 purple_util_get_image_extension(image_data, image_len));
22444
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
3008 g_free(checksum);
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
3009 return filename;
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
3010 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
3011
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3012 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3013 purple_program_is_valid(const char *program)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3014 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3015 GError *error = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3016 char **argv;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3017 gchar *progname;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3018 gboolean is_valid = FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3019
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3020 g_return_val_if_fail(program != NULL, FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3021 g_return_val_if_fail(*program != '\0', FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3022
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3023 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
3024 purple_debug(PURPLE_DEBUG_ERROR, "program_is_valid",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3025 "Could not parse program '%s': %s\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3026 program, error->message);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3027 g_error_free(error);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3028 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3029 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3030
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3031 if (argv == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3032 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3033 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3034
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3035 progname = g_find_program_in_path(argv[0]);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3036 is_valid = (progname != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3037
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3038 g_strfreev(argv);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3039 g_free(progname);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3040
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3041 return is_valid;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3042 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3043
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3044
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3045 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3046 purple_running_gnome(void)
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3047 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3048 #ifndef _WIN32
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3049 gchar *tmp = g_find_program_in_path("gnome-open");
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3050
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3051 if (tmp == NULL)
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3052 return FALSE;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3053 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3054
21665
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
3055 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
3056
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
3057 return ((tmp != NULL) && (*tmp != '\0'));
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3058 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3059 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3060 #endif
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3061 }
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3062
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3063 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3064 purple_running_kde(void)
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3065 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3066 #ifndef _WIN32
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3067 gchar *tmp = g_find_program_in_path("kfmclient");
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3068 const char *session;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3069
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3070 if (tmp == NULL)
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3071 return FALSE;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3072 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3073
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3074 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
3075 if (purple_strequal(session, "true"))
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3076 return TRUE;
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
3077
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3078 /* 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
3079 * 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
3080 * 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
3081 * 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
3082 return ((g_getenv("KDEDIR") != NULL) || g_getenv("KDEDIRS") != NULL);
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3083 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3084 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
3085 #endif
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3086 }
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
3087
15016
bdc3f402b3a0 [gaim-migrate @ 17733]
Luke Schierer <lschiere@pidgin.im>
parents: 14940
diff changeset
3088 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3089 purple_running_osx(void)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3090 {
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
3091 #if defined(__APPLE__)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3092 return TRUE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3093 #else
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3094 return FALSE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3095 #endif
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3096 }
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
3097
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3098 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3099 purple_fd_get_ip(int fd)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3100 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3101 struct sockaddr addr;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3102 socklen_t namelen = sizeof(addr);
27707
765b497cfa99 No functional change, but my gcc is bitching at me. Fixes this warning,
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27704
diff changeset
3103 struct in_addr in;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3104
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3105 g_return_val_if_fail(fd != 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3106
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3107 if (getsockname(fd, &addr, &namelen))
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3108 return NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3109
27707
765b497cfa99 No functional change, but my gcc is bitching at me. Fixes this warning,
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27704
diff changeset
3110 in = ((struct sockaddr_in *)&addr)->sin_addr;
765b497cfa99 No functional change, but my gcc is bitching at me. Fixes this warning,
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27704
diff changeset
3111 return g_strdup(inet_ntoa(in));
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3112 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3113
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3114
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3115 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3116 * String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3117 **************************************************************************/
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
3118 gboolean
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
3119 purple_strequal(const gchar *left, const gchar *right)
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
3120 {
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
3121 #if GLIB_CHECK_VERSION(2,16,0)
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
3122 return (g_strcmp0(left, right) == 0);
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
3123 #else
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
3124 return ((left == NULL && right == NULL) ||
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
3125 (left != NULL && right != NULL && strcmp(left, right) == 0));
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
3126 #endif
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
3127 }
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
3128
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
3129 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3130 purple_normalize(const PurpleAccount *account, const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3131 {
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3132 const char *ret = NULL;
16610
815ce4002357 sadrul fixed the next but not last crash
Luke Schierer <lschiere@pidgin.im>
parents: 16557
diff changeset
3133 static char buf[BUF_LEN];
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3134
13620
1374da61a5e2 [gaim-migrate @ 16005]
Richard Laager <rlaager@pidgin.im>
parents: 13616
diff changeset
3135 if (account != NULL)
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3136 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3137 PurplePlugin *prpl = purple_find_prpl(purple_account_get_protocol_id(account));
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3138
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3139 if (prpl != NULL)
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3140 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3141 PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3142
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3143 if(prpl_info && prpl_info->normalize)
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3144 ret = prpl_info->normalize(account, str);
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3145 }
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3146 }
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3147
13621
788d329bdfa0 [gaim-migrate @ 16006]
Richard Laager <rlaager@pidgin.im>
parents: 13620
diff changeset
3148 if (ret == NULL)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3149 {
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3150 char *tmp;
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3151
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3152 tmp = g_utf8_normalize(str, -1, G_NORMALIZE_DEFAULT);
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3153 g_snprintf(buf, sizeof(buf), "%s", tmp);
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3154 g_free(tmp);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3155
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3156 ret = buf;
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3157 }
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3158
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3159 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3160 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3161
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3162 /*
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3163 * You probably don't want to call this directly, it is
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3164 * mainly for use as a PRPL callback function. See the
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3165 * comments in util.h.
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3166 */
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3167 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3168 purple_normalize_nocase(const PurpleAccount *account, const char *str)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3169 {
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3170 static char buf[BUF_LEN];
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3171 char *tmp1, *tmp2;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3172
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3173 g_return_val_if_fail(str != NULL, NULL);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3174
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3175 tmp1 = g_utf8_strdown(str, -1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3176 tmp2 = g_utf8_normalize(tmp1, -1, G_NORMALIZE_DEFAULT);
13646
3bf958a5e352 [gaim-migrate @ 16043]
Daniel Atallah <datallah@pidgin.im>
parents: 13644
diff changeset
3177 g_snprintf(buf, sizeof(buf), "%s", tmp2 ? tmp2 : "");
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3178 g_free(tmp2);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3179 g_free(tmp1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3180
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3181 return buf;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3182 }
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3183
8700
0c9288c5e40e [gaim-migrate @ 9453]
Mark Doliner <markdoliner@pidgin.im>
parents: 8686
diff changeset
3184 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3185 purple_strdup_withhtml(const gchar *src)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3186 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3187 gulong destsize, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3188 gchar *dest;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3189
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3190 g_return_val_if_fail(src != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3191
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3192 /* 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
3193 destsize = 1;
fb323d3eefee [gaim-migrate @ 16475]
Mark Doliner <markdoliner@pidgin.im>
parents: 13994
diff changeset
3194 for (i = 0; src[i] != '\0'; i++)
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3195 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3196 if (src[i] == '\n')
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3197 destsize += 4;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3198 else if (src[i] != '\r')
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3199 destsize++;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3200 }
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3201
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3202 dest = g_malloc(destsize);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3203
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3204 /* Copy stuff, ignoring \r's, because they are dumb */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3205 for (i = 0, j = 0; src[i] != '\0'; i++) {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3206 if (src[i] == '\n') {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3207 strcpy(&dest[j], "<BR>");
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3208 j += 4;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3209 } else if (src[i] != '\r')
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3210 dest[j++] = src[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3211 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3212
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3213 dest[destsize-1] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3214
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3215 return dest;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3216 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3217
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3218 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3219 purple_str_has_prefix(const char *s, const char *p)
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3220 {
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3221 #if GLIB_CHECK_VERSION(2,2,0)
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3222 return g_str_has_prefix(s, p);
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3223 #else
13096
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3224 g_return_val_if_fail(s != NULL, FALSE);
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3225 g_return_val_if_fail(p != NULL, FALSE);
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3226
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3227 return (!strncmp(s, p, strlen(p)));
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3228 #endif
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3229 }
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3230
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3231 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3232 purple_str_has_suffix(const char *s, const char *x)
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3233 {
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3234 #if GLIB_CHECK_VERSION(2,2,0)
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3235 return g_str_has_suffix(s, x);
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3236 #else
13096
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3237 int off;
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3238
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3239 g_return_val_if_fail(s != NULL, FALSE);
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3240 g_return_val_if_fail(x != NULL, FALSE);
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3241
03d1402b31ea [gaim-migrate @ 15457]
Richard Laager <rlaager@pidgin.im>
parents: 13090
diff changeset
3242 off = strlen(s) - strlen(x);
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
3243 return (off >= 0 && purple_strequal(s + off, x));
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3244 #endif
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3245 }
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3246
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3247 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3248 purple_str_add_cr(const char *text)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3249 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3250 char *ret = NULL;
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3251 int count = 0, j;
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3252 guint i;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3253
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3254 g_return_val_if_fail(text != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3255
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3256 if (text[0] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3257 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3258 for (i = 1; i < strlen(text); i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3259 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3260 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3261
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3262 if (count == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3263 return g_strdup(text);
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 ret = g_malloc0(strlen(text) + count + 1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3266
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3267 i = 0; j = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3268 if (text[i] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3269 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3270 ret[j++] = text[i++];
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3271 for (; i < strlen(text); i++) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3272 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3273 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3274 ret[j++] = text[i];
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3275 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3276
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3277 return ret;
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
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3280 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3281 purple_str_strip_char(char *text, char thechar)
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 int i, j;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3284
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3285 g_return_if_fail(text != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3286
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3287 for (i = 0, j = 0; text[i]; i++)
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3288 if (text[i] != thechar)
11142
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
3289 text[j++] = text[i];
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
3290
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
3291 text[j++] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3292 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3293
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3294 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3295 purple_util_chrreplace(char *string, char delimiter,
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3296 char replacement)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3297 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3298 int i = 0;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3299
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3300 g_return_if_fail(string != NULL);
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3301
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3302 while (string[i] != '\0')
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3303 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3304 if (string[i] == delimiter)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3305 string[i] = replacement;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3306 i++;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3307 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3308 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3309
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3310 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3311 purple_strreplace(const char *string, const char *delimiter,
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3312 const char *replacement)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3313 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3314 gchar **split;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3315 gchar *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3316
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3317 g_return_val_if_fail(string != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3318 g_return_val_if_fail(delimiter != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3319 g_return_val_if_fail(replacement != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3320
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3321 split = g_strsplit(string, delimiter, 0);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3322 ret = g_strjoinv(replacement, split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3323 g_strfreev(split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3324
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3325 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3326 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3327
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3328 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3329 purple_strcasereplace(const char *string, const char *delimiter,
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3330 const char *replacement)
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3331 {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3332 gchar *ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3333 int length_del, length_rep, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3334
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3335 g_return_val_if_fail(string != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3336 g_return_val_if_fail(delimiter != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3337 g_return_val_if_fail(replacement != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3338
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3339 length_del = strlen(delimiter);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3340 length_rep = strlen(replacement);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3342 /* Count how many times the delimiter appears */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3343 i = 0; /* position in the source string */
8735
01248ea222d3 [gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents: 8700
diff changeset
3344 j = 0; /* number of occurrences of "delimiter" */
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3345 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
3346 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3347 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3348 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3349 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3350 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3351 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3352 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3353 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3354
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3355 ret = g_malloc(j+1);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3356
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3357 i = 0; /* position in the source string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3358 j = 0; /* position in the destination string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3359 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
3360 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3361 strncpy(&ret[j], replacement, length_rep);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3362 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3363 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3364 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3365 ret[j] = string[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3366 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3367 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3368 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3369 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3370
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3371 ret[j] = '\0';
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3372
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3373 return ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3374 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3375
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3376 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3377 purple_strcasestr(const char *haystack, const char *needle)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3378 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3379 size_t hlen, nlen;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3380 const char *tmp, *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3381
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3382 g_return_val_if_fail(haystack != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3383 g_return_val_if_fail(needle != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3384
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3385 hlen = strlen(haystack);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3386 nlen = strlen(needle);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3387 tmp = haystack,
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3388 ret = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3389
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3390 g_return_val_if_fail(hlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3391 g_return_val_if_fail(nlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3392
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3393 while (*tmp && !ret) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3394 if (!g_ascii_strncasecmp(needle, tmp, nlen))
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3395 ret = tmp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3396 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3397 tmp++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3398 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3399
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3400 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3401 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3402
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3403 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3404 purple_str_size_to_units(size_t size)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3405 {
21091
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3406 static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB" };
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3407 float size_mag;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3408 int size_index = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3409
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3410 if (size == -1) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3411 return g_strdup(_("Calculating..."));
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3412 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3413 else if (size == 0) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3414 return g_strdup(_("Unknown."));
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3415 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3416 else {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3417 size_mag = (float)size;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3418
10569
3324f62c07aa [gaim-migrate @ 11957]
Daniel Atallah <datallah@pidgin.im>
parents: 10506
diff changeset
3419 while ((size_index < 3) && (size_mag > 1024)) {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3420 size_mag /= 1024;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3421 size_index++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3422 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3423
10103
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3424 if (size_index == 0) {
11656
56f5e598dc6c [gaim-migrate @ 13940]
Richard Laager <rlaager@pidgin.im>
parents: 11552
diff changeset
3425 return g_strdup_printf("%" G_GSIZE_FORMAT " %s", size, size_str[size_index]);
10103
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3426 } else {
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3427 return g_strdup_printf("%.2f %s", size_mag, size_str[size_index]);
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3428 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3429 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3430 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3431
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3432 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3433 purple_str_seconds_to_string(guint secs)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3434 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3435 char *ret = NULL;
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3436 guint days, hrs, mins;
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3437
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3438 if (secs < 60)
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3439 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3440 return g_strdup_printf(dngettext(PACKAGE, "%d second", "%d seconds", secs), secs);
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3441 }
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3442
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3443 days = secs / (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3444 secs = secs % (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3445 hrs = secs / (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3446 secs = secs % (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3447 mins = secs / 60;
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3448 secs = secs % 60;
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3449
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3450 if (days > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3451 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3452 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
3453 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3454
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3455 if (hrs > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3456 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3457 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3458 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3459 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
3460 dngettext(PACKAGE, "%s, %d hour", "%s, %d hours", hrs),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3461 ret, hrs);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3462 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3463 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3464 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3465 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3466 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
3467 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3468
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3469 if (mins > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3470 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3471 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3472 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3473 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
3474 dngettext(PACKAGE, "%s, %d minute", "%s, %d minutes", mins),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3475 ret, mins);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3476 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3477 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3478 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3479 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3480 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
3481 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3482
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3483 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3484 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3485
9277
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3486
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3487 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3488 purple_str_binary_to_ascii(const unsigned char *binary, guint len)
9277
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3489 {
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3490 GString *ret;
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3491 guint i;
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3492
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3493 g_return_val_if_fail(len > 0, NULL);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3494
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3495 ret = g_string_sized_new(len);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3496
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3497 for (i = 0; i < len; i++)
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3498 if (binary[i] < 32 || binary[i] > 126)
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3499 g_string_append_printf(ret, "\\x%02hhx", binary[i]);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3500 else if (binary[i] == '\\')
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3501 g_string_append(ret, "\\\\");
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3502 else
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3503 g_string_append_c(ret, binary[i]);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3504
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3505 return g_string_free(ret, FALSE);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3506 }
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3507
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3508 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3509 * URI/URL Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3510 **************************************************************************/
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
3511
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3512 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
3513 {
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
3514 char proto[11];
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
3515 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
3516 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
3517 GHashTable *params = 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
3518 int 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
3519 if (!(tmp = strchr(uri, ':')) || tmp == uri) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3520 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
3521 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
3522 }
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
3523
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
3524 len = MIN(sizeof(proto) - 1, (tmp - uri));
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
3525
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
3526 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
3527 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
3528
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
3529 tmp++;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3530 purple_debug_info("util", "Processing message '%s' for protocol '%s'.\n", tmp, proto);
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
3531
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
3532 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
3533 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
3534 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
3535
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
3536 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
3537 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
3538
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
3539 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
3540 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
3541
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
3542 while (*tmp || *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
3543 if (*tmp == '&' || !(*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
3544 /* If there is no 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
3545 if (keyend == 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
3546 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
3547
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
3548 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
3549 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
3550 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
3551 /* 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
3552 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
3553 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
3554 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
3555 *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
3556 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
3557 }
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
3558 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
3559 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
3560 } 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
3561 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
3562
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
3563 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
3564 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
3565 }
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
3566 } 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
3567 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
3568
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3569 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
3570
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
3571 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
3572 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
3573 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
3574 }
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
3575
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3576 /*
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3577 * TODO: Should probably add a "gboolean *ret_ishttps" parameter that
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3578 * is set to TRUE if this URL is https, otherwise it is set to
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3579 * FALSE. But that change will break the API.
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3580 *
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3581 * This is important for Yahoo! web messenger login. They now
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3582 * force https login, and if you access the web messenger login
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3583 * page via http then it redirects you to the https version, but
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3584 * purple_util_fetch_url() ignores the "https" and attempts to
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3585 * fetch the URL via http again, which gets redirected again.
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3586 */
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
3587 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3588 purple_url_parse(const char *url, char **ret_host, int *ret_port,
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3589 char **ret_path, char **ret_user, char **ret_passwd)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3590 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3591 gboolean is_https = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3592 char scan_info[255];
8118
7f5315bb4506 [gaim-migrate @ 8822]
Douglas Thrift <douglas@douglasthrift.net>
parents: 8088
diff changeset
3593 char port_str[6];
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3594 int f;
9341
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3595 const char *at, *slash;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3596 const char *turl;
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3597 char host[256], path[256], user[256], passwd[256];
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3598 int port = 0;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3599 /* hyphen at end includes it in control set */
21091
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3600 static const char addr_ctrl[] = "A-Za-z0-9.-";
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3601 static const char port_ctrl[] = "0-9";
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3602 static const char page_ctrl[] = "A-Za-z0-9.~_/:*!@&%%?=+^-";
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3603 static const char user_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
07fe1a99c47b Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents: 21076
diff changeset
3604 static const char passwd_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3605
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3606 g_return_val_if_fail(url != NULL, FALSE);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3607
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3608 if ((turl = purple_strcasestr(url, "http://")) != NULL)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3609 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3610 turl += 7;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3611 url = turl;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3612 }
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3613 else if ((turl = purple_strcasestr(url, "https://")) != NULL)
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3614 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3615 is_https = TRUE;
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3616 turl += 8;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3617 url = turl;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3618 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3619
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3620 /* parse out authentication information if supplied */
9341
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3621 /* Only care about @ char BEFORE the first / */
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3622 at = strchr(url, '@');
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3623 slash = strchr(url, '/');
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3624 if ((at != NULL) &&
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3625 (((slash != NULL) && (strlen(at) > strlen(slash))) ||
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3626 (slash == NULL))) {
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3627 g_snprintf(scan_info, sizeof(scan_info),
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3628 "%%255[%s]:%%255[%s]^@", user_ctrl, passwd_ctrl);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3629 f = sscanf(url, scan_info, user, passwd);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3630
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3631 if (f ==1 ) {
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3632 /* No passwd, possibly just username supplied */
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3633 g_snprintf(scan_info, sizeof(scan_info),
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3634 "%%255[%s]^@", user_ctrl);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3635 f = sscanf(url, scan_info, user);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3636 *passwd = '\0';
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3637 }
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3638
9230
5f34aa66ce4c [gaim-migrate @ 10026]
Nathan Walp <nwalp@pidgin.im>
parents: 9227
diff changeset
3639 url = at+1; /* move pointer after the @ char */
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3640 } else {
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3641 *user = '\0';
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3642 *passwd = '\0';
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3643 }
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3644
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3645 g_snprintf(scan_info, sizeof(scan_info),
8118
7f5315bb4506 [gaim-migrate @ 8822]
Douglas Thrift <douglas@douglasthrift.net>
parents: 8088
diff changeset
3646 "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3647
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3648 f = sscanf(url, scan_info, host, port_str, path);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3649
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3650 if (f == 1)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3651 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3652 g_snprintf(scan_info, sizeof(scan_info),
8118
7f5315bb4506 [gaim-migrate @ 8822]
Douglas Thrift <douglas@douglasthrift.net>
parents: 8088
diff changeset
3653 "%%255[%s]/%%255[%s]",
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3654 addr_ctrl, page_ctrl);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3655 f = sscanf(url, scan_info, host, path);
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3656 /* Use the default port */
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3657 if (is_https)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3658 g_snprintf(port_str, sizeof(port_str), "443");
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3659 else
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3660 g_snprintf(port_str, sizeof(port_str), "80");
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3661 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3662
24185
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3663 if (f == 0)
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3664 *host = '\0';
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3665
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3666 if (f <= 1)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3667 *path = '\0';
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3668
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3669 sscanf(port_str, "%d", &port);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3670
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3671 if (ret_host != NULL) *ret_host = g_strdup(host);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3672 if (ret_port != NULL) *ret_port = port;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3673 if (ret_path != NULL) *ret_path = g_strdup(path);
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3674 if (ret_user != NULL) *ret_user = g_strdup(user);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3675 if (ret_passwd != NULL) *ret_passwd = g_strdup(passwd);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3676
24186
f5802c63a14e Return FALSE from purple_url_parse() if a host could not be determined
Evan Schoenberg <evands@pidgin.im>
parents: 24185
diff changeset
3677 return ((*host != '\0') ? TRUE : FALSE);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3678 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3679
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3680 /**
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3681 * The arguments to this function are similar to printf.
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3682 */
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3683 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3684 purple_util_fetch_url_error(PurpleUtilFetchUrlData *gfud, const char *format, ...)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3685 {
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3686 gchar *error_message;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3687 va_list args;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3688
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3689 va_start(args, format);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3690 error_message = g_strdup_vprintf(format, args);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3691 va_end(args);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3692
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3693 gfud->callback(gfud, gfud->user_data, NULL, 0, error_message);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3694 g_free(error_message);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3695 purple_util_fetch_url_cancel(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3696 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3697
14465
2dacb84b7cb2 [gaim-migrate @ 17111]
Mark Doliner <markdoliner@pidgin.im>
parents: 14416
diff changeset
3698 static void url_fetch_connect_cb(gpointer url_data, gint source, const gchar *error_message);
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3699 static void ssl_url_fetch_connect_cb(gpointer data, PurpleSslConnection *ssl_connection, PurpleInputCondition cond);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3700 static void ssl_url_fetch_error_cb(PurpleSslConnection *ssl_connection, PurpleSslErrorType error, gpointer data);
14465
2dacb84b7cb2 [gaim-migrate @ 17111]
Mark Doliner <markdoliner@pidgin.im>
parents: 14416
diff changeset
3701
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3702 static gboolean
23531
87a6c3eb9f47 Remove a unused variable
Mark Doliner <markdoliner@pidgin.im>
parents: 23507
diff changeset
3703 parse_redirect(const char *data, size_t data_len,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3704 PurpleUtilFetchUrlData *gfud)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3705 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3706 gchar *s;
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3707 gchar *new_url, *temp_url, *end;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3708 gboolean full;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3709 int len;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3710
21037
4861a7fc6708 When checking for redirects in purple_util_fetch_url(), look for
Mark Doliner <markdoliner@pidgin.im>
parents: 20992
diff changeset
3711 if ((s = g_strstr_len(data, data_len, "\nLocation: ")) == NULL)
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3712 /* We're not being redirected */
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3713 return FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3714
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3715 s += strlen("Location: ");
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3716 end = strchr(s, '\r');
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3717
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3718 /* Just in case :) */
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3719 if (end == NULL)
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3720 end = strchr(s, '\n');
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3721
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3722 if (end == NULL)
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3723 return FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3724
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3725 len = end - s;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3726
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3727 new_url = g_malloc(len + 1);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3728 strncpy(new_url, s, len);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3729 new_url[len] = '\0';
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3730
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3731 full = gfud->full;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3732
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3733 if (*new_url == '/' || g_strstr_len(new_url, len, "://") == NULL)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3734 {
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3735 temp_url = new_url;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3736
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3737 new_url = g_strdup_printf("%s:%d%s", gfud->website.address,
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3738 gfud->website.port, temp_url);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3739
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3740 g_free(temp_url);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3741
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3742 full = FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3743 }
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3744
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3745 purple_debug_info("util", "Redirecting to %s\n", new_url);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3746
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3747 gfud->num_times_redirected++;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3748 if (gfud->num_times_redirected >= 5)
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3749 {
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3750 purple_util_fetch_url_error(gfud,
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3751 _("Could not open %s: Redirected too many times"),
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3752 gfud->url);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3753 return TRUE;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3754 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3755
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3756 /*
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3757 * Try again, with this new location. This code is somewhat
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3758 * ugly, but we need to reuse the gfud because whoever called
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3759 * us is holding a reference to it.
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3760 */
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3761 g_free(gfud->url);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3762 gfud->url = new_url;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3763 gfud->full = full;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3764 g_free(gfud->request);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3765 gfud->request = NULL;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3766
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3767 if (gfud->is_ssl) {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3768 gfud->is_ssl = FALSE;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3769 purple_ssl_close(gfud->ssl_connection);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3770 gfud->ssl_connection = NULL;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3771 } else {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3772 purple_input_remove(gfud->inpa);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3773 gfud->inpa = 0;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3774 close(gfud->fd);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3775 gfud->fd = -1;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3776 }
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3777 gfud->request_written = 0;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3778 gfud->len = 0;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3779 gfud->data_len = 0;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3780
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3781 g_free(gfud->website.user);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3782 g_free(gfud->website.passwd);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3783 g_free(gfud->website.address);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3784 g_free(gfud->website.page);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3785 purple_url_parse(new_url, &gfud->website.address, &gfud->website.port,
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3786 &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3787
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3788 if (purple_strcasestr(new_url, "https://") != NULL) {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3789 gfud->is_ssl = TRUE;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3790 gfud->ssl_connection = purple_ssl_connect(NULL,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3791 gfud->website.address, gfud->website.port,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3792 ssl_url_fetch_connect_cb, ssl_url_fetch_error_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3793 } else {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3794 gfud->connect_data = purple_proxy_connect(NULL, NULL,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3795 gfud->website.address, gfud->website.port,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3796 url_fetch_connect_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3797 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3798
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3799 if (gfud->ssl_connection == NULL && gfud->connect_data == NULL)
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3800 {
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3801 purple_util_fetch_url_error(gfud, _("Unable to connect to %s"),
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3802 gfud->website.address);
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3803 }
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3804
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3805 return TRUE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3806 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3807
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3808 static const char *
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3809 find_header_content(const char *data, size_t data_len, const char *header, size_t header_len)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3810 {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3811 const char *p = NULL;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3812
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3813 if (header_len <= 0)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3814 header_len = strlen(header);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3815
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3816 /* Note: data is _not_ nul-terminated. */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3817 if (data_len > header_len) {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3818 if (header[0] == '\n')
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3819 p = (g_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3820 if (!p)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3821 p = purple_strcasestr(data, header);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3822 if (p)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3823 p += header_len;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3824 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3825
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3826 /* If we can find the header at all, try to sscanf it.
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3827 * Response headers should end with at least \r\n, so sscanf is safe,
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3828 * if we make sure that there is indeed a \n in our header.
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3829 */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3830 if (p && g_strstr_len(p, data_len - (p - data), "\n")) {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3831 return p;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3832 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3833
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3834 return NULL;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3835 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3836
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3837 static size_t
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3838 parse_content_len(const char *data, size_t data_len)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3839 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3840 size_t content_len = 0;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3841 const char *p = NULL;
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3842
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3843 p = find_header_content(data, data_len, "\nContent-Length: ", sizeof("\nContent-Length: ") - 1);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3844 if (p) {
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3845 sscanf(p, "%" G_GSIZE_FORMAT, &content_len);
22622
1ecb840b5101 Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <markdoliner@pidgin.im>
parents: 22488
diff changeset
3846 purple_debug_misc("util", "parsed %" G_GSIZE_FORMAT "\n", content_len);
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3847 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3848
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3849 return content_len;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3850 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3851
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3852 static gboolean
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3853 content_is_chunked(const char *data, size_t data_len)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3854 {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3855 const char *p = find_header_content(data, data_len, "\nTransfer-Encoding: ", sizeof("\nTransfer-Encoding: ") - 1);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3856 if (p && g_strncasecmp(p, "chunked", 7) == 0)
27478
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3857 return TRUE;
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3858
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3859 return FALSE;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3860 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3861
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3862 /* Process in-place */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3863 static void
27477
0eaf20efffa7 Use unsigned lengths here and use %zu when reading into the gsize var
Mark Doliner <markdoliner@pidgin.im>
parents: 27465
diff changeset
3864 process_chunked_data(char *data, gsize *len)
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3865 {
27477
0eaf20efffa7 Use unsigned lengths here and use %zu when reading into the gsize var
Mark Doliner <markdoliner@pidgin.im>
parents: 27465
diff changeset
3866 gsize sz;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3867 gsize newlen = 0;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3868 char *p = data;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3869 char *s = data;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3870
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3871 while (*s) {
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3872 /* Read the size of this chunk */
27630
c831a8c52f55 Hey Stu, it should be safe to combine this check, right? It'll make us
Mark Doliner <markdoliner@pidgin.im>
parents: 27543
diff changeset
3873 if (sscanf(s, "%" G_GSIZE_MODIFIER "x", &sz) != 1)
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3874 {
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3875 purple_debug_error("util", "Error processing chunked data: "
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3876 "Expected data length, found: %s\n", s);
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3877 break;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3878 }
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3879 if (sz == 0) {
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3880 /* We've reached the last chunk */
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3881 /*
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3882 * TODO: The spec allows "footers" to follow the last chunk.
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3883 * If there is more data after this line then we should
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3884 * treat it like a header.
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3885 */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3886 break;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3887 }
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3888
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3889 /* Advance to the start of the data */
27519
aba49eea4417 Apparently there might be stuff after the semicolon before the \r\n so just
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27516
diff changeset
3890 s = strstr(s, "\r\n");
aba49eea4417 Apparently there might be stuff after the semicolon before the \r\n so just
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27516
diff changeset
3891 if (s == NULL)
aba49eea4417 Apparently there might be stuff after the semicolon before the \r\n so just
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27516
diff changeset
3892 break;
aba49eea4417 Apparently there might be stuff after the semicolon before the \r\n so just
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27516
diff changeset
3893 s += 2;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3894
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3895 if (s + sz > data + *len) {
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3896 purple_debug_error("util", "Error processing chunked data: "
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3897 "Chunk size %" G_GSIZE_FORMAT " bytes was longer "
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3898 "than the data remaining in the buffer (%"
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3899 G_GSIZE_FORMAT " bytes)\n", sz, data + *len - s);
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3900 }
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3901
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3902 /* Move all data overtop of the chunk length that we read in earlier */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3903 g_memmove(p, s, sz);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3904 p += sz;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3905 s += sz;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3906 newlen += sz;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3907 if (*s != '\r' && *(s + 1) != '\n') {
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3908 purple_debug_error("util", "Error processing chunked data: "
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3909 "Expected \\r\\n, found: %s\n", s);
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3910 break;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3911 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3912 s += 2;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3913 }
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3914
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3915 /* NULL terminate the data */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3916 *p = 0;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3917
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3918 *len = newlen;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3919 }
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3920
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3921 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3922 url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3923 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3924 PurpleUtilFetchUrlData *gfud = url_data;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3925 int len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3926 char buf[4096];
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3927 char *data_cursor;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3928 gboolean got_eof = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3929
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3930 /*
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3931 * Read data in a loop until we can't read any more! This is a
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3932 * little confusing because we read using a different function
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3933 * depending on whether the socket is ssl or cleartext.
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3934 */
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3935 while ((gfud->is_ssl && ((len = purple_ssl_read(gfud->ssl_connection, buf, sizeof(buf))) > 0)) ||
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3936 (!gfud->is_ssl && (len = read(source, buf, sizeof(buf))) > 0))
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3937 {
24011
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3938 if(gfud->max_len != -1 && (gfud->len + len) > gfud->max_len) {
24274
8fb64dfd0464 Fix a TODO and mark a string translatable now that we're not string frozen.
Daniel Atallah <datallah@pidgin.im>
parents: 24186
diff changeset
3939 purple_util_fetch_url_error(gfud, _("Error reading from %s: response too long (%d bytes limit)"),
24011
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3940 gfud->website.address, gfud->max_len);
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3941 return;
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3942 }
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3943
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3944 /* If we've filled up our buffer, make it bigger */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3945 if((gfud->len + len) >= gfud->data_len) {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3946 while((gfud->len + len) >= gfud->data_len)
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3947 gfud->data_len += sizeof(buf);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3948
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3949 gfud->webdata = g_realloc(gfud->webdata, gfud->data_len);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3950 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3951
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3952 data_cursor = gfud->webdata + gfud->len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3953
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3954 gfud->len += len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3955
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3956 memcpy(data_cursor, buf, len);
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3957
11407
3f89b9b59ba9 [gaim-migrate @ 13642]
Federico G. Schwindt <fgsch@lodoss.net>
parents: 11361
diff changeset
3958 gfud->webdata[gfud->len] = '\0';
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3959
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3960 if(!gfud->got_headers) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3961 char *tmp;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3962
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3963 /* See if we've reached the end of the headers yet */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3964 if((tmp = strstr(gfud->webdata, "\r\n\r\n"))) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3965 char * new_data;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3966 guint header_len = (tmp + 4 - gfud->webdata);
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3967 size_t content_len;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3968
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3969 purple_debug_misc("util", "Response headers: '%.*s'\n",
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3970 header_len, gfud->webdata);
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3971
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3972 /* See if we can find a redirect. */
23531
87a6c3eb9f47 Remove a unused variable
Mark Doliner <markdoliner@pidgin.im>
parents: 23507
diff changeset
3973 if(parse_redirect(gfud->webdata, header_len, gfud))
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3974 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3975
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3976 gfud->got_headers = TRUE;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3977
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3978 /* No redirect. See if we can find a content length. */
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3979 content_len = parse_content_len(gfud->webdata, header_len);
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3980 gfud->chunked = content_is_chunked(gfud->webdata, header_len);
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3981
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3982 if(content_len == 0) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3983 /* We'll stick with an initial 8192 */
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3984 content_len = 8192;
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3985 } else {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3986 gfud->has_explicit_data_len = TRUE;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3987 }
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3988
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3989
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3990 /* If we're returning the headers too, we don't need to clean them out */
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3991 if(gfud->include_headers) {
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3992 gfud->data_len = content_len + header_len;
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3993 gfud->webdata = g_realloc(gfud->webdata, gfud->data_len);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3994 } else {
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3995 size_t body_len = 0;
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3996
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3997 if(gfud->len > (header_len + 1))
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3998 body_len = (gfud->len - header_len);
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3999
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
4000 content_len = MAX(content_len, body_len);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4001
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4002 new_data = g_try_malloc(content_len);
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
4003 if(new_data == NULL) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4004 purple_debug_error("util",
22622
1ecb840b5101 Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <markdoliner@pidgin.im>
parents: 22488
diff changeset
4005 "Failed to allocate %" G_GSIZE_FORMAT " bytes: %s\n",
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
4006 content_len, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4007 purple_util_fetch_url_error(gfud,
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4008 _("Unable to allocate enough memory to hold "
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4009 "the contents from %s. The web server may "
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4010 "be trying something malicious."),
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4011 gfud->website.address);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4012
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4013 return;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4014 }
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4015
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4016 /* We may have read part of the body when reading the headers, don't lose it */
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
4017 if(body_len > 0) {
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4018 tmp += 4;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4019 memcpy(new_data, tmp, body_len);
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4020 }
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4021
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4022 /* Out with the old... */
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4023 g_free(gfud->webdata);
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4024
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4025 /* In with the new. */
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4026 gfud->len = body_len;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4027 gfud->data_len = content_len;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4028 gfud->webdata = new_data;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4029 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4030 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4031 }
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4032
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
4033 if(gfud->has_explicit_data_len && gfud->len >= gfud->data_len) {
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4034 got_eof = TRUE;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4035 break;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4036 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4037 }
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4038
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4039 if(len < 0) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4040 if(errno == EAGAIN) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4041 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4042 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4043 purple_util_fetch_url_error(gfud, _("Error reading from %s: %s"),
21389
e1dd8142bb87 replace most calls to strerror with calls to g_strerror. strerror will return
Nathan Walp <nwalp@pidgin.im>
parents: 21104
diff changeset
4044 gfud->website.address, g_strerror(errno));
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4045 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4046 }
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4047 }
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4048
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4049 if((len == 0) || got_eof) {
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4050 gfud->webdata = g_realloc(gfud->webdata, gfud->len + 1);
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4051 gfud->webdata[gfud->len] = '\0';
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4052
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4053 if (!gfud->include_headers && gfud->chunked) {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4054 /* Process only if we don't want the headers. */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4055 process_chunked_data(gfud->webdata, &gfud->len);
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4056 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4057
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4058 gfud->callback(gfud, gfud->user_data, gfud->webdata, gfud->len, NULL);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4059 purple_util_fetch_url_cancel(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4060 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4061 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4062
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4063 static void ssl_url_fetch_recv_cb(gpointer data, PurpleSslConnection *ssl_connection, PurpleInputCondition cond)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4064 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4065 url_fetch_recv_cb(data, -1, cond);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4066 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4067
27344
608181252ce8 Allow doxygen to pick up the comment for this function. It's
Mark Doliner <markdoliner@pidgin.im>
parents: 27243
diff changeset
4068 /**
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4069 * This function is called when the socket is available to be written
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4070 * to.
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4071 *
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4072 * @param source The file descriptor that can be written to. This can
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4073 * be an http connection or it can be the SSL connection of an
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4074 * https request. So be careful what you use it for! If it's
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4075 * an https request then use purple_ssl_write() instead of
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4076 * writing to it directly.
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4077 */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4078 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4079 url_fetch_send_cb(gpointer data, gint source, PurpleInputCondition cond)
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4080 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4081 PurpleUtilFetchUrlData *gfud;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4082 int len, total_len;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4083
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4084 gfud = data;
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4085
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4086 if (gfud->request == NULL)
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4087 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4088 /* Host header is not forbidden in HTTP/1.0 requests, and HTTP/1.1
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4089 * clients must know how to handle the "chunked" transfer encoding.
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4090 * Purple doesn't know how to handle "chunked", so should always send
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4091 * the Host header regardless, to get around some observed problems
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4092 */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4093 if (gfud->user_agent) {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4094 gfud->request = g_strdup_printf(
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4095 "GET %s%s HTTP/%s\r\n"
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4096 "Connection: close\r\n"
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4097 "User-Agent: %s\r\n"
13831
448d1c6328e0 [gaim-migrate @ 16274]
Christopher O'Brien <siege@pidgin.im>
parents: 13772
diff changeset
4098 "Accept: */*\r\n"
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4099 "Host: %s\r\n\r\n",
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4100 (gfud->full ? "" : "/"),
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4101 (gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4102 (gfud->http11 ? "1.1" : "1.0"),
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4103 (gfud->user_agent ? gfud->user_agent : ""),
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4104 (gfud->website.address ? gfud->website.address : ""));
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4105 } else {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4106 gfud->request = g_strdup_printf(
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4107 "GET %s%s HTTP/%s\r\n"
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4108 "Connection: close\r\n"
13831
448d1c6328e0 [gaim-migrate @ 16274]
Christopher O'Brien <siege@pidgin.im>
parents: 13772
diff changeset
4109 "Accept: */*\r\n"
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4110 "Host: %s\r\n\r\n",
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4111 (gfud->full ? "" : "/"),
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4112 (gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4113 (gfud->http11 ? "1.1" : "1.0"),
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4114 (gfud->website.address ? gfud->website.address : ""));
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4115 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4116 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4117
27543
96889def856c Convert all uses of PURPLE_UNSAFE_DEBUG to the new API I added.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27528
diff changeset
4118 if(purple_debug_is_unsafe())
25763
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4119 purple_debug_misc("util", "Request: '%s'\n", gfud->request);
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4120 else
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4121 purple_debug_misc("util", "request constructed\n");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4122
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4123 total_len = strlen(gfud->request);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4124
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4125 if (gfud->is_ssl)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4126 len = purple_ssl_write(gfud->ssl_connection, gfud->request + gfud->request_written,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4127 total_len - gfud->request_written);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4128 else
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4129 len = write(gfud->fd, gfud->request + gfud->request_written,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4130 total_len - gfud->request_written);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4131
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4132 if (len < 0 && errno == EAGAIN)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4133 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4134 else if (len < 0) {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4135 purple_util_fetch_url_error(gfud, _("Error writing to %s: %s"),
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4136 gfud->website.address, g_strerror(errno));
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4137 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4138 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4139 gfud->request_written += len;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4140
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4141 if (gfud->request_written < total_len)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4142 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4143
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4144 /* We're done writing our request, now start reading the response */
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4145 if (gfud->is_ssl) {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4146 purple_input_remove(gfud->inpa);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4147 gfud->inpa = 0;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4148 purple_ssl_input_add(gfud->ssl_connection, ssl_url_fetch_recv_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4149 } else {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4150 purple_input_remove(gfud->inpa);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4151 gfud->inpa = purple_input_add(gfud->fd, PURPLE_INPUT_READ, url_fetch_recv_cb,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4152 gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4153 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4154 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4155
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4156 static void
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4157 url_fetch_connect_cb(gpointer url_data, gint source, const gchar *error_message)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4158 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4159 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4160
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4161 gfud = url_data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4162 gfud->connect_data = NULL;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4163
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4164 if (source == -1)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4165 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4166 purple_util_fetch_url_error(gfud, _("Unable to connect to %s: %s"),
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4167 (gfud->website.address ? gfud->website.address : ""), error_message);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4168 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4169 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4170
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4171 gfud->fd = source;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4172
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4173 gfud->inpa = purple_input_add(source, PURPLE_INPUT_WRITE,
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4174 url_fetch_send_cb, gfud);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4175 url_fetch_send_cb(gfud, source, PURPLE_INPUT_WRITE);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4176 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4177
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4178 static void ssl_url_fetch_connect_cb(gpointer data, PurpleSslConnection *ssl_connection, PurpleInputCondition cond)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4179 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4180 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4181
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4182 gfud = data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4183
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4184 gfud->inpa = purple_input_add(ssl_connection->fd, PURPLE_INPUT_WRITE,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4185 url_fetch_send_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4186 url_fetch_send_cb(gfud, ssl_connection->fd, PURPLE_INPUT_WRITE);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4187 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4188
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4189 static void ssl_url_fetch_error_cb(PurpleSslConnection *ssl_connection, PurpleSslErrorType error, gpointer data)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4190 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4191 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4192
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4193 gfud = data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4194 gfud->ssl_connection = NULL;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4195
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4196 purple_util_fetch_url_error(gfud, _("Unable to connect to %s: %s"),
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4197 (gfud->website.address ? gfud->website.address : ""),
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4198 purple_ssl_strerror(error));
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4199 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4200
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4201 PurpleUtilFetchUrlData *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4202 purple_util_fetch_url_request(const char *url, gboolean full,
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4203 const char *user_agent, gboolean http11,
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4204 const char *request, gboolean include_headers,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4205 PurpleUtilFetchUrlCallback callback, void *user_data)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4206 {
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4207 return purple_util_fetch_url_request_len_with_account(NULL, url, full,
24011
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4208 user_agent, http11,
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4209 request, include_headers, -1,
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4210 callback, user_data);
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4211 }
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4212
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4213 PurpleUtilFetchUrlData *
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4214 purple_util_fetch_url_request_len(const char *url, gboolean full,
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4215 const char *user_agent, gboolean http11,
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4216 const char *request, gboolean include_headers, gssize max_len,
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4217 PurpleUtilFetchUrlCallback callback, void *user_data)
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4218 {
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4219 return purple_util_fetch_url_request_len_with_account(NULL, url, full,
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4220 user_agent, http11, request, include_headers, max_len, callback,
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4221 user_data);
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4222 }
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4223
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4224 PurpleUtilFetchUrlData *
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4225 purple_util_fetch_url_request_len_with_account(PurpleAccount *account,
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4226 const char *url, gboolean full, const char *user_agent, gboolean http11,
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4227 const char *request, gboolean include_headers, gssize max_len,
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4228 PurpleUtilFetchUrlCallback callback, void *user_data)
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4229 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4230 PurpleUtilFetchUrlData *gfud;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4231
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4232 g_return_val_if_fail(url != NULL, NULL);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4233 g_return_val_if_fail(callback != NULL, NULL);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4234
27543
96889def856c Convert all uses of PURPLE_UNSAFE_DEBUG to the new API I added.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27528
diff changeset
4235 if(purple_debug_is_unsafe())
25763
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4236 purple_debug_info("util",
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4237 "requested to fetch (%s), full=%d, user_agent=(%s), http11=%d\n",
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4238 url, full, user_agent?user_agent:"(null)", http11);
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4239 else
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4240 purple_debug_info("util", "requesting to fetch a URL\n");
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4241
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4242 gfud = g_new0(PurpleUtilFetchUrlData, 1);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4243
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4244 gfud->callback = callback;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4245 gfud->user_data = user_data;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4246 gfud->url = g_strdup(url);
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
4247 gfud->user_agent = g_strdup(user_agent);
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4248 gfud->http11 = http11;
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4249 gfud->full = full;
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
4250 gfud->request = g_strdup(request);
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4251 gfud->include_headers = include_headers;
20661
f7678627901e Initialize file-descriptors to -1.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 20656
diff changeset
4252 gfud->fd = -1;
24011
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4253 gfud->max_len = max_len;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4254
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4255 purple_url_parse(url, &gfud->website.address, &gfud->website.port,
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
4256 &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4257
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4258 if (purple_strcasestr(url, "https://") != NULL) {
26470
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4259 if (!purple_ssl_is_supported()) {
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4260 purple_util_fetch_url_error(gfud,
27632
0da289638ff4 Change strings in libpurple/protocols/jabber/auth.c and util.c a little bit
Mark Doliner <markdoliner@pidgin.im>
parents: 27630
diff changeset
4261 _("Unable to connect to %s: %s"),
0da289638ff4 Change strings in libpurple/protocols/jabber/auth.c and util.c a little bit
Mark Doliner <markdoliner@pidgin.im>
parents: 27630
diff changeset
4262 gfud->website.address,
0da289638ff4 Change strings in libpurple/protocols/jabber/auth.c and util.c a little bit
Mark Doliner <markdoliner@pidgin.im>
parents: 27630
diff changeset
4263 _("Server requires TLS/SSL, but no TLS/SSL support was found."));
26470
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4264 return NULL;
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4265 }
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4266
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4267 gfud->is_ssl = TRUE;
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4268 gfud->ssl_connection = purple_ssl_connect(account,
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4269 gfud->website.address, gfud->website.port,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4270 ssl_url_fetch_connect_cb, ssl_url_fetch_error_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4271 } else {
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4272 gfud->connect_data = purple_proxy_connect(NULL, account,
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4273 gfud->website.address, gfud->website.port,
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4274 url_fetch_connect_cb, gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4275 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4276
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4277 if (gfud->ssl_connection == NULL && gfud->connect_data == NULL)
14151
34427f138b1f [gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents: 14144
diff changeset
4278 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4279 purple_util_fetch_url_error(gfud, _("Unable to connect to %s"),
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4280 gfud->website.address);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4281 return NULL;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4282 }
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4283
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4284 return gfud;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4285 }
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4286
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4287 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4288 purple_util_fetch_url_cancel(PurpleUtilFetchUrlData *gfud)
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4289 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4290 if (gfud->ssl_connection != NULL)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4291 purple_ssl_close(gfud->ssl_connection);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4292
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4293 if (gfud->connect_data != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4294 purple_proxy_connect_cancel(gfud->connect_data);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4295
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4296 if (gfud->inpa > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4297 purple_input_remove(gfud->inpa);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4298
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4299 if (gfud->fd >= 0)
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4300 close(gfud->fd);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4301
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4302 g_free(gfud->website.user);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4303 g_free(gfud->website.passwd);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4304 g_free(gfud->website.address);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4305 g_free(gfud->website.page);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4306 g_free(gfud->url);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4307 g_free(gfud->user_agent);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4308 g_free(gfud->request);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4309 g_free(gfud->webdata);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4310
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4311 g_free(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4312 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4313
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4314 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4315 purple_url_decode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4316 {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4317 static char buf[BUF_LEN];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
4318 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4319 char *bum;
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4320 char hex[3];
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4321
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4322 g_return_val_if_fail(str != NULL, NULL);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4323
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4324 /*
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4325 * XXX - This check could be removed and buf could be made
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4326 * dynamically allocated, but this is easier.
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4327 */
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4328 if (strlen(str) >= BUF_LEN)
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4329 return NULL;
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4330
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4331 for (i = 0; i < strlen(str); i++) {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4332
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4333 if (str[i] != '%')
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4334 buf[j++] = str[i];
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4335 else {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4336 strncpy(hex, str + ++i, 2);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4337 hex[2] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4338
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4339 /* i is pointing to the start of the number */
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4340 i++;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4341
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4342 /*
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4343 * 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
4344 * will be at the next character.
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4345 */
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4346 buf[j++] = strtol(hex, NULL, 16);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4347 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4348 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4349
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4350 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4351
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4352 if (!g_utf8_validate(buf, -1, (const char **)&bum))
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4353 *bum = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4354
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4355 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4356 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4357
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4358 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4359 purple_url_encode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4360 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4361 const char *iter;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4362 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4363 char utf_char[6];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
4364 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4365
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4366 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4367 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
4368
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4369 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4370 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
4371 gunichar c = g_utf8_get_char(iter);
10800
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
4372 /* If the character is an ASCII character and is alphanumeric
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
4373 * no need to escape */
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
4374 if (c < 128 && isalnum(c)) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4375 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4376 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4377 int bytes = g_unichar_to_utf8(c, utf_char);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4378 for (i = 0; i < bytes; i++) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4379 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4380 break;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4381 sprintf(buf + j, "%%%02x", utf_char[i] & 0xff);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4382 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4383 }
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4384 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4385 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4386
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4387 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4388
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4389 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4390 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4391
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4392 /* Originally lifted from
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4393 * 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
4394 * ... and slightly modified to be a bit more rfc822 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4395 * ... and modified a bit more to make domain checking rfc1035 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4396 * 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
4397 * but not completely checking to avoid conflicts with IP addresses
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4398 */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4399 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4400 purple_email_is_valid(const char *address)
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4401 {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4402 const char *c, *domain;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4403 static char *rfc822_specials = "()<>@,;:\\\"[]";
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4404
24645
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
4405 g_return_val_if_fail(address != NULL, FALSE);
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
4406
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4407 /* first we validate the name portion (name@domain) (rfc822)*/
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4408 for (c = address; *c; c++) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4409 if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4410 while (*++c) {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4411 if (*c == '\\') {
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4412 if (*c++ && *c < 127 && *c != '\n' && *c != '\r') continue;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4413 else return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4414 }
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4415 if (*c == '\"') break;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4416 if (*c < ' ' || *c >= 127) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4417 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4418 if (!*c++) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4419 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4420 if (*c != '.') return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4421 continue;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4422 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4423 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4424 if (*c <= ' ' || *c >= 127) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4425 if (strchr(rfc822_specials, *c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4426 }
18871
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
4427
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
4428 /* 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
4429 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
4430
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4431 /* 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
4432 * we should permit user.@domain type addresses - they do work :) */
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4433 if (c == address) return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4434
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4435 /* next we validate the domain portion (name@domain) (rfc1035 & rfc1011) */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4436 if (!*(domain = ++c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4437 do {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4438 if (*c == '.' && (c == domain || *(c - 1) == '.' || *(c - 1) == '-'))
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4439 return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4440 if (*c == '-' && *(c - 1) == '.') return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4441 if ((*c < '0' && *c != '-' && *c != '.') || (*c > '9' && *c < 'A') ||
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4442 (*c > 'Z' && *c < 'a') || (*c > 'z')) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4443 } while (*++c);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4444
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4445 if (*(c - 1) == '-') return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4446
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4447 return ((c - domain) > 3 ? TRUE : FALSE);
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4448 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4449
22468
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4450 gboolean
27732
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4451 purple_ipv4_address_is_valid(const char *ip)
22468
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4452 {
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4453 int c, o1, o2, o3, o4;
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4454 char end;
24643
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4455
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4456 g_return_val_if_fail(ip != NULL, FALSE);
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4457
22468
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4458 c = sscanf(ip, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, &end);
22488
ef0f082ab476 Fixes an error detected by valgrind:
Ka-Hing Cheung <khc@pidgin.im>
parents: 22468
diff changeset
4459 if (c != 4 || o1 < 0 || o1 > 255 || o2 < 0 || o2 > 255 || o3 < 0 || o3 > 255 || o4 < 0 || o4 > 255)
22468
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4460 return FALSE;
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4461 return TRUE;
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4462 }
c0f99a22627f Use connect server as FQDN for SASL auth except when it is an IP address.
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 22313
diff changeset
4463
27727
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4464 gboolean
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4465 purple_ipv6_address_is_valid(const gchar *ip)
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4466 {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4467 const gchar *c;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4468 gboolean double_colon = FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4469 gint chunks = 1;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4470 gint in = 0;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4471
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4472 g_return_val_if_fail(ip != NULL, FALSE);
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4473
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4474 if (*ip == '\0')
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4475 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4476
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4477 for (c = ip; *c; ++c) {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4478 if ((*c >= '0' && *c <= '9') ||
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4479 (*c >= 'a' && *c <= 'f') ||
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4480 (*c >= 'A' && *c <= 'F')) {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4481 if (++in > 4)
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4482 /* Only four hex digits per chunk */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4483 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4484 continue;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4485 } else if (*c == ':') {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4486 /* The start of a new chunk */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4487 ++chunks;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4488 in = 0;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4489 if (*(c + 1) == ':') {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4490 /*
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4491 * '::' indicates a consecutive series of chunks full
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4492 * of zeroes. There can be only one of these per address.
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4493 */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4494 if (double_colon)
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4495 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4496 double_colon = TRUE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4497 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4498 } else
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4499 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4500 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4501
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4502 /*
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4503 * Either we saw a '::' and there were fewer than 8 chunks -or-
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4504 * we didn't see a '::' and saw exactly 8 chunks.
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4505 */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4506 return (double_colon && chunks < 8) || (!double_colon && chunks == 8);
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4507 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4508
27732
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4509 /* TODO 3.0.0: Add ipv6 check, too */
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4510 gboolean
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4511 purple_ip_address_is_valid(const char *ip)
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4512 {
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4513 return purple_ipv4_address_is_valid(ip);
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4514 }
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4515
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4516 /* Stolen from gnome_uri_list_extract_uris */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4517 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4518 purple_uri_list_extract_uris(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4519 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4520 const gchar *p, *q;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4521 gchar *retval;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4522 GList *result = NULL;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4523
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4524 g_return_val_if_fail (uri_list != NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4525
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4526 p = uri_list;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4527
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4528 /* 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
4529 * 2396, or even check for allowed characters - we just ignore
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4530 * comments and trim whitespace off the ends. We also
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4531 * allow LF delimination as well as the specified CRLF.
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4532 */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4533 while (p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4534 if (*p != '#') {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4535 while (isspace(*p))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4536 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4537
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4538 q = p;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4539 while (*q && (*q != '\n') && (*q != '\r'))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4540 q++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4541
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4542 if (q > p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4543 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4544 while (q > p && isspace(*q))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4545 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4546
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4547 retval = (gchar*)g_malloc (q - p + 2);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4548 strncpy (retval, p, q - p + 1);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4549 retval[q - p + 1] = '\0';
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4550
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4551 result = g_list_prepend (result, retval);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4552 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4553 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4554 p = strchr (p, '\n');
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4555 if (p)
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4556 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4557 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4558
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4559 return g_list_reverse (result);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4560 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4561
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4562
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4563 /* Stolen from gnome_uri_list_extract_filenames */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4564 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4565 purple_uri_list_extract_filenames(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4566 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4567 GList *tmp_list, *node, *result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4568
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4569 g_return_val_if_fail (uri_list != NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4570
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4571 result = purple_uri_list_extract_uris(uri_list);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4572
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4573 tmp_list = result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4574 while (tmp_list) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4575 gchar *s = (gchar*)tmp_list->data;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4576
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4577 node = tmp_list;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4578 tmp_list = tmp_list->next;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4579
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4580 if (!strncmp (s, "file:", 5)) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4581 node->data = g_filename_from_uri (s, NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4582 /* not sure if this fallback is useful at all */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4583 if (!node->data) node->data = g_strdup (s+5);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4584 } 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
4585 result = g_list_delete_link(result, node);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4586 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4587 g_free (s);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4588 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4589 return result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4590 }
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4591
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4592 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4593 * UTF8 String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4594 **************************************************************************/
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4595 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4596 purple_utf8_try_convert(const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4597 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4598 gsize converted;
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4599 gchar *utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4600
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4601 g_return_val_if_fail(str != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4602
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4603 if (g_utf8_validate(str, -1, NULL)) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4604 return g_strdup(str);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4605 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4606
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4607 utf8 = g_locale_to_utf8(str, -1, &converted, NULL, NULL);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4608 if (utf8 != NULL)
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4609 return utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4610
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4611 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
4612 if ((utf8 != NULL) && (converted == strlen(str)))
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4613 return utf8;
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4614
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
4615 g_free(utf8);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4616
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4617 return NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4618 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4619
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4620 #define utf8_first(x) ((x & 0x80) == 0 || (x & 0xe0) == 0xc0 \
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4621 || (x & 0xf0) == 0xe0 || (x & 0xf8) == 0xf)
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4622 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4623 purple_utf8_salvage(const char *str)
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4624 {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4625 GString *workstr;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4626 const char *end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4627
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4628 g_return_val_if_fail(str != NULL, NULL);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4629
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4630 workstr = g_string_sized_new(strlen(str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4631
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4632 do {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4633 g_utf8_validate(str, -1, &end);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4634 workstr = g_string_append_len(workstr, str, end - str);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4635 str = end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4636 if (*str == '\0')
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4637 break;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4638 do {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4639 workstr = g_string_append_c(workstr, '?');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4640 str++;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4641 } while (!utf8_first(*str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4642 } while (*str != '\0');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4643
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4644 return g_string_free(workstr, FALSE);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4645 }
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4646
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4647 gchar *
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4648 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
4649 {
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4650 gchar *workstr, *iter;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4651
27243
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4652 if (str == NULL)
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4653 /* 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
4654 return NULL;
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4655
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4656 g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4657
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4658 workstr = iter = g_new(gchar, strlen(str) + 1);
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4659 while (*str) {
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4660 gunichar c = g_utf8_get_char(str);
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4661 const gchar *next = g_utf8_next_char(str);
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4662 size_t len = next - str;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4663
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4664 if (g_unichar_isprint(c)) {
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4665 memcpy(iter, str, len);
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4666 iter += len;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4667 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4668
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4669 str = next;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4670 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4671
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4672 /* 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
4673 *iter = '\0';
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4674
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4675 return workstr;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4676 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4677
21978
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4678 /*
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4679 * 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
4680 * gai_strerror().
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4681 */
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4682 G_CONST_RETURN gchar *
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4683 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
4684 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4685 static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4686 char *msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4687 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
4688
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4689 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
4690
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4691 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
4692 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
4693 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4694 /* 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
4695 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
4696 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
4697 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4698 else
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4699 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4700 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
4701 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
4702 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4703 /* 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
4704 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
4705 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
4706
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4707 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
4708 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
4709 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
4710 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4711 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4712
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4713 msg = g_static_private_get(&msg_private);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4714 if (!msg)
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4715 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4716 msg = g_new(gchar, 64);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4717 g_static_private_set(&msg_private, msg, g_free);
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4718 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4719
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4720 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
4721
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4722 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
4723 return msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4724 }
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4725
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4726 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4727 purple_utf8_ncr_encode(const char *str)
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4728 {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4729 GString *out;
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4730
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4731 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4732 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
4733
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4734 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4735
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4736 for(; *str; str = g_utf8_next_char(str)) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4737 gunichar wc = g_utf8_get_char(str);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4738
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4739 /* super simple check. hopefully not too wrong. */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4740 if(wc >= 0x80) {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4741 g_string_append_printf(out, "&#%u;", (guint32) wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4742 } else {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4743 g_string_append_unichar(out, wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4744 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4745 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4746
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4747 return g_string_free(out, FALSE);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4748 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4749
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4750
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4751 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4752 purple_utf8_ncr_decode(const char *str)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4753 {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4754 GString *out;
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4755 char *buf, *b;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4756
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4757 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4758 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
4759
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4760 buf = (char *) str;
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4761 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4762
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4763 while( (b = strstr(buf, "&#")) ) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4764 gunichar wc;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4765 int base = 0;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4766
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4767 /* append everything leading up to the &# */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4768 g_string_append_len(out, buf, b-buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4769
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4770 b += 2; /* skip past the &# */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4771
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4772 /* 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
4773 if(*b == 'x' || *b == 'X') {
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4774 base = 16;
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4775 b++;
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4776 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4777
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4778 /* advances buf to the end of the ncr segment */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4779 wc = (gunichar) strtoul(b, &buf, base);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4780
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4781 /* this mimics the previous impl of ncr_decode */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4782 if(*buf == ';') {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4783 g_string_append_unichar(out, wc);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4784 buf++;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4785 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4786 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4787
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4788 /* append whatever's left */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4789 g_string_append(out, buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4790
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4791 return g_string_free(out, FALSE);
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4792 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4793
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4794
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4795 int
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4796 purple_utf8_strcasecmp(const char *a, const char *b)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4797 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4798 char *a_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4799 char *b_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4800 int ret = -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4801
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4802 if(!a && b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4803 return -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4804 else if(!b && a)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4805 return 1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4806 else if(!a && !b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4807 return 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4808
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4809 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
4810 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4811 purple_debug_error("purple_utf8_strcasecmp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4812 "One or both parameters are invalid UTF8\n");
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4813 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4814 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4815
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4816 a_norm = g_utf8_casefold(a, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4817 b_norm = g_utf8_casefold(b, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4818 ret = g_utf8_collate(a_norm, b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4819 g_free(a_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4820 g_free(b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4821
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4822 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4823 }
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4824
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4825 /* previously conversation::find_nick() */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4826 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4827 purple_utf8_has_word(const char *haystack, const char *needle)
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4828 {
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4829 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
4830 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
4831 gunichar before, after;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4832 int n;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4833 gboolean ret = FALSE;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4834
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4835 start = hay = g_utf8_strdown(haystack, -1);
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4836
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4837 pin = g_utf8_strdown(needle, -1);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4838 n = strlen(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4839
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4840 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
4841 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
4842 before = -2;
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4843 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
4844 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
4845 }
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4846 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
4847
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4848 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
4849 /* 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
4850 ("!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
4851 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
4852 and isn't the '&' from a "&amp;" or some such entity*/
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4853 (before != -2 && !g_unichar_isalnum(before) && *(p - 1) != '&'))
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4854 && after != -2 && !g_unichar_isalnum(after)) {
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4855 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
4856 break;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4857 }
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4858 start = p + 1;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4859 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4860
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4861 g_free(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4862 g_free(hay);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4863
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4864 return ret;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4865 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4866
13090
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4867 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4868 purple_print_utf8_to_console(FILE *filestream, char *message)
13090
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4869 {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4870 gchar *message_conv;
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4871 GError *error = NULL;
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4872
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4873 /* Try to convert 'message' to user's locale */
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4874 message_conv = g_locale_from_utf8(message, -1, NULL, NULL, &error);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4875 if (message_conv != NULL) {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4876 fputs(message_conv, filestream);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4877 g_free(message_conv);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4878 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4879 else
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4880 {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4881 /* use 'message' as a fallback */
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4882 g_warning("%s\n", error->message);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4883 g_error_free(error);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4884 fputs(message, filestream);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4885 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4886 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4887
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
4888 gboolean purple_message_meify(char *message, gssize len)
7564
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4889 {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4890 char *c;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4891 gboolean inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4892
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4893 g_return_val_if_fail(message != NULL, FALSE);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4894
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4895 if(len == -1)
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4896 len = strlen(message);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4897
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4898 for (c = message; *c; c++, len--) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4899 if(inside_html) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4900 if(*c == '>')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4901 inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4902 } else {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4903 if(*c == '<')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4904 inside_html = TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4905 else
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4906 break;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4907 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4908 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4909
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4910 if(*c && !g_ascii_strncasecmp(c, "/me ", 4)) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4911 memmove(c, c+4, len-3);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4912 return TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4913 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4914
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4915 return FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4916 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4917
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4918 char *purple_text_strip_mnemonic(const char *in)
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4919 {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4920 char *out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4921 char *a;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4922 char *a0;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4923 const char *b;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4924
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4925 g_return_val_if_fail(in != NULL, NULL);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4926
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4927 out = g_malloc(strlen(in)+1);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4928 a = out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4929 b = in;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4930
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4931 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
4932
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4933 while(*b) {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4934 if(*b == '_') {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4935 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
4936 /* Detected CJK style shortcut (Bug 875311) */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4937 a = a0; /* undo the left parenthesis */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4938 b += 3; /* and skip the whole mess */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4939 } else if(*(b+1) == '_') {
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4940 *(a++) = '_';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4941 b += 2;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4942 a0 = a;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4943 } else {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4944 b++;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4945 }
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4946 /* 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
4947 } else if (!(*b & 0x80)) { /* other 1-byte char */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4948 if (*b != ' ')
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4949 a0 = a;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4950 *(a++) = *(b++);
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4951 } else {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4952 /* Multibyte utf8 char, don't look for _ inside these */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4953 int n = 0;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4954 int i;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4955 if ((*b & 0xe0) == 0xc0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4956 n = 2;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4957 } else if ((*b & 0xf0) == 0xe0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4958 n = 3;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4959 } else if ((*b & 0xf8) == 0xf0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4960 n = 4;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4961 } else if ((*b & 0xfc) == 0xf8) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4962 n = 5;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4963 } else if ((*b & 0xfe) == 0xfc) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4964 n = 6;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4965 } else { /* Illegal utf8 */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4966 n = 1;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4967 }
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4968 a0 = a; /* unless we want to delete CJK spaces too */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4969 for (i = 0; i < n && *b; i += 1) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4970 *(a++) = *(b++);
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
4971 }
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4972 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4973 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4974 *a = '\0';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4975
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4976 return out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4977 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4978
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4979 const char* purple_unescape_filename(const char *escaped) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4980 return purple_url_decode(escaped);
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4981 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4982
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4983
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4984 /* 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
4985 * being used above), but we want to keep certain characters unescaped
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4986 * for compat reasons */
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4987 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4988 purple_escape_filename(const char *str)
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4989 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4990 const char *iter;
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4991 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4992 char utf_char[6];
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4993 guint i, j = 0;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4994
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
4995 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4996 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
4997
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4998 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4999 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
5000 gunichar c = g_utf8_get_char(iter);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5001 /* If the character is an ASCII character and is alphanumeric,
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5002 * 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
5003 if (c < 128 && (g_ascii_isalnum(c) || c == '@' || c == '-' ||
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5004 c == '_' || c == '.' || c == '#')) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5005 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5006 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5007 int bytes = g_unichar_to_utf8(c, utf_char);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5008 for (i = 0; i < bytes; i++) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5009 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5010 break;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5011 sprintf(buf + j, "%%%02x", utf_char[i] & 0xff);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5012 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5013 }
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5014 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5015 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5016
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5017 buf[j] = '\0';
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5018
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5019 return buf;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5020 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5021
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5022 const char *_purple_oscar_convert(const char *act, const char *protocol)
15482
b943b932a41b Make sure the pounces, buddy-aliases, savedstatuses etc. saved before the aim/icq split works after the split. The util function _gaim_oscar_convert will be removed at a 'suitable' time in the future.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 15460
diff changeset
5023 {
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
5024 if (act && purple_strequal(protocol, "prpl-oscar")) {
19766
3b54c91fb393 You can't just look at the first letter of the screen name to determine
Mark Doliner <markdoliner@pidgin.im>
parents: 19662
diff changeset
5025 int i;
3b54c91fb393 You can't just look at the first letter of the screen name to determine
Mark Doliner <markdoliner@pidgin.im>
parents: 19662
diff changeset
5026 for (i = 0; act[i] != '\0'; i++)
3b54c91fb393 You can't just look at the first letter of the screen name to determine
Mark Doliner <markdoliner@pidgin.im>
parents: 19662
diff changeset
5027 if (!isdigit(act[i]))
3b54c91fb393 You can't just look at the first letter of the screen name to determine
Mark Doliner <markdoliner@pidgin.im>
parents: 19662
diff changeset
5028 return "prpl-aim";
3b54c91fb393 You can't just look at the first letter of the screen name to determine
Mark Doliner <markdoliner@pidgin.im>
parents: 19662
diff changeset
5029 return "prpl-icq";
15482
b943b932a41b Make sure the pounces, buddy-aliases, savedstatuses etc. saved before the aim/icq split works after the split. The util function _gaim_oscar_convert will be removed at a 'suitable' time in the future.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 15460
diff changeset
5030 }
b943b932a41b Make sure the pounces, buddy-aliases, savedstatuses etc. saved before the aim/icq split works after the split. The util function _gaim_oscar_convert will be removed at a 'suitable' time in the future.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 15460
diff changeset
5031 return protocol;
b943b932a41b Make sure the pounces, buddy-aliases, savedstatuses etc. saved before the aim/icq split works after the split. The util function _gaim_oscar_convert will be removed at a 'suitable' time in the future.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 15460
diff changeset
5032 }
b943b932a41b Make sure the pounces, buddy-aliases, savedstatuses etc. saved before the aim/icq split works after the split. The util function _gaim_oscar_convert will be removed at a 'suitable' time in the future.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 15460
diff changeset
5033
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5034 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
5035 {
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
5036 #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
5037 #ifdef HAVE_SIGNAL_H
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
5038 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
5039 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
5040 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
5041 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
5042 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
5043 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
5044
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
5045 #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
5046 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
5047 #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
5048
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
5049 #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
5050 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
5051 #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
5052
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
5053 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
5054 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
5055 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
5056 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
5057 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
5058 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
5059 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
5060 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
5061 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
5062 signal(SIGXFSZ, SIG_DFL); /* 25: exceeded file size limit */
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
5063 #endif /* HAVE_SIGNAL_H */
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
5064 #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
5065 }
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5066
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5067 static void
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5068 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
5069 {
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5070 va_list args;
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5071 va_start(args, status);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5072 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
5073 va_end(args);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5074 }
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5075
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5076 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
5077 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5078 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
5079 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
5080 PurplePresence *presence;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5081 PurpleStatus *tune;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5082 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
5083 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
5084 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5085
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5086 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
5087 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
5088 if (!tune)
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5089 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5090 if (title) {
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5091 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
5092 PURPLE_TUNE_TITLE, title,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5093 PURPLE_TUNE_ARTIST, artist,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5094 PURPLE_TUNE_ALBUM, album,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5095 NULL);
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5096 } else {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5097 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
5098 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5099 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5100 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5101
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5102 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
5103 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5104 GString *string;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5105 char *esc;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5106
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5107 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
5108 return NULL;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5109
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5110 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
5111 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
5112 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
5113 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5114
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5115 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
5116 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
5117 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
5118 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5119 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5120
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5121 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
5122 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
5123 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
5124 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5125 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5126
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5127 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
5128 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5129
23850
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5130 const gchar *
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5131 purple_get_host_name(void)
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5132 {
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5133 #if GLIB_CHECK_VERSION(2,8,0)
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5134 return g_get_host_name();
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5135 #else
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5136 static char hostname[256];
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5137 int ret = gethostname(hostname, sizeof(hostname));
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5138 hostname[sizeof(hostname) - 1] = '\0';
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5139
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5140 if (ret == -1 || hostname[0] == '\0') {
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5141 purple_debug_info("purple_get_host_name: ", "could not find host name");
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5142 return "localhost";
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5143 } else {
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5144 return hostname;
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5145 }
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5146 #endif
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5147 }

mercurial