libpurple/util.c

Wed, 06 Oct 2021 04:04:56 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Wed, 06 Oct 2021 04:04:56 -0500
branch
release-2.x.y
changeset 41079
658471e41d75
parent 41050
ac6dbd45da27
child 41253
069808ff898f
permissions
-rw-r--r--

Add some additional tests to purple_str_to_time and address their failures.

Testing Done:
Ran the unit tests with all sorts of values for `TZ` and made sure they passed.

Bugs closed: PIDGIN-17552

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

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"
40755
fb2056ce3c58 Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents: 39933
diff changeset
30 #include "glibcompat.h"
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
31 #include "notify.h"
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
32 #include "ntlm.h"
1575
220b4d845309 [gaim-migrate @ 1585]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1560
diff changeset
33 #include "prpl.h"
5545
a8b1a1262402 [gaim-migrate @ 5946]
Christian Hammond <chipx86@chipx86.com>
parents: 5532
diff changeset
34 #include "prefs.h"
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
35 #include "util.h"
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
36
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
37 /* 512KiB Default value for maximum HTTP download size (when the client hasn't
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
38 specified a length) */
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
39 #define DEFAULT_MAX_HTTP_DOWNLOAD (512 * 1024)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
40
35211
c9e5aba2dafd Correct HTTP chunked transfers code (not fixed in rev ebe3fb4a3bc2)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 35204
diff changeset
41 #define MAX_HTTP_CHUNK_SIZE (10 * 1024 * 1024)
c9e5aba2dafd Correct HTTP chunked transfers code (not fixed in rev ebe3fb4a3bc2)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 35204
diff changeset
42
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
43 struct _PurpleUtilFetchUrlData
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
44 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
45 PurpleUtilFetchUrlCallback callback;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
46 void *user_data;
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 struct
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
49 {
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
50 char *user;
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
51 char *passwd;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
52 char *address;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
53 int port;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
54 char *page;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
55
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
56 } website;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
57
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
58 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
59 int num_times_redirected;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
60 gboolean full;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
61 char *user_agent;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
62 gboolean http11;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
63 char *request;
37696
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
64 gsize request_len;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
65 gsize request_written;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
66 gboolean include_headers;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
67
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
68 gboolean is_ssl;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
69 PurpleSslConnection *ssl_connection;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
70 PurpleProxyConnectData *connect_data;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
71 int fd;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
72 guint inpa;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
73
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
74 gboolean got_headers;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
75 gboolean has_explicit_data_len;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
76 char *webdata;
27704
f3b2bca8c5b6 This fixes this compile warning:
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 27662
diff changeset
77 gsize len;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
78 unsigned long data_len;
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
79 gsize max_len;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
80 gboolean chunked;
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
81 PurpleAccount *account;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
82 };
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
83
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
84 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
85 static char *user_dir = NULL;
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
86
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
87 static GRegex *str_to_time_regex = NULL;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
88 static const gchar *str_to_time_pattern =
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
89 "^\\s*"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
90 "(?P<year>\\d{4})? # look for a leading year\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
91 "(?:[-\\/]?) # an optional separator of - or /\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
92 "(?P<month>\\d{2}) # the two digit month\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
93 "(?:[-\\/]?) # another optional separator of - or /\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
94 "(?P<day>\\d{2}) # the two digit day\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
95 "# we now have an optional trailing year or seconds\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
96 "(?:\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
97 " (?:[-\\/]?(?P<trailingyear>\\d{4})) # the trailing year may have a - or / separator\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
98 "|\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
99 " [T.] # T signifies that this is an iso8601 time\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
100 " (?:\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
101 " (?P<hours>\\d{2}) # two digit hour\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
102 " :? # optional : separator\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
103 " (?P<minutes>\\d{2}) # two digit minutes\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
104 " :? # optional : separator\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
105 " (?P<seconds>\\d{2}) # two digit seconds\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
106 " (?:\\.(?P<microseconds>\\d+))? # optional microseconds\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
107 " (?:\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
108 " (?:\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
109 " (?P<tzsign>[+-]) # required tz sign\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
110 " (?P<tzhour>\\d{2}) # required tz hour\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
111 " (?:\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
112 " :? # optional : separator\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
113 " (?<tzminute>\\d{2}))? # optional tz minutes\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
114 " )\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
115 " |\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
116 " (?P<utc>Z) # utc time\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
117 " )?\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
118 " )?\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
119 ")\n"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
120 "\\s* # remove trailing whitespace\n";
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
121
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
122 PurpleMenuAction *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
123 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
124 GList *children)
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
125 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
126 PurpleMenuAction *act = g_new0(PurpleMenuAction, 1);
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
127 act->label = g_strdup(label);
12919
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
128 act->callback = callback;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
129 act->data = data;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
130 act->children = children;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
131 return act;
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
132 }
519199cca273 [gaim-migrate @ 15272]
Etan Reisner <deryni@pidgin.im>
parents: 12907
diff changeset
133
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
134 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
135 purple_menu_action_free(PurpleMenuAction *act)
13103
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
136 {
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
137 g_return_if_fail(act != NULL);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
138
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
139 g_free(act->label);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
140 g_free(act);
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
141 }
81ccb40de82b [gaim-migrate @ 15464]
Richard Laager <rlaager@pidgin.im>
parents: 13098
diff changeset
142
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
143 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
144 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
145 {
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
146 GError *error = NULL;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
147
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
148 str_to_time_regex = g_regex_new(str_to_time_pattern,
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
149 G_REGEX_EXTENDED | G_REGEX_RAW, 0,
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
150 &error);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
151
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
152 if(error != NULL) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
153 purple_debug_fatal("util",
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
154 "Failed to compile the regex for purple_str_to_time"
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
155 ": %s",
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
156 error->message ? error->message : "unknown");
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
157 g_clear_error(&error);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
158 }
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
159 }
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
160
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
161 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
162 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
163 {
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
164 /* 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
165
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
166 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
167 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
168
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
169 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
170 user_dir = NULL;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
171
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
172 g_regex_unref(str_to_time_regex);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
173 str_to_time_regex = NULL;
21238
cd326828c870 Add and call a purple_util_uninit() to free user_dir and customer_home_dir
Richard Laager <rlaager@pidgin.im>
parents: 20992
diff changeset
174 }
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
175
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
176 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
177 * Base16 Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
178 **************************************************************************/
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
179 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
180 purple_base16_encode(const guchar *data, gsize len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
181 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
182 gsize i;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
183 gchar *ascii = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
184
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
185 g_return_val_if_fail(data != NULL, NULL);
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
186 g_return_val_if_fail(len > 0, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
187
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
188 ascii = g_malloc(len * 2 + 1);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
189
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
190 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
191 g_snprintf(&ascii[i * 2], 3, "%02hhx", data[i]);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
192
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
193 return ascii;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
194 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
195
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
196 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
197 purple_base16_decode(const char *str, gsize *ret_len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
198 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
199 gsize len, i, accumulator = 0;
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
200 guchar *data;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
201
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
202 g_return_val_if_fail(str != NULL, NULL);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
203
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
204 len = strlen(str);
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
205
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
206 g_return_val_if_fail(strlen(str) > 0, 0);
15101
6fc73c8a0f4d [gaim-migrate @ 17822]
Nathan Walp <nwalp@pidgin.im>
parents: 15059
diff changeset
207 g_return_val_if_fail(len % 2 == 0, 0);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
208
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
209 data = g_malloc(len / 2);
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
210
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
211 for (i = 0; i < len; i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
212 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
213 if ((i % 2) == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
214 accumulator = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
215 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
216 accumulator <<= 4;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
217
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
218 if (isdigit(str[i]))
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
219 accumulator |= str[i] - 48;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
220 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
221 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
222 switch(tolower(str[i]))
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
223 {
16214
74d15bac89b7 Call strtolower() so that we don't have to check against the
Mark Doliner <markdoliner@pidgin.im>
parents: 16144
diff changeset
224 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
225 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
226 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
227 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
228 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
229 case 'f': accumulator |= 15; break;
1826
2353dd376dcf [gaim-migrate @ 1836]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1815
diff changeset
230 }
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
231 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
232
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
233 if (i % 2)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
234 data[(i - 1) / 2] = accumulator;
1252
94fbface2d84 [gaim-migrate @ 1262]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1250
diff changeset
235 }
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
236
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
237 if (ret_len != NULL)
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
238 *ret_len = len / 2;
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
239
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
240 return data;
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
241 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
242
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
243 gchar *
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
244 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
245 {
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
246 gsize i;
17389
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
247 gchar *ascii = NULL;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
248
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
249 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
250 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
251
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
252 /* 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
253 * 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
254 * 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
255 */
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
256 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
257
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
258 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
259 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
260
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
261 /* 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
262 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
263
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
264 return ascii;
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
265 }
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
266
125a4df6d42c - Add purple_base16_encode_chunked, which is handy for key fingerprints.
William Ehlhardt <williamehlhardt@gmail.com>
parents: 17287
diff changeset
267
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
268 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
269 * Base64 Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
270 **************************************************************************/
8929
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
271 static const char xdigits[] =
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
272 "0123456789abcdef";
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
273
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
274 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
275 purple_base64_encode(const guchar *data, gsize len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
276 {
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
277 return g_base64_encode(data, len);
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
278 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
279
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
280 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
281 purple_base64_decode(const char *str, gsize *ret_len)
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
282 {
27459
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
283 /*
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
284 * 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
285 * 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
286 * 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
287 */
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
288 gsize unused;
c4832605b830 Use glib's base64 encode and decode functions if they're available.
Mark Doliner <markdoliner@pidgin.im>
parents: 27361
diff changeset
289 return g_base64_decode(str, ret_len != NULL ? ret_len : &unused);
1
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
290 }
efe077a7e70d [gaim-migrate @ 10]
Rob Flynn <gaim@robflynn.com>
parents:
diff changeset
291
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
292 /**************************************************************************
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
293 * Quoted Printable Functions (see RFC 2045).
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
294 **************************************************************************/
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
295 guchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
296 purple_quotedp_decode(const char *str, gsize *ret_len)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
297 {
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
298 char *n, *new;
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
299 const char *end, *p;
7722
ddcc8366697e [gaim-migrate @ 8367]
Nathan Walp <nwalp@pidgin.im>
parents: 7679
diff changeset
300
8005
de2b2ad34ee5 [gaim-migrate @ 8682]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7956
diff changeset
301 n = new = g_malloc(strlen (str) + 1);
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
302 end = str + strlen(str);
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
303
8125
d172f84dbfe2 [gaim-migrate @ 8829]
Nathan Walp <nwalp@pidgin.im>
parents: 8123
diff changeset
304 for (p = str; p < end; p++, n++) {
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
305 if (*p == '=') {
8929
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
306 if (p[1] == '\r' && p[2] == '\n') { /* 5.1 #5 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
307 n -= 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
308 p += 2;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
309 } else if (p[1] == '\n') { /* fuzzy case for 5.1 #5 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
310 n -= 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
311 p += 1;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
312 } else if (p[1] && p[2]) {
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
313 char *nibble1 = strchr(xdigits, tolower(p[1]));
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
314 char *nibble2 = strchr(xdigits, tolower(p[2]));
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
315 if (nibble1 && nibble2) { /* 5.1 #1 */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
316 *n = ((nibble1 - xdigits) << 4) | (nibble2 - xdigits);
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
317 p += 2;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
318 } else { /* This should never happen */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
319 *n = *p;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
320 }
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
321 } else { /* This should never happen */
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
322 *n = *p;
1a83fc2e48dd [gaim-migrate @ 9699]
Ethan Blanton <elb@pidgin.im>
parents: 8918
diff changeset
323 }
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
324 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
325 else if (*p == '_')
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
326 *n = ' ';
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
327 else
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
328 *n = *p;
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
329 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
330
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
331 *n = '\0';
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
332
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
333 if (ret_len != NULL)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
334 *ret_len = n - new;
7722
ddcc8366697e [gaim-migrate @ 8367]
Nathan Walp <nwalp@pidgin.im>
parents: 7679
diff changeset
335
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
336 /* Resize to take less space */
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
337 /* new = realloc(new, n - new); */
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
338
11137
cf40226ddff7 [gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents: 11135
diff changeset
339 return (guchar *)new;
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
340 }
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
341
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
342 /**************************************************************************
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
343 * MIME Functions
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
344 **************************************************************************/
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
345 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
346 purple_mime_decode_field(const char *str)
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
347 {
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
348 /*
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
349 * 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
350 * See RFC2047 [which apparently obsoletes RFC1342]
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
351 */
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
352 typedef enum {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
353 state_start, state_equal1, state_question1,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
354 state_charset, state_question2,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
355 state_encoding, state_question3,
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
356 state_encoded_text, state_question4, state_equal2 = state_start
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
357 } encoded_word_state_t;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
358 encoded_word_state_t state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
359 const char *cur, *mark;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
360 const char *charset0 = NULL, *encoding0 = NULL, *encoded_text0 = NULL;
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
361 GString *new;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
362
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
363 /* 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
364 #define token_char_p(c) \
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
365 (c != ' ' && !iscntrl(c) && !strchr("()<>@,;:\"/[]?.=", c))
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
366
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
367 /* 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
368 #define encoded_text_char_p(c) \
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
369 ((c & 0x80) == 0 && c != '?' && c != ' ' && isgraph(c))
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
370
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
371 g_return_val_if_fail(str != NULL, NULL);
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
372
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
373 new = g_string_new(NULL);
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
374
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
375 /* 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
376 * valid then decode them.
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
377 * They are of this form: =?charset?encoding?text?=
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
378 */
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
379
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
380 for (cur = str, mark = NULL; *cur; cur += 1) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
381 switch (state) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
382 case state_equal1:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
383 if (*cur == '?') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
384 state = state_question1;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
385 } else {
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
386 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
387 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
388 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
389 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
390 case state_question1:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
391 if (token_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
392 charset0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
393 state = state_charset;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
394 } else { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
395 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
396 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
397 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
398 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
399 case state_charset:
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
400 if (*cur == '?') {
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
401 state = state_question2;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
402 } else if (!token_char_p(*cur)) { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
403 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
404 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
405 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
406 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
407 case state_question2:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
408 if (token_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
409 encoding0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
410 state = state_encoding;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
411 } else { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
412 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
413 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
414 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
415 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
416 case state_encoding:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
417 if (*cur == '?') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
418 state = state_question3;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
419 } else if (!token_char_p(*cur)) { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
420 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
421 state = state_start;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
422 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
423 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
424 case state_question3:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
425 if (encoded_text_char_p(*cur)) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
426 encoded_text0 = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
427 state = state_encoded_text;
8976
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
428 } else if (*cur == '?') { /* empty string */
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
429 encoded_text0 = cur;
f4425a1dc72c [gaim-migrate @ 9750]
Ambrose Li <ambrose.li@gmail.com>
parents: 8958
diff changeset
430 state = state_question4;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
431 } else { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
432 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
433 state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
434 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
435 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
436 case state_encoded_text:
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_question4;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
439 } else if (!encoded_text_char_p(*cur)) {
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
440 g_string_append_len(new, mark, cur - mark + 1);
8958
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_question4:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
445 if (*cur == '=') { /* Got the whole encoded-word */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
446 char *charset = g_strndup(charset0, encoding0 - charset0 - 1);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
447 char *encoding = g_strndup(encoding0, encoded_text0 - encoding0 - 1);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
448 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
449 guchar *decoded = NULL;
11127
5e539d9d26a4 [gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents: 10987
diff changeset
450 gsize dec_len;
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
451 if (g_ascii_strcasecmp(encoding, "Q") == 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
452 decoded = purple_quotedp_decode(encoded_text, &dec_len);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
453 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
454 decoded = purple_base64_decode(encoded_text, &dec_len);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
455 else
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
456 decoded = NULL;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
457 if (decoded) {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
458 gsize len;
11132
eeb2afd70f70 [gaim-migrate @ 13189]
Mark Doliner <markdoliner@pidgin.im>
parents: 11127
diff changeset
459 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
460
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
461 if (converted) {
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
462 g_string_append_len(new, converted, len);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
463 g_free(converted);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
464 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
465 g_free(decoded);
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
466 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
467 g_free(charset);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
468 g_free(encoding);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
469 g_free(encoded_text);
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
470 state = state_equal2; /* Restart the FSM */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
471 } else { /* This should never happen */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
472 g_string_append_len(new, mark, cur - mark + 1);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
473 state = state_start;
7858
d382c4189f4d [gaim-migrate @ 8512]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7840
diff changeset
474 }
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
475 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
476 default:
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
477 if (*cur == '=') {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
478 mark = cur;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
479 state = state_equal1;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
480 } else {
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
481 /* Some unencoded text. */
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
482 g_string_append_c(new, *cur);
8958
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
483 }
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
484 break;
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
485 } /* switch */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
486 } /* for */
736060c00f48 [gaim-migrate @ 9732]
Ambrose Li <ambrose.li@gmail.com>
parents: 8929
diff changeset
487
28185
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
488 if (state != state_start)
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
489 g_string_append_len(new, mark, cur - mark + 1);
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
490
0980ccaa7064 How about we just use a GString instead of this ridiculous
Mark Doliner <markdoliner@pidgin.im>
parents: 28136
diff changeset
491 return g_string_free(new, FALSE);;
7840
6a145f8cea82 [gaim-migrate @ 8493]
Mark Doliner <markdoliner@pidgin.im>
parents: 7824
diff changeset
492 }
7824
8ac3a78f2ec0 [gaim-migrate @ 8476]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7820
diff changeset
493
7679
c9804d02dcab [gaim-migrate @ 8323]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 7675
diff changeset
494
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
495 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
496 * Date/Time Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
497 **************************************************************************/
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
498
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
499 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
500 {
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
501 static char buf[7];
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
502 long off;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
503 gint8 min;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
504 gint8 hrs;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
505 struct tm new_tm = *tm;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
506
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
507 mktime(&new_tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
508
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
509 if (new_tm.tm_isdst < 0)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
510 g_return_val_if_reached("");
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
511
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
512 #ifdef _WIN32
20587
55af483c9e86 3rd time the charm? Fixes #2990, maybe
Ka-Hing Cheung <khc@pidgin.im>
parents: 19662
diff changeset
513 if ((off = wpurple_get_tz_offset()) == -1)
13427
9830277962aa [gaim-migrate @ 15801]
Daniel Atallah <datallah@pidgin.im>
parents: 13400
diff changeset
514 return "";
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
515 #else
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
516 # ifdef HAVE_TM_GMTOFF
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
517 off = new_tm.tm_gmtoff;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
518 # else
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
519 # ifdef HAVE_TIMEZONE
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
520 tzset();
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
521 off = -1 * timezone;
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
522 # endif /* HAVE_TIMEZONE */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
523 # endif /* !HAVE_TM_GMTOFF */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
524 #endif /* _WIN32 */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
525
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
526 min = (off / 60) % 60;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
527 hrs = ((off / 60) - min) / 60;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
528
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
529 if(iso) {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
530 if (0 == off) {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
531 strcpy(buf, "Z");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
532 } else {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
533 /* 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
534 * wants them */
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
535 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
536 g_return_val_if_reached("");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
537 }
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
538 } else {
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
539 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
540 g_return_val_if_reached("");
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
541 }
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
542
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
543 return buf;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
544 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
545
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
546 /* 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
547 #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
548 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
549 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
550 const char *start;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
551 const char *c;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
552 char *fmt = NULL;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
553
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
554 /* Yes, this is checked in purple_utf8_strftime(),
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
555 * but better safe than sorry. -- rlaager */
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
556 g_return_val_if_fail(format != NULL, 0);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
557
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
558 /* This is fairly efficient, and it only gets
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
559 * executed on Windows or if the underlying
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
560 * system doesn't support the %z format string,
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
561 * for strftime() so I think it's good enough.
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
562 * -- rlaager */
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
563 for (c = start = format; *c ; c++)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
564 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
565 if (*c != '%')
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
566 continue;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
567
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
568 c++;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
569
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
570 #ifndef HAVE_STRFTIME_Z_FORMAT
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
571 if (*c == 'z')
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
572 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
573 char *tmp = g_strdup_printf("%s%.*s%s",
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
574 fmt ? fmt : "",
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
575 c - start - 1,
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
576 start,
18317
6c814e134e56 support replying to XEP-0202 queries
Nathan Walp <nwalp@pidgin.im>
parents: 18219
diff changeset
577 purple_get_tzoff_str(tm, FALSE));
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
578 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
579 fmt = tmp;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
580 start = c + 1;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
581 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
582 #endif
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
583 #ifdef _WIN32
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
584 if (*c == 'Z')
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
585 {
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
586 char *tmp = g_strdup_printf("%s%.*s%s",
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
587 fmt ? fmt : "",
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
588 c - start - 1,
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
589 start,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
590 wpurple_get_timezone_abbreviation(tm));
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
591 g_free(fmt);
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
592 fmt = tmp;
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
593 start = c + 1;
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
594 }
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
595 #endif
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
596 }
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
597
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
598 if (fmt != NULL)
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 size_t ret;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
601
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
602 if (*start)
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
603 {
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
604 char *tmp = g_strconcat(fmt, start, NULL);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
605 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
606 fmt = tmp;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
607 }
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
608
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
609 ret = strftime(s, max, fmt, tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
610 g_free(fmt);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
611
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
612 return ret;
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
613 }
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 return strftime(s, max, format, tm);
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
616 }
13334
d0d48650f114 [gaim-migrate @ 15703]
Richard Laager <rlaager@pidgin.im>
parents: 13308
diff changeset
617 #else /* HAVE_STRFTIME_Z_FORMAT && !_WIN32 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
618 #define purple_internal_strftime strftime
13153
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
619 #endif
3e0b91a83516 [gaim-migrate @ 15515]
Richard Laager <rlaager@pidgin.im>
parents: 13121
diff changeset
620
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
621 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
622 purple_utf8_strftime(const char *format, const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
623 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
624 static char buf[128];
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
625 char *locale;
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
626 GError *err = NULL;
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
627 int len;
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
628 char *utf8;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
629
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
630 g_return_val_if_fail(format != NULL, NULL);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
631
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
632 if (tm == NULL)
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
633 {
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
634 time_t now = time(NULL);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
635 tm = localtime(&now);
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
636 }
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
637
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
638 locale = g_locale_from_utf8(format, -1, NULL, NULL, &err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
639 if (err != NULL)
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
640 {
19832
84b69b21672b Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 19766
diff changeset
641 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
642 g_error_free(err);
30022
02acf3b187c3 util: Fix a crash in purple_utf8_strftime.
Florian Quèze <florian@instantbird.org>
parents: 29924
diff changeset
643 err = NULL;
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
644 locale = g_strdup(format);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
645 }
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
646
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
647 /* A return value of 0 is either an error (in
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
648 * which case, the contents of the buffer are
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
649 * undefined) or the empty string (in which
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
650 * case, no harm is done here). */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
651 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
652 {
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
653 g_free(locale);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
654 return "";
13116
677ff68a65af [gaim-migrate @ 15477]
Richard Laager <rlaager@pidgin.im>
parents: 13105
diff changeset
655 }
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
656
13308
e6882a87f32d [gaim-migrate @ 15673]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 13216
diff changeset
657 g_free(locale);
e6882a87f32d [gaim-migrate @ 15673]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 13216
diff changeset
658
13216
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
659 utf8 = g_locale_to_utf8(buf, len, NULL, NULL, &err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
660 if (err != NULL)
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
661 {
19832
84b69b21672b Patch from QuLogic. Fixes #2903 ('Missing newlines in debug messages.')
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 19766
diff changeset
662 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
663 g_error_free(err);
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
664 }
2cc737d198f3 [gaim-migrate @ 15579]
Richard Laager <rlaager@pidgin.im>
parents: 13201
diff changeset
665 else
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
666 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
667 purple_strlcpy(buf, utf8);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
668 g_free(utf8);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
669 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
670
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
671 return buf;
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
672 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
673
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
674 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
675 purple_date_format_short(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
676 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
677 return purple_utf8_strftime("%x", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
678 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
679
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
680 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
681 purple_date_format_long(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
682 {
23995
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
683 /*
21770001c61b Add a note for translators, because they probably have no idea what
Mark Doliner <markdoliner@pidgin.im>
parents: 23979
diff changeset
684 * 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
685 * 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
686 * 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
687 * 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
688 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
689 return purple_utf8_strftime(_("%x %X"), tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
690 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
691
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
692 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
693 purple_date_format_full(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
694 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
695 return purple_utf8_strftime("%c", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
696 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
697
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
698 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
699 purple_time_format(const struct tm *tm)
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
700 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
701 return purple_utf8_strftime("%X", tm);
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
702 }
3630
caa952062dc2 [gaim-migrate @ 3753]
Rob Flynn <gaim@robflynn.com>
parents: 3572
diff changeset
703
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
704 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
705 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
706 {
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
707 struct tm tm;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
708
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
709 tm.tm_year = year - 1900;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
710 tm.tm_mon = month - 1;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
711 tm.tm_mday = day;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
712 tm.tm_hour = hour;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
713 tm.tm_min = min;
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
714 tm.tm_sec = sec >= 0 ? sec : time(NULL) % 60;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
715
1805
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
716 return mktime(&tm);
c2aeee08d50e [gaim-migrate @ 1815]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents: 1753
diff changeset
717 }
3230
6d0e07333504 [gaim-migrate @ 3247]
Jim Seymour <jseymour@users.sourceforge.net>
parents: 3153
diff changeset
718
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
719 /* originally taken from GLib trunk 1-6-11 */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
720 /* originally licensed as LGPL 2+ */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
721 static time_t
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
722 mktime_utc(struct tm *tm)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
723 {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
724 time_t retval;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
725
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
726 #ifndef HAVE_TIMEGM
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
727 static const gint days_before[] =
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
728 {
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
729 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
730 };
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
731 #endif
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
732
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
733 #ifndef HAVE_TIMEGM
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
734 if (tm->tm_mon < 0 || tm->tm_mon > 11)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
735 return (time_t) -1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
736
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
737 retval = (tm->tm_year - 70) * 365;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
738 retval += (tm->tm_year - 68) / 4;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
739 retval += days_before[tm->tm_mon] + tm->tm_mday - 1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
740
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
741 if (tm->tm_year % 4 == 0 && tm->tm_mon < 2)
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
742 retval -= 1;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
743
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
744 retval = ((((retval * 24) + tm->tm_hour) * 60) + tm->tm_min) * 60 + tm->tm_sec;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
745 #else
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
746 retval = timegm (tm);
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
747 #endif /* !HAVE_TIMEGM */
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
748
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
749 return retval;
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
750 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
751
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
752 time_t
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
753 purple_str_to_time(const char *timestamp, gboolean utc,
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
754 struct tm *tm, long *tz_off, const char **rest)
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
755 {
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
756 GMatchInfo *info = NULL;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
757 gboolean mktime_with_utc = FALSE, matched = FALSE;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
758 gchar *match = NULL;
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
759 gchar *hours = NULL, *minutes = NULL, *seconds = NULL;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
760 struct tm t;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
761 long tzoff = PURPLE_NO_TZ_OFF;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
762 time_t retval;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
763 gint end = 0;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
764
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
765 if(rest != NULL) {
24177
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
766 *rest = NULL;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
767 }
24177
b4e6c6d462db purple_str_to_time() didn't necessarily set "rest" under all circumstances.
Daniel Atallah <datallah@pidgin.im>
parents: 24072
diff changeset
768
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
769 g_return_val_if_fail(timestamp != NULL, 0);
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
770
31731
96ccdfb11ae0 Zero the struct tm used for purple_str_to_time().
Daniel Atallah <datallah@pidgin.im>
parents: 31332
diff changeset
771 memset(&t, 0, sizeof(struct tm));
96ccdfb11ae0 Zero the struct tm used for purple_str_to_time().
Daniel Atallah <datallah@pidgin.im>
parents: 31332
diff changeset
772
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
773 matched = g_regex_match(str_to_time_regex, timestamp, 0, &info);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
774 if(!matched) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
775 if(rest != NULL) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
776 *rest = timestamp;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
777 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
778
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
779 g_match_info_free(info);
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
780
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
781 return 0;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
782 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
783
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
784 /* Set rest to the end of the match in timestamp. */
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
785 if(rest != NULL) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
786 if(g_match_info_fetch_pos(info, 0, NULL, &end)) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
787 *rest = timestamp + end;
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
788 }
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
789 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
790
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
791 /* check the year or the trailingyear if year is not set */
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
792 match = g_match_info_fetch_named(info, "year");
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
793 if(match != NULL && *match != '\0') {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
794 gint year = atoi(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
795 if(year >= 1900) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
796 t.tm_year = year - 1900;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
797 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
798 } else {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
799 g_free(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
800 match = g_match_info_fetch_named(info, "trailingyear");
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
801 if(match != NULL && *match != '\0') {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
802 t.tm_year = atoi(match) - 1900;
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
803 }
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
804 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
805 g_free(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
806
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
807 /* get the month */
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
808 match = g_match_info_fetch_named(info, "month");
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
809 if(match != NULL && *match != '\0') {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
810 t.tm_mon = atoi(match) - 1;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
811 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
812 g_free(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
813
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
814 /* get the day */
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
815 match = g_match_info_fetch_named(info, "day");
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
816 if(match != NULL && *match != '\0') {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
817 t.tm_mday = atoi(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
818 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
819 g_free(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
820
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
821 /* get the hour */
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
822 hours = g_match_info_fetch_named(info, "hours");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
823 minutes = g_match_info_fetch_named(info, "minutes");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
824 seconds = g_match_info_fetch_named(info, "seconds");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
825
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
826 if(hours != NULL && *hours != '\0' &&
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
827 minutes != NULL && *minutes != '\0' &&
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
828 seconds != NULL && *seconds != '\0')
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
829 {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
830 t.tm_hour = atoi(hours);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
831 t.tm_min = atoi(minutes);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
832 t.tm_sec = atoi(seconds);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
833
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
834 /* check if this is utc time */
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
835 match = g_match_info_fetch_named(info, "utc");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
836 if(match != NULL && *match != '\0') {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
837 g_free(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
838
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
839 tzoff = 0;
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
840 mktime_with_utc = TRUE;
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
841 } else {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
842 /* free match if it was just an empty string */
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
843 g_free(match);
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
844
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
845 /* if match is null, check if we have tzsign which is required */
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
846 match = g_match_info_fetch_named(info, "tzsign");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
847 if(match != NULL) {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
848 gint tzsign = -1, tzhour = 0, tzminute = 0;
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
849
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
850 /* Figure out if we're ahead or behind of utc, assuming ahead by
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
851 * default.
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
852 */
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
853 if(*match == '+') {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
854 tzsign = 1;
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
855 }
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
856 g_free(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
857
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
858 /* get the tz hour */
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
859 match = g_match_info_fetch_named(info, "tzhour");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
860 if(match != NULL && *match != '\0') {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
861 tzhour = atoi(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
862 }
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
863 g_free(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
864
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
865 /* get the tz minute */
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
866 match = g_match_info_fetch_named(info, "tzminute");
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
867 if(match != NULL && *match != '\0') {
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
868 tzminute = atoi(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
869 }
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
870 g_free(match);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
871
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
872 /* if the timezone is utc +00:00 or -00:00 tzoff will multiple out to
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
873 * be zero like it should be.
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
874 */
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
875 mktime_with_utc = TRUE;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
876 tzoff = tzsign * ((tzhour * 3600) + (tzminute * 60));
34229
6a1aea2866aa Refactor an error path in purple_str_to_time()
Richard Laager <rlaager@pidgin.im>
parents: 34228
diff changeset
877 }
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
878 }
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
879
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
880 /* If we have a time, figure out if we need to adjust our tz offset. */
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
881 if(!mktime_with_utc) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
882 if(utc) {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
883 mktime_with_utc = TRUE;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
884 tzoff = 0;
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
885 } else {
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
886 /* Local Time */
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
887 t.tm_isdst = -1; /* -1 means dst info is not available */
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
888 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
889 }
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
890 }
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
891
41079
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
892 g_free(hours);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
893 g_free(minutes);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
894 g_free(seconds);
658471e41d75 Add some additional tests to purple_str_to_time and address their failures.
Gary Kramlich <grim@reaperworld.com>
parents: 41050
diff changeset
895
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
896 if(mktime_with_utc) {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
897 retval = mktime_utc(&t);
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
898 } else {
31332
6a74f42c8c04 Fix purple_str_to_time(). Fixes #13131.
Nader Morshed <morshed.nader@gmail.com>
parents: 31294
diff changeset
899 retval = mktime(&t);
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
900 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
901
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
902 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
903 *tm = t;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
904 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
905
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
906 if(tzoff != PURPLE_NO_TZ_OFF) {
35181
e5c1b7f9486d Fix purple_str_to_time() again.
Richard Laager <rlaager@pidgin.im>
parents: 34229
diff changeset
907 retval -= tzoff;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
908 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
909
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
910 if(tz_off != NULL) {
13120
c25222322810 [gaim-migrate @ 15481]
Richard Laager <rlaager@pidgin.im>
parents: 13118
diff changeset
911 *tz_off = tzoff;
41050
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
912 }
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
913
ac6dbd45da27 Port purple_str_to_time to regex and add additional tests
Gary Kramlich <grim@reaperworld.com>
parents: 41048
diff changeset
914 g_match_info_free(info);
9716
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
915
4011c0d5f384 [gaim-migrate @ 10577]
Mark Doliner <markdoliner@pidgin.im>
parents: 9696
diff changeset
916 return retval;
8577
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
917 }
64f25a17f8e4 [gaim-migrate @ 9326]
Nathan Walp <nwalp@pidgin.im>
parents: 8561
diff changeset
918
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
919 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
920 * Markup Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
921 **************************************************************************/
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
922
27652
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
923 /*
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
924 * 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
925 * 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
926 */
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
927 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
928 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
929 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
930 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
931 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
932 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
933
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
934 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
935 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
936
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
937 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
938 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
939 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
940 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
941
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
942 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
943 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
944 case '&':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
945 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
946 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
947
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
948 case '<':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
949 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
950 break;
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 case '>':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
953 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
954 break;
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 case '"':
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
957 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
958 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
959
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
960 default:
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
961 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
962 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
963 (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
964 (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
965 (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
966 (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
967 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
968 else
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
969 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
970 break;
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
971 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
972
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
973 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
974 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
975 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
976
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
977 /* 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
978 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
979 {
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
980 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
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 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
983
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 (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
985 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
986
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
987 /* 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
988 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
989 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
990
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
991 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
992 }
1929fae118e5 Create a purple_markup_escape_text() function and use it in one place
Mark Doliner <markdoliner@pidgin.im>
parents: 27632
diff changeset
993
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
994 const char *
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
995 purple_markup_unescape_entity(const char *text, int *length)
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
996 {
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
997 const char *pln;
38370
5ce633da4ee5 util: Remove two unused variables from purple_markup_unescape_entity()
Mike Ruprecht <cmaiku@gmail.com>
parents: 38270
diff changeset
998 int len;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
999
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1000 if (!text || *text != '&')
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1001 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1002
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1003 #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
1004
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1005 if(IS_ENTITY("&amp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1006 pln = "&";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1007 else if(IS_ENTITY("&lt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1008 pln = "<";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1009 else if(IS_ENTITY("&gt;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1010 pln = ">";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1011 else if(IS_ENTITY("&nbsp;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1012 pln = " ";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1013 else if(IS_ENTITY("&copy;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
1014 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
1015 else if(IS_ENTITY("&quot;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1016 pln = "\"";
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1017 else if(IS_ENTITY("&reg;"))
14236
543c18d72123 [gaim-migrate @ 16824]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14233
diff changeset
1018 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
1019 else if(IS_ENTITY("&apos;"))
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1020 pln = "\'";
38371
87fff7866cff purple_markup_unescape_entity: Fix handling of hexadecimal html entities
dx <dx@dxzone.com.ar>
parents: 38370
diff changeset
1021 else if(text[1] == '#' && (g_ascii_isxdigit(text[2]) || text[2] == 'x')) {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1022 static char buf[7];
38226
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1023 const char *start = text + 2;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1024 char *end;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1025 guint64 pound;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1026 int base = 10;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1027 int buflen;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1028
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1029 if (*start == 'x') {
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1030 base = 16;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1031 start++;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1032 }
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1033
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1034 pound = g_ascii_strtoull(start, &end, base);
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1035 if (pound == 0 || pound > INT_MAX || *end != ';') {
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1036 return NULL;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1037 }
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1038
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1039 len = (end - text) + 1;
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1040
b2fc9e774cb9 Use the more robust entity processing that @dequisdequis came up with
Eion Robb <eionrobb@gmail.com>
parents: 38225
diff changeset
1041 buflen = g_unichar_to_utf8((gunichar)pound, buf);
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1042 buf[buflen] = '\0';
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1043 pln = buf;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1044 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1045 else
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1046 return NULL;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1047
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1048 if (length)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1049 *length = len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1050 return pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1051 }
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1052
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1053 char *
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1054 purple_markup_get_css_property(const gchar *style,
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1055 const gchar *opt)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1056 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1057 const gchar *css_str = style;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1058 const gchar *css_value_start;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1059 const gchar *css_value_end;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1060 gchar *tmp;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1061 gchar *ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1062
24642
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
1063 g_return_val_if_fail(opt != NULL, NULL);
214efc56a0a6 Fix CID #388
Richard Laager <rlaager@pidgin.im>
parents: 24641
diff changeset
1064
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1065 if (!css_str)
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1066 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1067
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1068 /* find the CSS property */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1069 while (1)
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1070 {
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1071 /* skip whitespace characters */
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1072 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
1073 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1074 if (!g_ascii_isalpha(*css_str))
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1075 return NULL;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1076 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
1077 {
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1078 /* go to next css property positioned after the next ';' */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1079 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1080 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1081 if(*css_str != ';')
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1082 return NULL;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1083 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1084 }
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1085 else
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1086 break;
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1087 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1088
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1089 /* find the CSS value position in the string */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1090 css_str += strlen(opt);
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1091 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
1092 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1093 if (*css_str != ':')
16143
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++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1096 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
1097 css_str++;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1098 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
1099 return NULL;
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 /* mark the CSS value */
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1102 css_value_start = css_str;
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1103 while (*css_str && *css_str != '"' && *css_str != ';')
16143
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1104 css_str++;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1105 css_value_end = css_str - 1;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1106
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1107 /* Removes trailing whitespace */
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1108 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
1109 css_value_end--;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1110
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1111 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
1112 ret = purple_unescape_html(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1113 g_free(tmp);
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1114
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1115 return ret;
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1116 }
6393e5b11ff5 Patch from shlomil in ticket #78.
Shlomi Loubaton <shlomister@gmail.com>
parents: 16124
diff changeset
1117
27234
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1118 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
1119 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1120 GData *attributes;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1121 const gchar *start, *end;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1122 gboolean res = FALSE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1123
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1124 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
1125 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1126 /* 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
1127 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
1128 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
1129 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1130 if (!res)
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 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
1133 if (tmp)
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1134 {
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1135 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
1136 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
1137 res = TRUE;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1138 g_free(tmp2);
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1139 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1140
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1141 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1142 g_datalist_clear(&attributes);
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 return res;
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1145 }
82035475de62 Add a utlity function purple_markup_is_rtl
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27192
diff changeset
1146
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1147 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1148 purple_markup_find_tag(const char *needle, const char *haystack,
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1149 const char **start, const char **end, GData **attributes)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1150 {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1151 GData *attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1152 const char *cur = haystack;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1153 char *name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1154 gboolean found = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1155 gboolean in_tag = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1156 gboolean in_attr = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1157 const char *in_quotes = NULL;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1158 size_t needlelen;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1159
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1160 g_return_val_if_fail( needle != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1161 g_return_val_if_fail( *needle != '\0', FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1162 g_return_val_if_fail( haystack != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1163 g_return_val_if_fail( start != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1164 g_return_val_if_fail( end != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1165 g_return_val_if_fail(attributes != NULL, FALSE);
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1166
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1167 needlelen = strlen(needle);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1168 g_datalist_init(&attribs);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1169
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1170 while (*cur && !found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1171 if (in_tag) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1172 if (in_quotes) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1173 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1174
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1175 while (*close && *close != *in_quotes)
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1176 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1177
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1178 /* 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
1179 * 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
1180 * and we're outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1181 if (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1182 /* only store a value if we have an attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1183 if (name) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1184 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1185 char *val = g_strndup(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1186
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1187 g_datalist_set_data_full(&attribs, name, val, g_free);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1188 g_free(name);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1189 name = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1190 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1191
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1192 in_quotes = NULL;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1193 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1194 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1195 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1196 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1197 } else if (in_attr) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1198 const char *close = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1199
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1200 while (*close && *close != '>' && *close != '"' &&
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1201 *close != '\'' && *close != ' ' && *close != '=')
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1202 close++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1203
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1204 /* 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
1205 * the quote, save the attribute and go straight to quote mode.
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1206 * 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
1207 * so we can get outta here */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1208 switch (*close) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1209 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1210 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1211 in_quotes = close;
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
1212 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1213 case '=':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1214 {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1215 size_t len = close - cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1216
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1217 /* don't store a blank attribute name */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1218 if (len) {
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1219 g_free(name);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1220 name = g_ascii_strdown(cur, len);
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1221 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1222
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1223 in_attr = FALSE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1224 cur = close + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1225 }
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
1226 break;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1227 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1228 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1229 in_attr = FALSE;
35966
d603bfb42fd9 Fix some coverity CWE-484 issues
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35275
diff changeset
1230 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1231 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1232 cur = close;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1233 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1234 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1235 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1236 switch (*cur) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1237 case ' ':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1238 /* swallow extra spaces inside tag */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1239 while (*cur && *cur == ' ') cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1240 in_attr = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1241 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1242 case '>':
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1243 found = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1244 *end = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1245 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1246 case '"':
7078
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1247 case '\'':
0d63d673f170 [gaim-migrate @ 7643]
Nathan Walp <nwalp@pidgin.im>
parents: 7000
diff changeset
1248 in_quotes = cur;
35998
aeaebd2ba4af Silence more already dismissed coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35995
diff changeset
1249 /* fall through */
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1250 default:
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1251 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1252 break;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1253 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1254 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1255 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1256 /* if we hit a < followed by the name of our tag... */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1257 if (*cur == '<' && !g_ascii_strncasecmp(cur + 1, needle, needlelen)) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1258 *start = cur;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1259 cur = cur + needlelen + 1;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1260
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1261 /* 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
1262 * 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
1263 * >, but not being distracted by >s inside quotes. */
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1264 if (*cur == ' ' || *cur == '>') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1265 in_tag = TRUE;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1266 } else {
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1267 while (*cur && *cur != '"' && *cur != '\'' && *cur != '>') {
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1268 if (*cur == '"') {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1269 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1270 while (*cur && *cur != '"')
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1271 cur++;
7804
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1272 } else if (*cur == '\'') {
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1273 cur++;
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1274 while (*cur && *cur != '\'')
125cc377a21c [gaim-migrate @ 8451]
Robert McQueen <robot101@debian.org>
parents: 7722
diff changeset
1275 cur++;
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1276 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1277 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1278 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1279 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1280 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1281 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1282 cur++;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1283 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1284 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1285 }
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1286
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1287 /* clean up any attribute name from a premature termination */
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
1288 g_free(name);
6982
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 if (found) {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1291 *attributes = attribs;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1292 } else {
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1293 *start = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1294 *end = NULL;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1295 *attributes = NULL;
41047
addb2327cde0 Fix leak in `purple_markup_find_tag` on error
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41045
diff changeset
1296 g_datalist_clear(&attribs);
6982
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1297 }
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 return found;
12f08de92674 [gaim-migrate @ 7538]
Mark Doliner <markdoliner@pidgin.im>
parents: 6872
diff changeset
1300 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1301
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
1302 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1303 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
1304 const char *start_token, int skip,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1305 const char *end_token, char check_value,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1306 const char *no_value_token,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1307 const char *display_name, gboolean is_link,
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1308 const char *link_prefix,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1309 PurpleInfoFieldFormatCallback format_cb)
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1310 {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1311 const char *p, *q;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1312
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1313 g_return_val_if_fail(str != NULL, FALSE);
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1314 g_return_val_if_fail(user_info != NULL, FALSE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1315 g_return_val_if_fail(start_token != NULL, FALSE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1316 g_return_val_if_fail(end_token != NULL, FALSE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1317 g_return_val_if_fail(display_name != NULL, FALSE);
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 p = strstr(str, start_token);
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 if (p == NULL)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1322 return FALSE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1323
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1324 p += strlen(start_token) + skip;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1325
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1326 if (p >= str + len)
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1327 return FALSE;
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1328
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1329 if (check_value != '\0' && *p == check_value)
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 q = strstr(p, end_token);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1333
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1334 /* Trim leading blanks */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1335 while (*p != '\n' && g_ascii_isspace(*p)) {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1336 p += 1;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1337 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1338
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1339 /* Trim trailing blanks */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1340 while (q > p && g_ascii_isspace(*(q - 1))) {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1341 q -= 1;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1342 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1343
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1344 /* Don't bother with null strings */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1345 if (p == q)
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1346 return FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1347
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1348 if (q != NULL && (!no_value_token ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1349 (no_value_token && strncmp(p, no_value_token,
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1350 strlen(no_value_token)))))
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1351 {
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1352 GString *dest = g_string_new("");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1353
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1354 if (is_link)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1355 {
15205
f642029b2f97 [gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents: 15101
diff changeset
1356 g_string_append(dest, "<a href=\"");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1357
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1358 if (link_prefix)
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1359 g_string_append(dest, link_prefix);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1360
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1361 if (format_cb != NULL)
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1362 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1363 char *reformatted = format_cb(p, q - p);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1364 g_string_append(dest, reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1365 g_free(reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1366 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1367 else
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1368 g_string_append_len(dest, p, q - p);
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1369 g_string_append(dest, "\">");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1370
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1371 if (link_prefix)
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1372 g_string_append(dest, link_prefix);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1373
7675
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1374 g_string_append_len(dest, p, q - p);
8058cedec7a2 [gaim-migrate @ 8319]
Tim Ringenbach <marv@pidgin.im>
parents: 7673
diff changeset
1375 g_string_append(dest, "</a>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1376 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1377 else
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1378 {
13105
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1379 if (format_cb != NULL)
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1380 {
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1381 char *reformatted = format_cb(p, q - p);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1382 g_string_append(dest, reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1383 g_free(reformatted);
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1384 }
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1385 else
8f9c66e4af87 [gaim-migrate @ 15466]
Richard Laager <rlaager@pidgin.im>
parents: 13103
diff changeset
1386 g_string_append_len(dest, p, q - p);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1387 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1388
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1389 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
1390 g_string_free(dest, TRUE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1391
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1392 return TRUE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1393 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1394
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1395 return FALSE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1396 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1397
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1398 struct purple_parse_tag {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1399 char *src_tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1400 char *dest_tag;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1401 gboolean ignore;
7095
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
27892
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1404 /* NOTE: Do not put `do {} while(0)` around this macro (as this is the method
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1405 recommended in the GCC docs). It contains 'continue's that should
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1406 affect the while-loop in purple_markup_html_to_xhtml and doing the
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1407 above would break that.
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1408 Also, remember to put braces in constructs that require them for
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1409 multiple statements when using this macro. */
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
1410 #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1411 const char *o = c + strlen("<" x); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1412 const char *p = NULL, *q = NULL, *r = NULL; \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1413 /* o = iterating over full tag \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1414 * p = > (end of tag) \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1415 * q = start of quoted bit \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1416 * r = < inside tag \
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1417 */ \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1418 GString *innards = g_string_new(""); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1419 while(o && *o) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1420 if(!q && (*o == '\"' || *o == '\'') ) { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1421 q = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1422 } else if(q) { \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1423 if(*o == *q) { /* end of quoted bit */ \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1424 char *unescaped = g_strndup(q+1, o-q-1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1425 char *escaped = g_markup_escape_text(unescaped, -1); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1426 g_string_append_printf(innards, "%c%s%c", *q, escaped, *q); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1427 g_free(unescaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1428 g_free(escaped); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1429 q = NULL; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1430 } else if(*c == '\\') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1431 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1432 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1433 } else if(*o == '<') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1434 r = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1435 } else if(*o == '>') { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1436 p = o; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1437 break; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1438 } else { \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1439 innards = g_string_append_c(innards, *o); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1440 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1441 o++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1442 } \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1443 if(p && !r) { /* got an end of tag and no other < earlier */\
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1444 if(*(p-1) != '/') { \
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1445 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
1446 pt->src_tag = x; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1447 pt->dest_tag = y; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1448 tags = g_list_prepend(tags, pt); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1449 } \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1450 if(xhtml) { \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1451 xhtml = g_string_append(xhtml, "<" y); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1452 xhtml = g_string_append(xhtml, innards->str); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1453 xhtml = g_string_append_c(xhtml, '>'); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1454 } \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1455 c = p + 1; \
30268
f2c6c7b4c7d0 Add some comments that meant something to me at some point and might
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30143
diff changeset
1456 } else { /* got end of tag with earlier < *or* didn't get anything */ \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1457 if(xhtml) \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1458 xhtml = g_string_append(xhtml, "&lt;"); \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1459 if(plain) \
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1460 plain = g_string_append_c(plain, '<'); \
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1461 c++; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1462 } \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1463 g_string_free(innards, TRUE); \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1464 continue; \
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1465 } \
27880
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1466 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
1467 (*(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
1468 !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
1469 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1470 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
1471 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
1472 if(*c != '/') { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1473 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
1474 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
1475 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
1476 tags = g_list_prepend(tags, pt); \
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1477 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
1478 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
1479 } else { \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1480 if(xhtml) \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1481 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
1482 } \
16fe15b82347 Correct the indentation of this macro by removing one level of indentation
Mark Doliner <markdoliner@pidgin.im>
parents: 27831
diff changeset
1483 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
1484 continue; \
27896
480578cc87d3 567c0647 introduced an extra backslash at the end of ALLOW_TAG_ALT
Ka-Hing Cheung <khc@pidgin.im>
parents: 27895
diff changeset
1485 }
27892
f2a4844fc72f Make a note about these ALLOW_TAG* macros so people don't do stuff like
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27882
diff changeset
1486 /* Don't forget to check the note above for ALLOW_TAG_ALT. */
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1487 #define ALLOW_TAG(x) ALLOW_TAG_ALT(x, x)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1488 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1489 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
1490 char **plain_out)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1491 {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1492 GString *xhtml = NULL;
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1493 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
1494 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
1495 GString *cdata = NULL;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1496 GList *tags = NULL, *tag;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1497 const char *c = html;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1498 char quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1499
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1500 #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
1501 quote = *(ptr++); \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1502 else \
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1503 quote = '\0';
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1504
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1505 #define VALID_CHAR(ptr) (*(ptr) && *(ptr) != quote && (quote || (*(ptr) != ' ' && *(ptr) != '>')))
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1506
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1507 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
1508
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1509 if(xhtml_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1510 xhtml = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1511 if(plain_out)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1512 plain = g_string_new("");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1513
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1514 while(c && *c) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1515 if(*c == '<') {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1516 if(*(c+1) == '/') { /* closing tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1517 tag = tags;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1518 while(tag) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1519 struct purple_parse_tag *pt = tag->data;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1520 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
1521 c += strlen(pt->src_tag) + 3;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1522 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1523 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1524 tag = tag->next;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1525 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1526 if(tag) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1527 while(tags) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1528 struct purple_parse_tag *pt = tags->data;
29227
3e9734bf4422 Fix a corner case where purple_markup_html_to_xhtml generated malformed XHTML.
Paul Aurich <darkrain42@pidgin.im>
parents: 28577
diff changeset
1529 if(xhtml && !pt->ignore)
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1530 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
1531 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
1532 /* 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
1533 if (cdata && url &&
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1534 (!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
1535 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
1536 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
1537 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
1538 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
1539 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
1540 }
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
1541
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
1542 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1543 if(tags == tag)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1544 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1545 tags = g_list_remove(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1546 g_free(pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1547 }
40922
128a40bc6e88 Use g_[s]list_delete_link more.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40900
diff changeset
1548 g_free(tag->data);
128a40bc6e88 Use g_[s]list_delete_link more.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40900
diff changeset
1549 tags = g_list_delete_link(tags, tag);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1550 } else {
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1551 /* a closing tag we weren't expecting...
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1552 * 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
1553 * just a </ we'll escape it properly */
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1554 const char *end = c+2;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1555 while(*end && g_ascii_isalpha(*end))
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1556 end++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1557 if(*end == '>') {
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1558 c = end+1;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1559 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1560 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1561 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1562 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1563 plain = g_string_append_c(plain, '<');
8534
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1564 c++;
cd92b7af7e12 [gaim-migrate @ 9273]
Nathan Walp <nwalp@pidgin.im>
parents: 8517
diff changeset
1565 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1566 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1567 } else { /* opening tag */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1568 ALLOW_TAG("blockquote");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1569 ALLOW_TAG("cite");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1570 ALLOW_TAG("div");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1571 ALLOW_TAG("em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1572 ALLOW_TAG("h1");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1573 ALLOW_TAG("h2");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1574 ALLOW_TAG("h3");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1575 ALLOW_TAG("h4");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1576 ALLOW_TAG("h5");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1577 ALLOW_TAG("h6");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1578 /* we only allow html to start the message */
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
1579 if(c == html) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1580 ALLOW_TAG("html");
27882
ef88f5abc345 disapproval of revision '7cd763960c563ad3654e5a9b74fb60bc73aae90d'
Mark Doliner <markdoliner@pidgin.im>
parents: 27881
diff changeset
1581 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1582 ALLOW_TAG_ALT("i", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1583 ALLOW_TAG_ALT("italic", "em");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1584 ALLOW_TAG("li");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1585 ALLOW_TAG("ol");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1586 ALLOW_TAG("p");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1587 ALLOW_TAG("pre");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1588 ALLOW_TAG("q");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1589 ALLOW_TAG("span");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1590 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
1591
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
1592
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1593 /* 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
1594 * we still want to send something sensible, so we put a
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1595 * linebreak in its place. <BR> also needs special handling
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1596 * because putting a </BR> to close it would just be dumb. */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1597 if((!g_ascii_strncasecmp(c, "<br", 3)
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1598 || !g_ascii_strncasecmp(c, "<hr", 3))
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1599 && (*(c+3) == '>' ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1600 !g_ascii_strncasecmp(c+3, "/>", 2) ||
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1601 !g_ascii_strncasecmp(c+3, " />", 3))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1602 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1603 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1604 xhtml = g_string_append(xhtml, "<br/>");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1605 if(plain && *c != '\n')
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1606 plain = g_string_append_c(plain, '\n');
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1607 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1608 }
22313
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1609 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
1610 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
1611 if (*(c+2) == '>')
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 = "b";
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1613 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
1614 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
1615 else
99ace937826d Change purple_markup_html_to_xhtml() to convert <strong> tags to
Mark Doliner <markdoliner@pidgin.im>
parents: 22217
diff changeset
1616 pt->src_tag = "strong";
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1617 pt->dest_tag = "span";
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1618 tags = g_list_prepend(tags, pt);
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1619 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1620 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1621 xhtml = g_string_append(xhtml, "<span style='font-weight: bold;'>");
14395
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1622 continue;
cf8c889161ff [gaim-migrate @ 17029]
Nathan Walp <nwalp@pidgin.im>
parents: 14383
diff changeset
1623 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1624 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
1625 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
1626 pt->src_tag = *(c+2) == '>' ? "u" : "underline";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1627 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1628 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1629 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1630 if (xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1631 xhtml = g_string_append(xhtml, "<span style='text-decoration: underline;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1632 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1633 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1634 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
1635 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
1636 pt->src_tag = *(c+2) == '>' ? "s" : "strike";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1637 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1638 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1639 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1640 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1641 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
1642 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1643 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1644 if(!g_ascii_strncasecmp(c, "<sub>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1645 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
1646 pt->src_tag = "sub";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1647 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1648 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1649 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1650 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1651 xhtml = g_string_append(xhtml, "<span style='vertical-align:sub;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1652 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1653 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1654 if(!g_ascii_strncasecmp(c, "<sup>", 5)) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1655 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
1656 pt->src_tag = "sup";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1657 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1658 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1659 c = strchr(c, '>') + 1;
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1660 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1661 xhtml = g_string_append(xhtml, "<span style='vertical-align:super;'>");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1662 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1663 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1664 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
1665 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
1666 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
1667 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1668 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
1669 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
1670 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
1671 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
1672 src = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1673 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1674 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
1675 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
1676 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
1677 }
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
1678 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1679 } 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
1680 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
1681 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
1682 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
1683 alt = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1684 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1685 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
1686 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
1687 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
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 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1690 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1691 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
1692 }
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 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1694 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
1695 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
1696 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
1697 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
1698 /* src and alt are required! */
41048
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1699 if (src) {
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1700 if (xhtml) {
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1701 g_string_append_printf(xhtml, "<img src='%s' alt='%s' />", g_strstrip(src->str), alt ? alt->str : "");
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1702 }
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1703 g_string_free(src, TRUE);
cb21c7484e4c Fix an assert in purple_markup_html_to_xhtml
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 41047
diff changeset
1704 }
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
1705 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
1706 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
1707 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
1708 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
1709 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
1710 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
1711 }
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
1712 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
1713 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1714 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
1715 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
1716 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
1717 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1718 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
1719 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
1720 if (url)
9a092747dcea Fix some incorrect assertions when G_DEBUG=fatal_warnings is set.
Daniel Atallah <datallah@pidgin.im>
parents: 20611
diff changeset
1721 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
1722 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
1723 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
1724 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
1725 cdata = g_string_new("");
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1726 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1727 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
1728 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
1729 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
1730 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
1731 else
4a0917337f8f Escape any un-escaped entities in purple_markup_html_to_xhtml when parsing
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21453
diff changeset
1732 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
1733 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
1734 }
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 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1736 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1737 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
1738 }
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 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1740 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
1741 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
1742 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
1743 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
1744 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
1745 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
1746 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
1747 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
1748 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
1749 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
1750 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
1751 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1752 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
1753 const char *p = c + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1754 GString *style = g_string_new("");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1755 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
1756 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1757 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
1758 const char *q = p + 5;
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1759 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
1760 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1761 while (VALID_CHAR(q)) {
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1762 color = g_string_append_c(color, *q);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1763 q++;
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1764 }
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1765 g_string_append_printf(style, "background: %s; ", color->str);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1766 g_string_free(color, TRUE);
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1767 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1768 } 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
1769 const char *q = p + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1770 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
1771 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1772 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1773 color = g_string_append_c(color, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1774 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1775 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1776 g_string_append_printf(style, "color: %s; ", color->str);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1777 g_string_free(color, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1778 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1779 } 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
1780 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1781 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
1782 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1783 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1784 face = g_string_append_c(face, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1785 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1786 }
13836
43be98fd1be0 [gaim-migrate @ 16283]
Brian Chu <roast@users.sourceforge.net>
parents: 13831
diff changeset
1787 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
1788 g_string_free(face, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1789 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1790 } 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
1791 const char *q = p + 5;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1792 int sz;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1793 const char *size = "medium";
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1794 CHECK_QUOTE(q);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1795 sz = atoi(q);
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1796 switch (sz)
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1797 {
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1798 case 1:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1799 size = "xx-small";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1800 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1801 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
1802 size = "small";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1803 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1804 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
1805 size = "medium";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1806 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1807 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
1808 size = "large";
8686
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 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
1811 size = "x-large";
8686
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1812 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1813 case 6:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1814 case 7:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1815 size = "xx-large";
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1816 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1817 default:
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1818 break;
87eb1cde44c9 [gaim-migrate @ 9439]
Kevin Stange <kstange@pidgin.im>
parents: 8625
diff changeset
1819 }
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1820 g_string_append_printf(style, "font-size: %s; ", size);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1821 p = q;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1822 } else {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1823 p++;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1824 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1825 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1826 if ((c = strchr(p, '>')) != NULL)
10593
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1827 c++;
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1828 else
cba16404d664 [gaim-migrate @ 12005]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10589
diff changeset
1829 c = p;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1830 pt = g_new0(struct purple_parse_tag, 1);
8064
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1831 pt->src_tag = "font";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1832 pt->dest_tag = "span";
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1833 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
1834 if(style->len && xhtml)
18108
cb8669f16994 merge of 'bab0b0bcb66485f4114afcd894f2f45d4b4ef15e'
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 18105 18104
diff changeset
1835 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
1836 else
f5115590887b [gaim-migrate @ 8757]
Nathan Walp <nwalp@pidgin.im>
parents: 8063
diff changeset
1837 pt->ignore = TRUE;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1838 g_string_free(style, TRUE);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1839 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1840 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1841 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
1842 const char *p = c + 6;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1843 gboolean did_something = FALSE;
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1844 while (*p && *p != '>') {
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1845 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
1846 const char *q = p + 8;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1847 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
1848 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
1849 CHECK_QUOTE(q);
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1850 while (VALID_CHAR(q)) {
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1851 color = g_string_append_c(color, *q);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1852 q++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1853 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1854 if (xhtml)
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1855 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
1856 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
1857 if ((c = strchr(p, '>')) != NULL)
10623
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1858 c++;
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1859 else
33b965c36d84 [gaim-migrate @ 12094]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10614
diff changeset
1860 c = p;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1861 pt->src_tag = "body";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1862 pt->dest_tag = "span";
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1863 tags = g_list_prepend(tags, pt);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1864 did_something = TRUE;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1865 break;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1866 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1867 p++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1868 }
23391
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1869 if (did_something) continue;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1870 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1871 /* this has to come after the special case for bgcolor */
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1872 ALLOW_TAG("body");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1873 if(!g_ascii_strncasecmp(c, "<!--", strlen("<!--"))) {
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1874 char *p = strstr(c + strlen("<!--"), "-->");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1875 if(p) {
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, "<!--");
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1878 c += strlen("<!--");
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1879 continue;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1880 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1881 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1882
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1883 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1884 xhtml = g_string_append(xhtml, "&lt;");
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1885 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1886 plain = g_string_append_c(plain, '<');
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1887 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1888 }
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1889 } else if(*c == '&') {
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1890 char buf[7];
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1891 const char *pln;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1892 int len;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1893
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
1894 if ((pln = purple_markup_unescape_entity(c, &len)) == NULL) {
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1895 len = 1;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1896 g_snprintf(buf, sizeof(buf), "%c", *c);
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1897 pln = buf;
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1898 }
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1899 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1900 xhtml = g_string_append_len(xhtml, c, len);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1901 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1902 plain = g_string_append(plain, pln);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1903 if(cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1904 cdata = g_string_append_len(cdata, c, len);
7287
abe4e3c069d4 [gaim-migrate @ 7868]
Nathan Walp <nwalp@pidgin.im>
parents: 7265
diff changeset
1905 c += len;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1906 } else {
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1907 if(xhtml)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1908 xhtml = g_string_append_c(xhtml, *c);
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1909 if(plain)
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1910 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
1911 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
1912 cdata = g_string_append_c(cdata, *c);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1913 c++;
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1914 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1915 }
41045
c8e2ffe9b4d0 Correctly free parse tags at end of purple_html_to_xhtml.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40981
diff changeset
1916 for (tag = tags; tag ; tag = tag->next) {
c8e2ffe9b4d0 Correctly free parse tags at end of purple_html_to_xhtml.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40981
diff changeset
1917 struct purple_parse_tag *pt = tag->data;
c8e2ffe9b4d0 Correctly free parse tags at end of purple_html_to_xhtml.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40981
diff changeset
1918 if (xhtml && !pt->ignore) {
c8e2ffe9b4d0 Correctly free parse tags at end of purple_html_to_xhtml.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40981
diff changeset
1919 g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
17572
2f24c76fbb7c In purple_markup_html_to_xhtml:
Richard Laager <rlaager@pidgin.im>
parents: 17571
diff changeset
1920 }
41045
c8e2ffe9b4d0 Correctly free parse tags at end of purple_html_to_xhtml.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents: 40981
diff changeset
1921 g_free(pt);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1922 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1923 g_list_free(tags);
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1924 if(xhtml_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1925 *xhtml_out = g_string_free(xhtml, FALSE);
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1926 if(plain_out)
17571
b77a5881459f Remove needless string duplication.
Richard Laager <rlaager@pidgin.im>
parents: 17541
diff changeset
1927 *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
1928 if(url)
5be99af1b48b This was crashing for me when writing a system message when logging
Mark Doliner <markdoliner@pidgin.im>
parents: 18741
diff changeset
1929 g_string_free(url, TRUE);
21451
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1930 if (cdata)
ffa5c6863537 applied changes from 0919212f5a8cf4a13c877f98d42baf7e337b33e7
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21441
diff changeset
1931 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
1932 #undef CHECK_QUOTE
9ca4969ba07e Modified patch from Dylan Simon (dylex) to improve
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23289
diff changeset
1933 #undef VALID_CHAR
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1934 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1935
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1936 /* The following are probably reasonable changes:
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1937 * - \n should be converted to a normal space
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1938 * - 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
1939 * - We want to turn </td>#whitespace<td> sequences into a single tab
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1940 * - 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
1941 * - <script>...</script> and <style>...</style> should be completely removed
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1942 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1943
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1944 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
1945 purple_markup_strip_html(const char *str)
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
1946 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1947 int i, j, k, entlen;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1948 gboolean visible = TRUE;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1949 gboolean closing_td_p = FALSE;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1950 gchar *str2;
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
1951 const gchar *cdata_close_tag = NULL, *ent;
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1952 gchar *href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
1953 int href_st = 0;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1954
7110
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1955 if(!str)
2e5dda9bc6a9 [gaim-migrate @ 7676]
Nathan Walp <nwalp@pidgin.im>
parents: 7108
diff changeset
1956 return NULL;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1957
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1958 str2 = g_strdup(str);
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1959
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1960 for (i = 0, j = 0; str2[i]; i++)
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1961 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1962 if (str2[i] == '<')
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1963 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1964 if (cdata_close_tag)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1965 {
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1966 /* 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
1967 if (g_ascii_strncasecmp(str2 + i, cdata_close_tag,
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1968 strlen(cdata_close_tag)) == 0)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1969 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1970 i += strlen(cdata_close_tag) - 1;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1971 cdata_close_tag = NULL;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1972 }
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1973 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1974 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1975 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
1976 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
1977 str2[j++] = '\t';
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1978 visible = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1979 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
1980 else if (g_ascii_strncasecmp(str2 + i, "</td>", 5) == 0)
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1981 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1982 closing_td_p = TRUE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1983 visible = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1984 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1985 else
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1986 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1987 closing_td_p = FALSE;
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1988 visible = TRUE;
8517
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1989 }
a6647dc5baee [gaim-migrate @ 9256]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8511
diff changeset
1990
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1991 k = i + 1;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1992
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1993 if(g_ascii_isspace(str2[k]))
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1994 visible = TRUE;
9170
18732ae70740 [gaim-migrate @ 9955]
Tim Ringenbach <marv@pidgin.im>
parents: 9161
diff changeset
1995 else if (str2[k])
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
1996 {
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1997 /* Scan until we end the tag either implicitly (closed start
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1998 * tag) or explicitly, using a sloppy method (i.e., < or >
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
1999 * inside quoted attributes will screw us up)
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2000 */
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2001 while (str2[k] && str2[k] != '<' && str2[k] != '>')
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2002 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2003 k++;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2004 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2005
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2006 /* 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
2007 * 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
2008 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
2009 g_ascii_isspace(str2[i+2]))
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2010 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2011 int st; /* start of href, inclusive [ */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2012 int end; /* end of href, exclusive ) */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2013 char delim = ' ';
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2014 /* Find start of href */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2015 for (st = i + 3; st < k; st++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2016 {
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2017 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
2018 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2019 st += 5;
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
2020 if (str2[st] == '"' || str2[st] == '\'')
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2021 {
16230
291f0932fac8 This was causing problems with jabber in finch.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 16214
diff changeset
2022 delim = str2[st];
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2023 st++;
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 break;
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 /* find end of address */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2029 for (end = st; end < k && str2[end] != delim; end++)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2030 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2031 /* 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
2032 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2033
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2034 /* 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
2035 * already one saved, kill it. */
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2036 if (st < k)
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2037 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2038 char *tmp;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2039 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2040 tmp = g_strndup(str2 + st, end - st);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2041 href = purple_unescape_html(tmp);
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2042 g_free(tmp);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2043 href_st = j;
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
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2047 /* Replace </a> with an ascii representation of the
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2048 * 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
2049 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
2050 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2051 size_t hrlen = strlen(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2052
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2053 /* Only insert the href if it's different from the CDATA. */
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
2054 if ((hrlen != (gsize)(j - href_st) ||
12640
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2055 strncmp(str2 + href_st, href, hrlen)) &&
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
2056 (hrlen != (gsize)(j - href_st + 7) || /* 7 == strlen("http://") */
12640
1fb40d5d76e7 [gaim-migrate @ 14976]
Richard Laager <rlaager@pidgin.im>
parents: 12628
diff changeset
2057 strncmp(str2 + href_st, href + 7, hrlen - 7)))
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2058 {
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2059 str2[j++] = ' ';
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
2060 str2[j++] = '(';
40758
cf9821fc48e7 g_memmove has been deprecated since glib 2.40 and recommends just using memmove
Gary Kramlich <grim@reaperworld.com>
parents: 40755
diff changeset
2061 memmove(str2 + j, href, hrlen);
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2062 j += hrlen;
12628
35043a7fb16c [gaim-migrate @ 14964]
Richard Laager <rlaager@pidgin.im>
parents: 12622
diff changeset
2063 str2[j++] = ')';
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2064 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2065 href = NULL;
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2066 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2067 }
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2068
29924
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2069 /* Check for tags which should be mapped to newline (but ignore some of
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2070 * the tags at the beginning of the text) */
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2071 else if ((j && (g_ascii_strncasecmp(str2 + i, "<p>", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2072 || g_ascii_strncasecmp(str2 + i, "<tr", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2073 || g_ascii_strncasecmp(str2 + i, "<hr", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2074 || g_ascii_strncasecmp(str2 + i, "<li", 3) == 0
5ff8eccbdbf4 Ignore some tags at the beginning of a message.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 29697
diff changeset
2075 || g_ascii_strncasecmp(str2 + i, "<div", 4) == 0))
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2076 || 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
2077 || g_ascii_strncasecmp(str2 + i, "</table>", 8) == 0)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2078 {
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2079 str2[j++] = '\n';
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2080 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2081 /* Check for tags which begin CDATA and need to be closed */
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2082 #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
2083 else if (g_ascii_strncasecmp(str2 + i, "<option", 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 /* 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
2086 cdata_close_tag = "</option>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2087 }
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2088 #endif
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2089 else if (g_ascii_strncasecmp(str2 + i, "<script", 7) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2090 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2091 cdata_close_tag = "</script>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2092 }
18551
b66ed9a5408e Replace some strncasecmp() calls with g_ascii_strncasecmp() as part of the
Nick Hebner <hebnern@gmail.com>
parents: 18317
diff changeset
2093 else if (g_ascii_strncasecmp(str2 + i, "<style", 6) == 0)
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2094 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2095 cdata_close_tag = "</style>";
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2096 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2097 /* Update the index and continue checking after the tag */
10731
8d817cb4268b [gaim-migrate @ 12333]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10700
diff changeset
2098 i = (str2[k] == '<' || str2[k] == '\0')? k - 1: k;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2099 continue;
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2100 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2101 }
9241
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2102 else if (cdata_close_tag)
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2103 {
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2104 continue;
c10e113f7112 [gaim-migrate @ 10040]
Tim Ringenbach <marv@pidgin.im>
parents: 9240
diff changeset
2105 }
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2106 else if (!g_ascii_isspace(str2[i]))
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2107 {
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2108 visible = TRUE;
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2109 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2110
16144
4e022531d1c9 Patch cleanups:
Richard Laager <rlaager@pidgin.im>
parents: 16143
diff changeset
2111 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
2112 {
14233
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2113 while (*ent)
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2114 str2[j++] = *ent++;
4f5fe687b21d [gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 14183
diff changeset
2115 i += entlen - 1;
9273
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2116 continue;
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2117 }
cfbcd961bf6b [gaim-migrate @ 10076]
Nathan Walp <nwalp@pidgin.im>
parents: 9257
diff changeset
2118
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2119 if (visible)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
2120 str2[j++] = g_ascii_isspace(str2[i])? ' ': str2[i];
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2121 }
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2122
12620
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2123 g_free(href);
991d2aed617f [gaim-migrate @ 14956]
Dennis Lambe Jr. <malsyned@users.sourceforge.net>
parents: 12483
diff changeset
2124
7103
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2125 str2[j] = '\0';
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2126
6e03ab150b28 [gaim-migrate @ 7668]
Nathan Walp <nwalp@pidgin.im>
parents: 7099
diff changeset
2127 return str2;
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
2128 }
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
2129
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2130 static gboolean
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2131 badchar(char c)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2132 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2133 switch (c) {
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 ',':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2136 case '\0':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2137 case '\n':
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
2138 case '\r':
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2139 case '<':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2140 case '>':
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2141 case '"':
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2142 return TRUE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2143 default:
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2144 return FALSE;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2145 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2146 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2147
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2148 static gboolean
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2149 badentity(const char *c)
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2150 {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2151 if (!g_ascii_strncasecmp(c, "&lt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2152 !g_ascii_strncasecmp(c, "&gt;", 4) ||
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2153 !g_ascii_strncasecmp(c, "&quot;", 6)) {
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2154 return TRUE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2155 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2156 return FALSE;
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2157 }
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2158
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2159 static const char *
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2160 process_link(GString *ret,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2161 const char *start, const char *c,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2162 int matchlen,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2163 const char *urlprefix,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2164 int inside_paren)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2165 {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2166 char *url_buf, *tmpurlbuf;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2167 const char *t;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2168
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2169 for (t = c;; t++) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2170 if (!badchar(*t) && !badentity(t))
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2171 continue;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2172
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2173 if (t - c == matchlen)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2174 break;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2175
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2176 if (*t == ',' && *(t + 1) != ' ') {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2177 continue;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2178 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2179
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2180 if (t > start && *(t - 1) == '.')
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2181 t--;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2182 if (t > start && *(t - 1) == ')' && inside_paren > 0)
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2183 t--;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2184
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2185 url_buf = g_strndup(c, t - c);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2186 tmpurlbuf = purple_unescape_html(url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2187 g_string_append_printf(ret, "<A HREF=\"%s%s\">%s</A>",
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2188 urlprefix,
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2189 tmpurlbuf, url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2190 g_free(tmpurlbuf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2191 g_free(url_buf);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2192 return t;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2193 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2194
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2195 return c;
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2196 }
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2197
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2198 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2199 purple_markup_linkify(const char *text)
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2200 {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2201 const char *c, *t, *q = NULL;
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2202 char *tmpurlbuf, *url_buf;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2203 gunichar g;
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2204 gboolean inside_html = FALSE;
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2205 int inside_paren = 0;
23979
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2206 GString *ret;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2207
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2208 if (text == NULL)
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2209 return NULL;
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2210
936d7ef5cece Add NULL checking to purple_markup_linkify().
Daniel Atallah <datallah@pidgin.im>
parents: 23850
diff changeset
2211 ret = g_string_new("");
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2212
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2213 c = text;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2214 while (*c) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2215
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2216 if(*c == '(' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2217 inside_paren++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2218 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2219 c++;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2220 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2221
8538
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2222 if(inside_html) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2223 if(*c == '>') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2224 inside_html = FALSE;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2225 } else if(!q && (*c == '\"' || *c == '\'')) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2226 q = c;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2227 } else if(q) {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2228 if(*c == *q)
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2229 q = NULL;
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2230 }
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2231 } else if(*c == '<') {
b84f47107efb [gaim-migrate @ 9279]
Nathan Walp <nwalp@pidgin.im>
parents: 8534
diff changeset
2232 inside_html = TRUE;
9077
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2233 if (!g_ascii_strncasecmp(c, "<A", 2)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2234 while (1) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2235 if (!g_ascii_strncasecmp(c, "/A>", 3)) {
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2236 inside_html = FALSE;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2237 break;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2238 }
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2239 ret = g_string_append_c(ret, *c);
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2240 c++;
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2241 if (!(*c))
cf0a9a478394 [gaim-migrate @ 9853]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9054
diff changeset
2242 break;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2243 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2244 }
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2245 } else if (!g_ascii_strncasecmp(c, "http://", 7)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2246 c = process_link(ret, text, c, 7, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2247 } else if (!g_ascii_strncasecmp(c, "https://", 8)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2248 c = process_link(ret, text, c, 8, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2249 } else if (!g_ascii_strncasecmp(c, "ftp://", 6)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2250 c = process_link(ret, text, c, 6, "", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2251 } else if (!g_ascii_strncasecmp(c, "sftp://", 7)) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2252 c = process_link(ret, text, c, 7, "", inside_paren);
30412
b5992fc34f0f Linkify file://
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30411
diff changeset
2253 } else if (!g_ascii_strncasecmp(c, "file://", 7)) {
b5992fc34f0f Linkify file://
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30411
diff changeset
2254 c = process_link(ret, text, c, 7, "", inside_paren);
30411
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2255 } else if (!g_ascii_strncasecmp(c, "www.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2256 c = process_link(ret, text, c, 4, "http://", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2257 } else if (!g_ascii_strncasecmp(c, "ftp.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2258 c = process_link(ret, text, c, 4, "ftp://", inside_paren);
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2259 } else if (!g_ascii_strncasecmp(c, "xmpp:", 5) && (c == text || badchar(c[-1]) || badentity(c-1))) {
f4a0d77a5504 Remove code duplications, and some invalid memory reads.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30268
diff changeset
2260 c = process_link(ret, text, c, 5, "", inside_paren);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2261 } else if (!g_ascii_strncasecmp(c, "mailto:", 7)) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2262 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2263 while (1) {
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2264 if (badchar(*t) || badentity(t)) {
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2265 char *d;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2266 if (t - c == 7) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2267 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2268 }
30413
01ee7dd615b7 Prevent an invalid read when a message starts with 'mailto:'.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30412
diff changeset
2269 if (t > text && *(t - 1) == '.')
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2270 t--;
17254
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2271 if ((d = strstr(c + 7, "?")) != NULL && d < t)
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2272 url_buf = g_strndup(c + 7, d - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2273 else
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2274 url_buf = g_strndup(c + 7, t - c - 7);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2275 if (!purple_email_is_valid(url_buf)) {
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2276 g_free(url_buf);
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2277 break;
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2278 }
1642240525c6 Linkify xmpp: URIs
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 17143
diff changeset
2279 g_free(url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2280 url_buf = g_strndup(c, t - c);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2281 tmpurlbuf = purple_unescape_html(url_buf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2282 g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2283 tmpurlbuf, url_buf);
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2284 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2285 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2286 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2287 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2288 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2289 t++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2290 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2291 } else if (c != text && (*c == '@')) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2292 int flag;
10905
56943fe311c2 [gaim-migrate @ 12634]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10902
diff changeset
2293 GString *gurl_buf = NULL;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2294 const char illegal_chars[] = "!@#$%^&*()[]{}/|\\<>\":;\r\n \0";
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2295
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2296 if (strchr(illegal_chars,*(c - 1)) || strchr(illegal_chars, *(c + 1)))
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2297 flag = 0;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2298 else {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2299 flag = 1;
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2300 gurl_buf = g_string_new("");
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2301 }
7107
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 t = c;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2304 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2305 /* iterate backwards grabbing the local part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2306 g = g_utf8_get_char(t);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2307 if (badchar(*t) || (g >= 127) || (*t == '(') ||
11176
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2308 ((*t == ';') && ((t > (text+2) && (!g_ascii_strncasecmp(t - 3, "&lt;", 4) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2309 !g_ascii_strncasecmp(t - 3, "&gt;", 4))) ||
a7b860aa756e [gaim-migrate @ 13283]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11153
diff changeset
2310 (t > (text+4) && (!g_ascii_strncasecmp(t - 5, "&quot;", 6)))))) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2311 /* local part will already be part of ret, strip it out */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2312 ret = g_string_truncate(ret, ret->len - (c - t));
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2313 ret = g_string_append_unichar(ret, g);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2314 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2315 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2316 g_string_prepend_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2317 t = g_utf8_find_prev_char(text, t);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2318 if (t < text) {
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2319 ret = g_string_assign(ret, "");
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2320 break;
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 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2324
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2325 t = g_utf8_find_next_char(c, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2326
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2327 while (flag) {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2328 /* iterate forwards grabbing the domain part of an email address */
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2329 g = g_utf8_get_char(t);
10461
8125858d1d5f [gaim-migrate @ 11733]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10459
diff changeset
2330 if (badchar(*t) || (g >= 127) || (*t == ')') || badentity(t)) {
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2331 char *d;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2332
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2333 url_buf = g_string_free(gurl_buf, FALSE);
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2334
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2335 /* strip off trailing periods */
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2336 if (strlen(url_buf) > 0) {
40981
71df0a528a5a Fix an out of bounds write in purple_markup_linkify.
Gary Kramlich <grim@reaperworld.com>
parents: 40922
diff changeset
2337 for (d = url_buf + strlen(url_buf) - 1; (d >= url_buf) && (*d == '.'); d--, t--) {
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2338 *d = '\0';
40981
71df0a528a5a Fix an out of bounds write in purple_markup_linkify.
Gary Kramlich <grim@reaperworld.com>
parents: 40922
diff changeset
2339 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2340 }
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2341
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2342 tmpurlbuf = purple_unescape_html(url_buf);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2343 if (purple_email_is_valid(tmpurlbuf)) {
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2344 g_string_append_printf(ret, "<A HREF=\"mailto:%s\">%s</A>",
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2345 tmpurlbuf, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2346 } else {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2347 g_string_append(ret, url_buf);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
2348 }
10902
7b3ac6bd1bba [gaim-migrate @ 12624]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10876
diff changeset
2349 g_free(url_buf);
8918
fe48c4ae8274 [gaim-migrate @ 9688]
Tim Ringenbach <marv@pidgin.im>
parents: 8907
diff changeset
2350 g_free(tmpurlbuf);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2351 c = t;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2352
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2353 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2354 } else {
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2355 g_string_append_unichar(gurl_buf, g);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2356 t = g_utf8_find_next_char(t, NULL);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2357 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2358 }
9222
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2359 }
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2360
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2361 if(*c == ')' && !inside_html) {
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2362 inside_paren--;
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2363 ret = g_string_append_c(ret, *c);
e15847e6086a [gaim-migrate @ 10018]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 9220
diff changeset
2364 c++;
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2365 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2366
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2367 if (*c == 0)
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2368 break;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2369
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2370 ret = g_string_append_c(ret, *c);
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2371 c++;
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2372
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2373 }
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2374 return g_string_free(ret, FALSE);
7107
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2375 }
903864ff76c3 [gaim-migrate @ 7672]
Christian Hammond <chipx86@chipx86.com>
parents: 7106
diff changeset
2376
29697
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2377 char *purple_unescape_text(const char *in)
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2378 {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2379 GString *ret;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2380 const char *c = in;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2381
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2382 if (in == NULL)
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2383 return NULL;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2384
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2385 ret = g_string_new("");
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2386 while (*c) {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2387 int len;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2388 const char *ent;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2389
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2390 if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2391 g_string_append(ret, ent);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2392 c += len;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2393 } else {
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2394 g_string_append_c(ret, *c);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2395 c++;
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2396 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2397 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2398
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2399 return g_string_free(ret, FALSE);
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2400 }
dfeaa83ed16e Combine the three purple_unescape_text()s into one.
Paul Aurich <darkrain42@pidgin.im>
parents: 29686
diff changeset
2401
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2402 char *purple_unescape_html(const char *html)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2403 {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2404 GString *ret;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2405 const char *c = html;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2406
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2407 if (html == NULL)
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2408 return NULL;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2409
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2410 ret = g_string_new("");
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2411 while (*c) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2412 int len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2413 const char *ent;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2414
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2415 if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2416 g_string_append(ret, ent);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2417 c += len;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2418 } else if (!strncmp(c, "<br>", 4)) {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2419 g_string_append_c(ret, '\n');
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2420 c += 4;
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2421 } else {
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2422 g_string_append_c(ret, *c);
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2423 c++;
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2424 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2425 }
14101
89a79c2a971e [gaim-migrate @ 16643]
Mark Doliner <markdoliner@pidgin.im>
parents: 14097
diff changeset
2426
27509
fb3aa204bc5a Formatting changes, no functionality.
Mark Doliner <markdoliner@pidgin.im>
parents: 27479
diff changeset
2427 return g_string_free(ret, FALSE);
8442
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2428 }
e5d2b1c684bb [gaim-migrate @ 9172]
Tim Ringenbach <marv@pidgin.im>
parents: 8433
diff changeset
2429
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2430 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2431 purple_markup_slice(const char *str, guint x, guint y)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2432 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2433 GString *ret;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2434 GQueue *q;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2435 guint z = 0;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2436 gboolean appended = FALSE;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2437 gunichar c;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2438 char *tag;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2439
24641
ad3f1852b35a Fix CID #389
Richard Laager <rlaager@pidgin.im>
parents: 24492
diff changeset
2440 g_return_val_if_fail(str != NULL, NULL);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2441 g_return_val_if_fail(x <= y, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2442
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2443 if (x == y)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2444 return g_strdup("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2445
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2446 ret = g_string_new("");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2447 q = g_queue_new();
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2448
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2449 while (*str && (z < y)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2450 c = g_utf8_get_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2451
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2452 if (c == '<') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2453 char *end = strchr(str, '>');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2454
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2455 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2456 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2457 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2458 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2459 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2460 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2461 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2462
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2463 if (!g_ascii_strncasecmp(str, "<img ", 5)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2464 z += strlen("[Image]");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2465 } else if (!g_ascii_strncasecmp(str, "<br", 3)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2466 z += 1;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2467 } else if (!g_ascii_strncasecmp(str, "<hr>", 4)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2468 z += strlen("\n---\n");
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2469 } else if (!g_ascii_strncasecmp(str, "</", 2)) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2470 /* pop stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2471 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2472
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2473 tmp = g_queue_pop_head(q);
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
2474 g_free(tmp);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2475 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2476 } else {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2477 /* push it unto the stack */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2478 char *tmp;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2479
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2480 tmp = g_strndup(str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2481 g_queue_push_head(q, tmp);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2482 /* z += 0; */
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2483 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2484
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2485 if (z >= x) {
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2486 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2487 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2488
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2489 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2490 } else if (c == '&') {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2491 char *end = strchr(str, ';');
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2492 if (!end) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2493 g_string_free(ret, TRUE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2494 while ((tag = g_queue_pop_head(q)))
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2495 g_free(tag);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2496 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2497
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2498 return NULL;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2499 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2500
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2501 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2502 g_string_append_len(ret, str, end - str + 1);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2503
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2504 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2505 str = end;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2506 } else {
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2507 if (z == x && z > 0 && !appended) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2508 GList *l = q->tail;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2509
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2510 while (l) {
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2511 tag = l->data;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2512 g_string_append(ret, tag);
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2513 l = l->prev;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2514 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2515 appended = TRUE;
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2516 }
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2517
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2518 if (z >= x)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2519 g_string_append_unichar(ret, c);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2520 z++;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2521 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2522
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2523 str = g_utf8_next_char(str);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2524 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2525
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2526 while ((tag = g_queue_pop_head(q))) {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2527 char *name;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2528
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2529 name = purple_markup_get_tag_name(tag);
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2530 g_string_append_printf(ret, "</%s>", name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2531 g_free(name);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2532 g_free(tag);
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 g_queue_free(q);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2536 return g_string_free(ret, FALSE);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2537 }
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2538
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2539 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2540 purple_markup_get_tag_name(const char *tag)
9175
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2541 {
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2542 int i;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2543 g_return_val_if_fail(tag != NULL, NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2544 g_return_val_if_fail(*tag == '<', NULL);
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2545
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2546 for (i = 1; tag[i]; i++)
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2547 if (tag[i] == '>' || tag[i] == ' ' || tag[i] == '/')
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2548 break;
50bd82a24830 [gaim-migrate @ 9970]
Tim Ringenbach <marv@pidgin.im>
parents: 9170
diff changeset
2549
13644
6c41d6b54bcb [gaim-migrate @ 16041]
Tim Ringenbach <marv@pidgin.im>
parents: 13621
diff changeset
2550 return g_strndup(tag+1, i-1);
9175
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
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2553 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2554 * Path/Filename Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2555 **************************************************************************/
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2556 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2557 purple_home_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2558 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2559 #ifndef _WIN32
11665
6b80cef9b563 [gaim-migrate @ 13950]
Michael Carlson <corfe83@users.sourceforge.net>
parents: 11656
diff changeset
2560 return g_get_home_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2561 #else
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2562 return wpurple_data_dir();
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2563 #endif
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2564 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2565
16415
8cbcd9756090 Use ~/.purple only, never ~/.gaim. This is a revert of the functional
Richard Laager <rlaager@pidgin.im>
parents: 16230
diff changeset
2566 /* 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
2567 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2568 purple_user_dir(void)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2569 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2570 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
2571 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
2572 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
2573 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
2574
7d5a7a92d0f5 Rename the internal home_dir variable to user_dir to match the function and
Richard Laager <rlaager@pidgin.im>
parents: 20330
diff changeset
2575 return user_dir;
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2576 }
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2577
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2578 void purple_util_set_user_dir(const char *dir)
8596
6d70d45b8ea6 [gaim-migrate @ 9347]
Daniel Atallah <datallah@pidgin.im>
parents: 8577
diff changeset
2579 {
18219
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2580 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
2581
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2582 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
2583 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
2584 else
c95d2009a0c7 Use dynamically allocated strings for the user_dir caching. Do we need to
Richard Laager <rlaager@pidgin.im>
parents: 18203
diff changeset
2585 custom_user_dir = NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2586 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2587
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2588 int purple_build_dir (const char *path, int mode)
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2589 {
11361
b8c9532c9ffe [gaim-migrate @ 13585]
Nathan Walp <nwalp@pidgin.im>
parents: 11237
diff changeset
2590 return g_mkdir_with_parents(path, mode);
7612
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2591 }
4f5211591dbd [gaim-migrate @ 8236]
Ethan Blanton <elb@pidgin.im>
parents: 7564
diff changeset
2592
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2593 /*
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2594 * This function is long and beautiful, like my--um, yeah. Anyway,
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2595 * 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
2596 * 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
2597 */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2598 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
2599 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
2600 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2601 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
2602 gchar *filename_full;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2603 gboolean ret = FALSE;
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2604
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2605 g_return_val_if_fail(user_dir != NULL, FALSE);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2606
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2607 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
2608 filename, user_dir);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2609
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2610 /* Ensure the user directory exists */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2611 if (!g_file_test(user_dir, G_FILE_TEST_IS_DIR))
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2612 {
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2613 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
2614 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2615 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
2616 user_dir, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2617 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2618 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2619 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2620
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2621 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
2622
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
2623 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
2624
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2625 g_free(filename_full);
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2626 return ret;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2627 }
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2628
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2629 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
2630 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
2631 {
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2632 gchar *filename_temp;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2633 FILE *file;
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2634 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
2635 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
2636 #ifndef HAVE_FILENO
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2637 int fd;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2638 #endif
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2639
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2640 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
2641 filename_full);
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2642
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
2643 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
2644
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2645 filename_temp = g_strdup_printf("%s.save", filename_full);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2646
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2647 /* Remove an old temporary file, if one exists */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2648 if (g_file_test(filename_temp, G_FILE_TEST_EXISTS))
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2649 {
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2650 if (g_unlink(filename_temp) == -1)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2651 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2652 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
2653 "%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
2654 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2655 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2656 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2657
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2658 /* Open file */
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2659 file = g_fopen(filename_temp, "wb");
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2660 if (file == NULL)
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2661 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2662 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
2663 "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
2664 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2665 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2666 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2667 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2668
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2669 /* 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
2670 real_size = (size == -1) ? strlen(data) : (size_t) size;
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2671 byteswritten = fwrite(data, 1, real_size, file);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2672
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2673 #ifdef HAVE_FILENO
35995
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2674 #ifndef _WIN32
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2675 /* Set file permissions */
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2676 if (fchmod(fileno(file), S_IRUSR | S_IWUSR) == -1) {
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2677 purple_debug_error("util", "Error setting permissions of "
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2678 "file %s: %s\n", filename_temp, g_strerror(errno));
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2679 }
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2680 #endif
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2681
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2682 /* 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
2683 * 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
2684 * 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
2685 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
2686 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
2687 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
2688 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
2689 fclose(file);
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2690 return FALSE;
eab0555e2eab jtb indirectly points out that we need a fflush() before the fsync(),
Ethan Blanton <elb@pidgin.im>
parents: 21421
diff changeset
2691 }
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2692 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
2693 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
2694 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
2695 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
2696 fclose(file);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2697 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2698 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2699 #endif
25888
d0fdd378a635 Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents: 25859
diff changeset
2700
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2701 /* Close file */
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2702 if (fclose(file) != 0)
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2703 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2704 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
2705 filename_temp, g_strerror(errno));
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2706 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2707 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2708 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2709
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2710 #ifndef HAVE_FILENO
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2711 /* 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
2712 * 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
2713 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
2714 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
2715 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
2716 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
2717 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2718 }
35995
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2719
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2720 #ifndef _WIN32
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2721 /* copy-pasta! */
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2722 if (fchmod(fd, S_IRUSR | S_IWUSR) == -1) {
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2723 purple_debug_error("util", "Error setting permissions of "
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2724 "file %s: %s\n", filename_temp, g_strerror(errno));
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2725 }
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2726 #endif
d0bbb2dad7f3 Fix some CWE-367 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35991
diff changeset
2727
21421
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2728 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
2729 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
2730 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
2731 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
2732 close(fd);
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2733 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2734 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2735 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
2736 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
2737 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
2738 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
2739 return FALSE;
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2740 }
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2741 #endif
1d0f0d592011 Manually fflush() files written with purple_util_write_data_to_file,
Ethan Blanton <elb@pidgin.im>
parents: 21389
diff changeset
2742
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2743 /* Ensure the file is the correct size */
10415
faceb835eb87 [gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents: 10414
diff changeset
2744 if (byteswritten != real_size)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2745 {
19501
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2746 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
2747 G_GSIZE_FORMAT " bytes "
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2748 "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
2749 "; 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
2750 filename_temp, byteswritten, real_size);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2751 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2752 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2753 }
36030
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2754 #ifndef __COVERITY__
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2755 /* Use stat to be absolutely sure.
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2756 * It causes TOCTOU coverity warning (against g_rename below),
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2757 * but it's not a threat for us.
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2758 */
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
2759 if ((g_stat(filename_temp, &st) == -1) || ((gsize)st.st_size != real_size))
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2760 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2761 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
2762 "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
2763 "full?\n",
4c14c89dcf02 - Add purple_util_write_data_to_file_absolute; glib's
William Ehlhardt <williamehlhardt@gmail.com>
parents: 19327
diff changeset
2764 filename_temp);
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2765 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2766 return FALSE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2767 }
36030
9a2250c4e9d1 Fix Coverity TOCTOU warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35999
diff changeset
2768 #endif /* __COVERITY__ */
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2769
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2770 /* Rename to the REAL name */
10589
4e10236e06d4 [gaim-migrate @ 11994]
Daniel Atallah <datallah@pidgin.im>
parents: 10569
diff changeset
2771 if (g_rename(filename_temp, filename_full) == -1)
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2772 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2773 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
2774 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
2775 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 g_free(filename_temp);
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2779
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2780 return TRUE;
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2781 }
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2782
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2783 xmlnode *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2784 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
2785 {
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
2786 return xmlnode_from_file(purple_user_dir(), filename, description, "util");
10425
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2787 }
d82cef15da95 [gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents: 10415
diff changeset
2788
10414
6b10b76933e1 [gaim-migrate @ 11664]
Mark Doliner <markdoliner@pidgin.im>
parents: 10372
diff changeset
2789 /*
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2790 * 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
2791 * 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
2792 * the space for the filepath.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2793 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2794 * 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
2795 * 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
2796 *
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2797 * Returns NULL on failure and cleans up after itself if so.
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2798 */
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2799 static const char *purple_mkstemp_templ = {"purpleXXXXXX"};
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2800
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2801 FILE *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2802 purple_mkstemp(char **fpath, gboolean binary)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2803 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2804 const gchar *tmpdir;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2805 int fd;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2806 FILE *fp = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2807
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2808 g_return_val_if_fail(fpath != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2809
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2810 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
2811 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
2812 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
2813 if(fd == -1) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2814 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2815 "Couldn't make \"%s\", error: %d\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2816 *fpath, errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2817 } else {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2818 if((fp = fdopen(fd, "r+")) == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2819 close(fd);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2820 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2821 "Couldn't fdopen(), error: %d\n", errno);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2822 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2823 }
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
2824
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2825 if(!fp) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2826 g_free(*fpath);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2827 *fpath = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2828 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2829 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2830 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2831 purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
13985
9d115b698045 [gaim-migrate @ 16439]
Mark Doliner <markdoliner@pidgin.im>
parents: 13836
diff changeset
2832 "g_get_tmp_dir() failed!\n");
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2833 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2834
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2835 return fp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2836 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2837
16437
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2838 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
2839 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
2840 {
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2841 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
2842 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
2843
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2844 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
2845 {
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
2846 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
2847 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
2848 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
2849 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
2850 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
2851 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
2852 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
2853 !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
2854 return "tif";
17603
22bb998de435 Where did ekse come from?
Richard Laager <rlaager@pidgin.im>
parents: 17602
diff changeset
2855 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
2856 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
2857 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2858
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2859 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
2860 }
7ff7c3405ea2 Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents: 16416
diff changeset
2861
26394
e97f7512b037 Add a note that this function could potentially be faster.
Mark Doliner <markdoliner@pidgin.im>
parents: 25888
diff changeset
2862 /*
27662
afdc8aac00d9 Update this comment. We talked about using CRC32 on the devel list
Mark Doliner <markdoliner@pidgin.im>
parents: 27652
diff changeset
2863 * 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
2864 * 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
2865 * 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
2866 * 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
2867 */
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2868 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
2869 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
2870 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2871 PurpleCipherContext *context;
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2872 gchar digest[41];
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2873
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2874 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
2875 if (context == NULL)
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2876 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2877 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
2878 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
2879 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2880
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2881 /* Hash the image data */
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2882 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
2883 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
2884 {
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2885 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
2886 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
2887 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2888 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
2889
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
2890 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
2891 }
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
2892
7b8772af6bb7 Apply the custom smiley patches from #1187, from Jorge Villaseño (Masca) and
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22313
diff changeset
2893 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
2894 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
2895 {
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2896 /* Return the filename */
22444
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
2897 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
2898 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
2899 purple_util_get_image_extension(image_data, image_len));
22444
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
2900 g_free(checksum);
95f3e7fbd3ef Plug a leak.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22443
diff changeset
2901 return filename;
18101
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2902 }
3ce21b5a182c A patch from David Grohmann (dave1g) to log embedded images.
Richard Laager <rlaager@pidgin.im>
parents: 17389
diff changeset
2903
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2904 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2905 purple_program_is_valid(const char *program)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2906 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2907 GError *error = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2908 char **argv;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2909 gchar *progname;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2910 gboolean is_valid = FALSE;
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 g_return_val_if_fail(program != NULL, FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2913 g_return_val_if_fail(*program != '\0', FALSE);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2914
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2915 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
2916 purple_debug(PURPLE_DEBUG_ERROR, "program_is_valid",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2917 "Could not parse program '%s': %s\n",
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2918 program, error->message);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2919 g_error_free(error);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2920 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2921 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2922
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2923 if (argv == NULL) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2924 return FALSE;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2925 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2926
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2927 progname = g_find_program_in_path(argv[0]);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2928 is_valid = (progname != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2929
30797
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2930 if(purple_debug_is_verbose())
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2931 purple_debug_info("program_is_valid", "Tested program %s. %s.\n", program,
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2932 is_valid ? "Valid" : "Invalid");
2c0fe77a44bc Useful snippet of debugging that helped me out.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 30702
diff changeset
2933
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2934 g_strfreev(argv);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2935 g_free(progname);
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 return is_valid;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2938 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
2939
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2940
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2941 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2942 purple_running_gnome(void)
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2943 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2944 #ifndef _WIN32
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2945 gchar *tmp = g_find_program_in_path("gnome-open");
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2946
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2947 if (tmp == NULL)
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2948 return FALSE;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2949 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2950
21665
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
2951 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
2952
a1a724a89a03 Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21468
diff changeset
2953 return ((tmp != NULL) && (*tmp != '\0'));
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2954 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2955 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2956 #endif
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2957 }
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2958
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2959 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2960 purple_running_kde(void)
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2961 {
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2962 #ifndef _WIN32
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2963 gchar *tmp = g_find_program_in_path("kfmclient");
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2964 const char *session;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2965
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2966 if (tmp == NULL)
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2967 return FALSE;
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2968 g_free(tmp);
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2969
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2970 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
2971 if (purple_strequal(session, "true"))
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2972 return TRUE;
12483
38fc67810cdb [gaim-migrate @ 14795]
Richard Laager <rlaager@pidgin.im>
parents: 12110
diff changeset
2973
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2974 /* 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
2975 * 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
2976 * 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
2977 * 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
2978 return ((g_getenv("KDEDIR") != NULL) || g_getenv("KDEDIRS") != NULL);
13616
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2979 #else
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2980 return FALSE;
7cf0f845d2d6 [gaim-migrate @ 16001]
Daniel Atallah <datallah@pidgin.im>
parents: 13614
diff changeset
2981 #endif
11878
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2982 }
4c2661df91bb [gaim-migrate @ 14169]
Sean Egan <seanegan@pidgin.im>
parents: 11780
diff changeset
2983
15016
bdc3f402b3a0 [gaim-migrate @ 17733]
Luke Schierer <lschiere@pidgin.im>
parents: 14940
diff changeset
2984 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
2985 purple_running_osx(void)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2986 {
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
2987 #if defined(__APPLE__)
14708
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2988 return TRUE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2989 #else
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2990 return FALSE;
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2991 #endif
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2992 }
6006e069317c [gaim-migrate @ 17392]
Evan Schoenberg <evands@pidgin.im>
parents: 14648
diff changeset
2993
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2994 typedef union purple_sockaddr {
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2995 struct sockaddr sa;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2996 struct sockaddr_in sa_in;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2997 #if defined(AF_INET6)
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2998 struct sockaddr_in6 sa_in6;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
2999 #endif
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3000 struct sockaddr_storage sa_stor;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3001 } PurpleSockaddr;
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3002
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3003 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3004 purple_fd_get_ip(int fd)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3005 {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3006 PurpleSockaddr addr;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3007 socklen_t namelen = sizeof(addr);
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3008 int family;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3009
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3010 g_return_val_if_fail(fd != 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3011
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3012 if (getsockname(fd, &(addr.sa), &namelen))
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3013 return NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3014
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3015 family = addr.sa.sa_family;
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3016
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3017 if (family == AF_INET) {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3018 return g_strdup(inet_ntoa(addr.sa_in.sin_addr));
30026
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
3019 }
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
3020 #if defined(AF_INET6) && defined(HAVE_INET_NTOP)
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
3021 else if (family == AF_INET6) {
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3022 char host[INET6_ADDRSTRLEN];
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3023 const char *tmp;
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3024
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3025 tmp = inet_ntop(family, &(addr.sa_in6.sin6_addr), host, sizeof(host));
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3026 return g_strdup(tmp);
30026
4e07cacda11e util: Bah, AF_INET6 probably isn't always available
Paul Aurich <darkrain42@pidgin.im>
parents: 30025
diff changeset
3027 }
30025
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3028 #endif
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3029
065044c5f81e util: Make purple_fd_get_ip IPv6-aware
Paul Aurich <darkrain42@pidgin.im>
parents: 29924
diff changeset
3030 return NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3031 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3032
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3033 int
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3034 purple_socket_get_family(int fd)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3035 {
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3036 PurpleSockaddr addr;
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3037 socklen_t len = sizeof(addr);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3038
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3039 g_return_val_if_fail(fd >= 0, -1);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3040
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3041 if (getsockname(fd, &(addr.sa), &len))
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3042 return -1;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3043
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3044 return addr.sa.sa_family;
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3045 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3046
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3047 gboolean
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3048 purple_socket_speaks_ipv4(int fd)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3049 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3050 int family;
30031
db4c6d9395e2 util: Fix some strict-aliasing issues.
Paul Aurich <darkrain42@pidgin.im>
parents: 30028
diff changeset
3051
30027
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3052 g_return_val_if_fail(fd >= 0, FALSE);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3053
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3054 family = purple_socket_get_family(fd);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3055
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3056 switch (family) {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3057 case AF_INET:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3058 return TRUE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3059 #if defined(IPV6_V6ONLY)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3060 case AF_INET6:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3061 {
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3062 int val = 0;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3063 guint len = sizeof(val);
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3064
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3065 if (getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &val, &len) != 0)
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3066 return FALSE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3067 return !val;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3068 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3069 #endif
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3070 default:
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3071 return FALSE;
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3072 }
2ab6e591cf72 Add network listen functions that accept a family argument (AF_INET(6?)).
Paul Aurich <darkrain42@pidgin.im>
parents: 30026
diff changeset
3073 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3074
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3075 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3076 * String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3077 **************************************************************************/
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
3078 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
3079 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
3080 {
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
3081 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
3082 }
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
3083
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
3084 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3085 purple_normalize(const PurpleAccount *account, const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3086 {
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3087 const char *ret = NULL;
16610
815ce4002357 sadrul fixed the next but not last crash
Luke Schierer <lschiere@pidgin.im>
parents: 16557
diff changeset
3088 static char buf[BUF_LEN];
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3089
28410
184838e7f0c4 As darkrain pointed out this isnt caused by that certain bug in glib. My mistake. Recomment, and change how I test str to be NULL and return NULL.
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28407
diff changeset
3090 /* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
184838e7f0c4 As darkrain pointed out this isnt caused by that certain bug in glib. My mistake. Recomment, and change how I test str to be NULL and return NULL.
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28407
diff changeset
3091 g_return_val_if_fail(str != NULL, "");
28407
821a151ef20c g_utf8_normalize() for glib ver < 2.15.0 causes a crash when an invalid utf8 string is passed to it (http://bugzilla.gnome.org/show_bug.cgi?id=501997).
Sulabh Mahajan <sulabh@pidgin.im>
parents: 28390
diff changeset
3092
13620
1374da61a5e2 [gaim-migrate @ 16005]
Richard Laager <rlaager@pidgin.im>
parents: 13616
diff changeset
3093 if (account != NULL)
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3094 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3095 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
3096
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3097 if (prpl != NULL)
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3098 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3099 PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3100
28577
513297aa5f42 Minor cleanup. gc->prpl is guarranteed to be a PurplePlugin with
Mark Doliner <markdoliner@pidgin.im>
parents: 28538
diff changeset
3101 if (prpl_info->normalize)
13614
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3102 ret = prpl_info->normalize(account, str);
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3103 }
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3104 }
fa07a6cab773 [gaim-migrate @ 15999]
Richard Laager <rlaager@pidgin.im>
parents: 13586
diff changeset
3105
13621
788d329bdfa0 [gaim-migrate @ 16006]
Richard Laager <rlaager@pidgin.im>
parents: 13620
diff changeset
3106 if (ret == NULL)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3107 {
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3108 char *tmp;
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3109
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3110 tmp = g_utf8_normalize(str, -1, G_NORMALIZE_DEFAULT);
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3111 g_snprintf(buf, sizeof(buf), "%s", tmp);
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3112 g_free(tmp);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3113
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3114 ret = buf;
7261
4be05820d441 [gaim-migrate @ 7838]
Nathan Walp <nwalp@pidgin.im>
parents: 7162
diff changeset
3115 }
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3116
7430
bf3e9ac3302e [gaim-migrate @ 8034]
Nathan Walp <nwalp@pidgin.im>
parents: 7386
diff changeset
3117 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3118 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3119
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3120 /*
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3121 * You probably don't want to call this directly, it is
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3122 * mainly for use as a PRPL callback function. See the
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3123 * comments in util.h.
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3124 */
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3125 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3126 purple_normalize_nocase(const PurpleAccount *account, const char *str)
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3127 {
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3128 static char buf[BUF_LEN];
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3129 char *tmp1, *tmp2;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3130
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3131 g_return_val_if_fail(str != NULL, NULL);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3132
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3133 tmp1 = g_utf8_strdown(str, -1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3134 tmp2 = g_utf8_normalize(tmp1, -1, G_NORMALIZE_DEFAULT);
13646
3bf958a5e352 [gaim-migrate @ 16043]
Daniel Atallah <datallah@pidgin.im>
parents: 13644
diff changeset
3135 g_snprintf(buf, sizeof(buf), "%s", tmp2 ? tmp2 : "");
11153
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3136 g_free(tmp2);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3137 g_free(tmp1);
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3138
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3139 return buf;
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3140 }
b5c721366f2d [gaim-migrate @ 13235]
Evan Schoenberg <evands@pidgin.im>
parents: 11142
diff changeset
3141
8700
0c9288c5e40e [gaim-migrate @ 9453]
Mark Doliner <markdoliner@pidgin.im>
parents: 8686
diff changeset
3142 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3143 purple_strdup_withhtml(const gchar *src)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3144 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3145 gulong destsize, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3146 gchar *dest;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3147
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3148 g_return_val_if_fail(src != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3149
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3150 /* 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
3151 destsize = 1;
fb323d3eefee [gaim-migrate @ 16475]
Mark Doliner <markdoliner@pidgin.im>
parents: 13994
diff changeset
3152 for (i = 0; src[i] != '\0'; i++)
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3153 {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3154 if (src[i] == '\n')
13994
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3155 destsize += 4;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3156 else if (src[i] != '\r')
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3157 destsize++;
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3158 }
f3175c4c6d6a [gaim-migrate @ 16459]
Mark Doliner <markdoliner@pidgin.im>
parents: 13985
diff changeset
3159
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3160 dest = g_malloc(destsize);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3161
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3162 /* Copy stuff, ignoring \r's, because they are dumb */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3163 for (i = 0, j = 0; src[i] != '\0'; i++) {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3164 if (src[i] == '\n') {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3165 strcpy(&dest[j], "<BR>");
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3166 j += 4;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3167 } else if (src[i] != '\r')
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3168 dest[j++] = src[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3169 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3170
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3171 dest[destsize-1] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3172
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3173 return dest;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3174 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3175
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3176 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3177 purple_str_has_prefix(const char *s, const char *p)
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3178 {
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3179 return g_str_has_prefix(s, p);
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3180 }
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3181
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3182 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3183 purple_str_has_suffix(const char *s, const char *x)
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3184 {
11780
9aee3bde84b9 [gaim-migrate @ 14071]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11665
diff changeset
3185 return g_str_has_suffix(s, x);
7628
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3186 }
f76ce1d73e1c [gaim-migrate @ 8252]
Ethan Blanton <elb@pidgin.im>
parents: 7622
diff changeset
3187
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3188 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3189 purple_str_add_cr(const char *text)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3190 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3191 char *ret = NULL;
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3192 int count = 0, j;
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
3193 guint i;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3194
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3195 g_return_val_if_fail(text != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3196
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3197 if (text[0] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3198 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3199 for (i = 1; i < strlen(text); i++)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3200 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3201 count++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3202
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3203 if (count == 0)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3204 return g_strdup(text);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3205
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3206 ret = g_malloc0(strlen(text) + count + 1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3207
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3208 i = 0; j = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3209 if (text[i] == '\n')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3210 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3211 ret[j++] = text[i++];
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3212 for (; i < strlen(text); i++) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3213 if (text[i] == '\n' && text[i - 1] != '\r')
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3214 ret[j++] = '\r';
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3215 ret[j++] = text[i];
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
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3218 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3219 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3220
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3221 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3222 purple_str_strip_char(char *text, char thechar)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3223 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3224 int i, j;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3225
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3226 g_return_if_fail(text != NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3227
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3228 for (i = 0, j = 0; text[i]; i++)
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3229 if (text[i] != thechar)
11142
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
3230 text[j++] = text[i];
3ed4fc774b87 [gaim-migrate @ 13206]
Mark Doliner <markdoliner@pidgin.im>
parents: 11137
diff changeset
3231
30702
8a1938367841 These are dead increments.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30515
diff changeset
3232 text[j] = '\0';
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3233 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3234
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3235 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3236 purple_util_chrreplace(char *string, char delimiter,
11920
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3237 char replacement)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3238 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3239 int i = 0;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3240
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3241 g_return_if_fail(string != NULL);
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3242
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3243 while (string[i] != '\0')
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3244 {
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3245 if (string[i] == delimiter)
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3246 string[i] = replacement;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3247 i++;
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3248 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3249 }
be80617ec59b [gaim-migrate @ 14211]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 11878
diff changeset
3250
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3251 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3252 purple_strreplace(const char *string, const char *delimiter,
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3253 const char *replacement)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3254 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3255 gchar **split;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3256 gchar *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3257
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3258 g_return_val_if_fail(string != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3259 g_return_val_if_fail(delimiter != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3260 g_return_val_if_fail(replacement != NULL, NULL);
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 split = g_strsplit(string, delimiter, 0);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3263 ret = g_strjoinv(replacement, split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3264 g_strfreev(split);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3265
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3266 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3267 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3268
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3269 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3270 purple_strcasereplace(const char *string, const char *delimiter,
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3271 const char *replacement)
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3272 {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3273 gchar *ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3274 int length_del, length_rep, i, j;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3275
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3276 g_return_val_if_fail(string != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3277 g_return_val_if_fail(delimiter != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3278 g_return_val_if_fail(replacement != NULL, NULL);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3279
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3280 length_del = strlen(delimiter);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3281 length_rep = strlen(replacement);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3282
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3283 /* Count how many times the delimiter appears */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3284 i = 0; /* position in the source string */
8735
01248ea222d3 [gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents: 8700
diff changeset
3285 j = 0; /* number of occurrences of "delimiter" */
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3286 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
3287 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3288 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3289 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3290 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3291 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3292 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3293 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3294 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3295
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3296 ret = g_malloc(j+1);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3297
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3298 i = 0; /* position in the source string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3299 j = 0; /* position in the destination string */
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3300 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
3301 if (!g_ascii_strncasecmp(&string[i], delimiter, length_del)) {
8341
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3302 strncpy(&ret[j], replacement, length_rep);
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3303 i += length_del;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3304 j += length_rep;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3305 } else {
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3306 ret[j] = string[i];
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3307 i++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3308 j++;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3309 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3310 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3311
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3312 ret[j] = '\0';
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3313
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3314 return ret;
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3315 }
dc43b1acfc1a [gaim-migrate @ 9065]
Mark Doliner <markdoliner@pidgin.im>
parents: 8163
diff changeset
3316
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3317 /** TODO: Expose this when we can add API */
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3318 static const char *
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3319 purple_strcasestr_len(const char *haystack, gssize hlen, const char *needle, gssize nlen)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3320 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3321 const char *tmp, *ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3322
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3323 g_return_val_if_fail(haystack != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3324 g_return_val_if_fail(needle != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3325
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3326 if (hlen == -1)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3327 hlen = strlen(haystack);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3328 if (nlen == -1)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3329 nlen = strlen(needle);
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3330 tmp = haystack,
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3331 ret = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3332
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3333 g_return_val_if_fail(hlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3334 g_return_val_if_fail(nlen > 0, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3335
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3336 while (*tmp && !ret && (hlen - (tmp - haystack)) >= nlen) {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3337 if (!g_ascii_strncasecmp(needle, tmp, nlen))
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3338 ret = tmp;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3339 else
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3340 tmp++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3341 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3342
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3343 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3344 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3345
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3346 const char *
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3347 purple_strcasestr(const char *haystack, const char *needle)
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3348 {
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3349 return purple_strcasestr_len(haystack, -1, needle, -1);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3350 }
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3351
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3352 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3353 purple_str_size_to_units(size_t size)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3354 {
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
3355 static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB" };
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3356 float size_mag;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3357 int size_index = 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3358
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3359 if (size == (size_t)-1) {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3360 return g_strdup(_("Calculating..."));
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3361 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3362 else if (size == 0) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3363 return g_strdup(_("Unknown."));
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3364 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3365 else {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3366 size_mag = (float)size;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3367
10569
3324f62c07aa [gaim-migrate @ 11957]
Daniel Atallah <datallah@pidgin.im>
parents: 10506
diff changeset
3368 while ((size_index < 3) && (size_mag > 1024)) {
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3369 size_mag /= 1024;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3370 size_index++;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3371 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3372
10103
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3373 if (size_index == 0) {
11656
56f5e598dc6c [gaim-migrate @ 13940]
Richard Laager <rlaager@pidgin.im>
parents: 11552
diff changeset
3374 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
3375 } else {
5744088750bc [gaim-migrate @ 11130]
Caleb Gilmour <caleb_gilmour@users.sourceforge.net>
parents: 9940
diff changeset
3376 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
3377 }
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 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3380
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3381 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3382 purple_str_seconds_to_string(guint secs)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3383 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3384 char *ret = NULL;
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3385 guint days, hrs, mins;
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3386
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3387 if (secs < 60)
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3388 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3389 return g_strdup_printf(dngettext(PACKAGE, "%d second", "%d seconds", secs), secs);
9424
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3390 }
7b580e2e2e9e [gaim-migrate @ 10242]
Alan Ford
parents: 9341
diff changeset
3391
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3392 days = secs / (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3393 secs = secs % (60 * 60 * 24);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3394 hrs = secs / (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3395 secs = secs % (60 * 60);
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3396 mins = secs / 60;
40900
de9b3386381b Fix some issues scan-build found in util.c
Gary Kramlich <grim@reaperworld.com>
parents: 40758
diff changeset
3397 /* this is no longer used, but in case you need it it's here.. */
de9b3386381b Fix some issues scan-build found in util.c
Gary Kramlich <grim@reaperworld.com>
parents: 40758
diff changeset
3398 /* secs = secs % 60; */
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3399
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3400 if (days > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3401 {
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3402 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
3403 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3404
9233
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3405 if (hrs > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3406 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3407 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3408 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3409 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
3410 dngettext(PACKAGE, "%s, %d hour", "%s, %d hours", hrs),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3411 ret, hrs);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3412 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3413 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3414 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3415 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3416 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
3417 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3418
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3419 if (mins > 0)
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3420 {
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3421 if (ret != NULL)
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3422 {
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3423 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
3424 dngettext(PACKAGE, "%s, %d minute", "%s, %d minutes", mins),
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3425 ret, mins);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3426 g_free(ret);
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3427 ret = tmp;
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3428 }
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3429 else
16124
8e5e3e9ada60 Hopefully prevent libpurple causing problems for 3rd party UIs if they also
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 16078
diff changeset
3430 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
3431 }
41fb39a8d21e [gaim-migrate @ 10029]
Christian Hammond <chipx86@chipx86.com>
parents: 9230
diff changeset
3432
13098
48f8b34a76bf [gaim-migrate @ 15459]
Richard Laager <rlaager@pidgin.im>
parents: 13096
diff changeset
3433 return ret;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3434 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3435
9277
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3436
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3437 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3438 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
3439 {
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3440 GString *ret;
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3441 guint i;
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3442
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3443 g_return_val_if_fail(len > 0, NULL);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3444
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3445 ret = g_string_sized_new(len);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3446
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3447 for (i = 0; i < len; i++)
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3448 if (binary[i] < 32 || binary[i] > 126)
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3449 g_string_append_printf(ret, "\\x%02hhx", binary[i]);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3450 else if (binary[i] == '\\')
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3451 g_string_append(ret, "\\\\");
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3452 else
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3453 g_string_append_c(ret, binary[i]);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3454
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3455 return g_string_free(ret, FALSE);
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3456 }
08d5a10f91c6 [gaim-migrate @ 10080]
Tim Ringenbach <marv@pidgin.im>
parents: 9273
diff changeset
3457
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3458 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3459 * URI/URL Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
3460 **************************************************************************/
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
3461
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3462 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
3463 {
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
3464 char proto[11];
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3465 char delimiter;
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3466 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
3467 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
3468 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
3469 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
3470 if (!(tmp = strchr(uri, ':')) || tmp == uri) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3471 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
3472 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
3473 }
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
3474
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
3475 len = MIN(sizeof(proto) - 1, (gsize)(tmp - uri));
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3476
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
3477 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
3478 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
3479
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
3480 tmp++;
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3481
38256
035f00c4fd87 Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents: 38229
diff changeset
3482 if (purple_strequal(proto, "xmpp"))
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3483 delimiter = ';';
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3484 else
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3485 delimiter = '&';
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3486
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3487 purple_debug_info("util", "Processing message '%s' for protocol '%s' using delimiter '%c'.\n", tmp, proto, delimiter);
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3488
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
3489 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
3490 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
3491 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
3492
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
3493 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
3494 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
3495
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
3496 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
3497 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
3498
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
3499 while (*tmp || *pairstart) {
28136
a3b6446eb2c4 Add support for XMPP URIs on Windows. Closes #2326.
Paul Aurich <darkrain42@pidgin.im>
parents: 27902
diff changeset
3500 if (*tmp == delimiter || !(*tmp)) {
15678
7434ef155a3a Core support for external protocol URIs. The actual handling of the URIs will be in the prpls and other plugins. This commit only includes the win32 method of actually passing in a URI - the dbus implementation still needs to be written.
Daniel Atallah <datallah@pidgin.im>
parents: 15482
diff changeset
3501 /* 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
3502 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
3503 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
3504
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
3505 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
3506 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
3507 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
3508 /* 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
3509 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
3510 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
3511 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
3512 *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
3513 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
3514 }
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 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
3516 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
3517 } 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
3518 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
3519
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
3520 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
3521 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
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 } 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
3524 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
3525
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3526 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
3527
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 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
3529 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
3530 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
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
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3533 /*
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3534 * 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
3535 * 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
3536 * 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
3537 *
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3538 * 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
3539 * 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
3540 * 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
3541 * 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
3542 * 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
3543 */
7095
17d2b54254f8 [gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents: 7094
diff changeset
3544 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3545 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
3546 char **ret_path, char **ret_user, char **ret_passwd)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3547 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3548 gboolean is_https = FALSE;
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3549 const char * scan_info;
8118
7f5315bb4506 [gaim-migrate @ 8822]
Douglas Thrift <douglas@douglasthrift.net>
parents: 8088
diff changeset
3550 char port_str[6];
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3551 int f;
9341
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3552 const char *at, *slash;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3553 const char *turl;
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3554 char host[256], path[256], user[256], passwd[256];
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3555 int port = 0;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3556 /* hyphen at end includes it in control set */
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3557
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3558 #define ADDR_CTRL "A-Za-z0-9.-"
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3559 #define PORT_CTRL "0-9"
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3560 #define PAGE_CTRL "A-Za-z0-9.~_/:*!@&%%?=+^-"
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3561 #define USER_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3562 #define PASSWD_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3563
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3564 g_return_val_if_fail(url != NULL, FALSE);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3565
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3566 if ((turl = purple_strcasestr(url, "http://")) != NULL)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3567 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3568 turl += 7;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3569 url = turl;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3570 }
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3571 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
3572 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3573 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
3574 turl += 8;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3575 url = turl;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3576 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3577
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3578 /* parse out authentication information if supplied */
9341
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3579 /* Only care about @ char BEFORE the first / */
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3580 at = strchr(url, '@');
f626c11987e2 [gaim-migrate @ 10149]
Don Seiler <rizzo@gentoo.org>
parents: 9311
diff changeset
3581 slash = strchr(url, '/');
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3582 f = 0;
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3583 if (at && (!slash || at < slash)) {
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3584 scan_info = "%255[" USER_CTRL "]:%255[" PASSWD_CTRL "]^@";
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3585 f = sscanf(url, scan_info, user, passwd);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3586
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3587 if (f == 1) {
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3588 /* No passwd, possibly just username supplied */
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3589 scan_info = "%255[" USER_CTRL "]^@";
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3590 f = sscanf(url, scan_info, user);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3591 }
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3592
9230
5f34aa66ce4c [gaim-migrate @ 10026]
Nathan Walp <nwalp@pidgin.im>
parents: 9227
diff changeset
3593 url = at+1; /* move pointer after the @ char */
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3594 }
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3595
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3596 if (f < 1) {
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3597 *user = '\0';
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3598 *passwd = '\0';
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3599 } else if (f == 1)
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3600 *passwd = '\0';
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3601
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3602 scan_info = "%255[" ADDR_CTRL "]:%5[" PORT_CTRL "]/%255[" PAGE_CTRL "]";
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3603 f = sscanf(url, scan_info, host, port_str, path);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3604
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3605 if (f == 1)
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3606 {
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3607 scan_info = "%255[" ADDR_CTRL "]/%255[" PAGE_CTRL "]";
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3608 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
3609 /* 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
3610 if (is_https)
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3611 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
3612 else
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3613 g_snprintf(port_str, sizeof(port_str), "80");
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3614 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3615
24185
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3616 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
3617 *host = '\0';
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3618
dde166723de7 purple_url_parse() now gracefully handles a url which is wholly invalid.
Evan Schoenberg <evands@pidgin.im>
parents: 24177
diff changeset
3619 if (f <= 1)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3620 *path = '\0';
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3621
33809
d5e9c888ccd7 Add some error checking for sscanf usage (there are more places that could use this)
Daniel Atallah <datallah@pidgin.im>
parents: 33802
diff changeset
3622 if (sscanf(port_str, "%d", &port) != 1)
d5e9c888ccd7 Add some error checking for sscanf usage (there are more places that could use this)
Daniel Atallah <datallah@pidgin.im>
parents: 33802
diff changeset
3623 purple_debug_error("util", "Error parsing URL port from %s\n", url);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3624
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3625 if (ret_host != NULL) *ret_host = g_strdup(host);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3626 if (ret_port != NULL) *ret_port = port;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3627 if (ret_path != NULL) *ret_path = g_strdup(path);
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3628 if (ret_user != NULL) *ret_user = g_strdup(user);
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
3629 if (ret_passwd != NULL) *ret_passwd = g_strdup(passwd);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3630
24186
f5802c63a14e Return FALSE from purple_url_parse() if a host could not be determined
Evan Schoenberg <evands@pidgin.im>
parents: 24185
diff changeset
3631 return ((*host != '\0') ? TRUE : FALSE);
30515
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3632
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3633 #undef ADDR_CTRL
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3634 #undef PORT_CTRL
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3635 #undef PAGE_CTRL
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3636 #undef USER_CTRL
c82991b35371 Get rid of a few unnecessary strlen/g_snprintf's.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30444
diff changeset
3637 #undef PASSWD_CTRL
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3638 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3639
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3640 /**
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3641 * The arguments to this function are similar to printf.
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3642 */
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3643 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3644 purple_util_fetch_url_error(PurpleUtilFetchUrlData *gfud, const char *format, ...)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3645 {
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3646 gchar *error_message;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3647 va_list args;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3648
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3649 va_start(args, format);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3650 error_message = g_strdup_vprintf(format, args);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3651 va_end(args);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3652
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3653 gfud->callback(gfud, gfud->user_data, NULL, 0, error_message);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3654 g_free(error_message);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3655 purple_util_fetch_url_cancel(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3656 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3657
14465
2dacb84b7cb2 [gaim-migrate @ 17111]
Mark Doliner <markdoliner@pidgin.im>
parents: 14416
diff changeset
3658 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
3659 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
3660 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
3661
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3662 static gboolean
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3663 parse_redirect(const char *data, gsize data_len,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3664 PurpleUtilFetchUrlData *gfud)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3665 {
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3666 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
3667 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
3668 gboolean full;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3669 int len;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3670
21037
4861a7fc6708 When checking for redirects in purple_util_fetch_url(), look for
Mark Doliner <markdoliner@pidgin.im>
parents: 20992
diff changeset
3671 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
3672 /* 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
3673 return FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3674
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3675 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
3676 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
3677
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3678 /* 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
3679 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
3680 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
3681
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3682 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
3683 return FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3684
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3685 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
3686
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3687 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
3688 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
3689 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
3690
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3691 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
3692
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3693 if (*new_url == '/' || g_strstr_len(new_url, len, "://") == NULL)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3694 {
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3695 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
3696
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3697 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
3698 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
3699
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3700 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
3701
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3702 full = FALSE;
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3703 }
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3704
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3705 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
3706
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3707 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
3708 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
3709 {
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3710 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
3711 _("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
3712 gfud->url);
37392
b788e0305cc0 Fix memory leak in recursive URL parsing
dequis <dx@dxzone.com.ar
parents: 36256
diff changeset
3713 g_free(new_url);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3714 return TRUE;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3715 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3716
17541
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 * 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
3719 * 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
3720 * 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
3721 */
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3722 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
3723 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
3724 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
3725 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
3726 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
3727
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3728 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
3729 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
3730 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
3731 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
3732 } else {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3733 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
3734 gfud->inpa = 0;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3735 close(gfud->fd);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3736 gfud->fd = -1;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3737 }
17541
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3738 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
3739 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
3740 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
3741
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3742 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
3743 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
3744 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
3745 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
3746 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
3747 &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
3748
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3749 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
3750 gfud->is_ssl = TRUE;
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
3751 gfud->ssl_connection = purple_ssl_connect(gfud->account,
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3752 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
3753 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
3754 } else {
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
3755 gfud->connect_data = purple_proxy_connect(NULL, gfud->account,
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3756 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
3757 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
3758 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3759
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3760 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
3761 {
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3762 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
3763 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
3764 }
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3765
287a70d8189f Add some notes about why Yahoo! web messenger login doesn't work
Mark Doliner <markdoliner@pidgin.im>
parents: 17287
diff changeset
3766 return TRUE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3767 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3768
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3769 /* find the starting point of the content for the specified header and make
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3770 * sure that the content is safe to pass to sscanf */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3771 static const char *
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3772 find_header_content(const char *data, gsize data_len, const char *header)
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3773 {
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3774 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
3775
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3776 gsize header_len = strlen(header);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3777
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3778 if (data_len > header_len) {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3779 /* Check if the first header matches (data won't start with a \n") */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3780 if (header[0] == '\n')
28222
5643a627bc21 g_strncasecmp is deprecated. I thought I removed these already. Anyway, I
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28185
diff changeset
3781 p = (g_ascii_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3782 if (!p)
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3783 p = purple_strcasestr_len(data, data_len, header, header_len);
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3784 if (p)
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3785 p += header_len;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3786 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3787
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3788 /* 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
3789 * 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
3790 * 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
3791 */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3792 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
3793 return p;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3794 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3795
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3796 return NULL;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3797 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3798
38270
30170ae51b4d Remove fallback for glib version
qarkai <qarkai@gmail.com>
parents: 38256
diff changeset
3799 static gsize
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3800 parse_content_len(const char *data, gsize data_len)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3801 {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3802 gsize content_len = 0;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3803 const char *p = NULL;
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3804
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3805 p = find_header_content(data, data_len, "\nContent-Length: ");
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3806 if (p) {
35991
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
3807 if (sscanf(p, "%" G_GSIZE_FORMAT, &content_len) != 1) {
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
3808 purple_debug_warning("util", "invalid number format\n");
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
3809 content_len = 0;
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
3810 }
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
3811 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
3812 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3813
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3814 return content_len;
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3815 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3816
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3817 static gboolean
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3818 content_is_chunked(const char *data, gsize data_len)
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3819 {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3820 const char *p = find_header_content(data, data_len, "\nTransfer-Encoding: ");
28222
5643a627bc21 g_strncasecmp is deprecated. I thought I removed these already. Anyway, I
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28185
diff changeset
3821 if (p && g_ascii_strncasecmp(p, "chunked", 7) == 0)
27478
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3822 return TRUE;
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3823
59c53b8e5c3a Remove just a tad bit of indirection
Mark Doliner <markdoliner@pidgin.im>
parents: 27477
diff changeset
3824 return FALSE;
27462
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
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3827 /* Process in-place */
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3828 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
3829 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
3830 {
27477
0eaf20efffa7 Use unsigned lengths here and use %zu when reading into the gsize var
Mark Doliner <markdoliner@pidgin.im>
parents: 27465
diff changeset
3831 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
3832 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
3833 char *p = data;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3834 char *s = data;
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 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
3837 /* 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
3838 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
3839 {
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3840 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
3841 "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
3842 break;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3843 }
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3844 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
3845 /* 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
3846 /*
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3847 * 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
3848 * 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
3849 * 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
3850 */
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3851 break;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3852 }
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3853
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3854 /* 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
3855 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
3856 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
3857 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
3858 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
3859
35211
c9e5aba2dafd Correct HTTP chunked transfers code (not fixed in rev ebe3fb4a3bc2)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 35204
diff changeset
3860 if (sz > MAX_HTTP_CHUNK_SIZE || s + sz > data + *len) {
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3861 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
3862 "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
3863 "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
3864 G_GSIZE_FORMAT " bytes)\n", sz, data + *len - s);
35211
c9e5aba2dafd Correct HTTP chunked transfers code (not fixed in rev ebe3fb4a3bc2)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 35204
diff changeset
3865 break;
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3866 }
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3867
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3868 /* Move all data overtop of the chunk length that we read in earlier */
40758
cf9821fc48e7 g_memmove has been deprecated since glib 2.40 and recommends just using memmove
Gary Kramlich <grim@reaperworld.com>
parents: 40755
diff changeset
3869 memmove(p, s, sz);
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3870 p += sz;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3871 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
3872 newlen += sz;
35211
c9e5aba2dafd Correct HTTP chunked transfers code (not fixed in rev ebe3fb4a3bc2)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents: 35204
diff changeset
3873 if (*s == '\0' || (*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
3874 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
3875 "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
3876 break;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3877 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3878 s += 2;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3879 }
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3880
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3881 /* 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
3882 *p = 0;
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3883
27479
ebe3fb4a3bc2 A few changes to our code to handle chunked transfer-encodings (technically
Mark Doliner <markdoliner@pidgin.im>
parents: 27478
diff changeset
3884 *len = newlen;
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
3885 }
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3886
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3887 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3888 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
3889 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3890 PurpleUtilFetchUrlData *gfud = url_data;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3891 int len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3892 char buf[4096];
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3893 char *data_cursor;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
3894 gboolean got_eof = FALSE;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3895
35999
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3896 if (!gfud->is_ssl && source < 0) {
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3897 g_warn_if_reached();
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3898 len = -1;
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3899 errno = EINVAL;
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3900 }
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3901
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3902 /*
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3903 * 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
3904 * 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
3905 * 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
3906 */
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3907 while ((gfud->is_ssl && ((len = purple_ssl_read(gfud->ssl_connection, buf, sizeof(buf))) > 0)) ||
35999
5841bd4da162 Fix even more coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35998
diff changeset
3908 (!gfud->is_ssl && source >= 0 && (len = read(source, buf, sizeof(buf))) > 0))
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
3909 {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3910 if((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
3911 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
3912 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
3913 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
3914 }
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
3915
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3916 /* If we've filled up our buffer, make it bigger */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3917 if((gfud->len + len) >= gfud->data_len) {
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3918 while((gfud->len + len) >= gfud->data_len)
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3919 gfud->data_len += sizeof(buf);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3920
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3921 gfud->webdata = g_realloc(gfud->webdata, gfud->data_len);
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3922 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3923
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3924 data_cursor = gfud->webdata + gfud->len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3925
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3926 gfud->len += len;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3927
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3928 memcpy(data_cursor, buf, len);
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3929
11407
3f89b9b59ba9 [gaim-migrate @ 13642]
Federico G. Schwindt <fgsch@lodoss.net>
parents: 11361
diff changeset
3930 gfud->webdata[gfud->len] = '\0';
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
3931
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3932 if(!gfud->got_headers) {
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3933 char *end_of_headers;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3934
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3935 /* See if we've reached the end of the headers yet */
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3936 end_of_headers = strstr(gfud->webdata, "\r\n\r\n");
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3937 if (end_of_headers) {
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3938 guint header_len = (end_of_headers + 4 - gfud->webdata);
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3939 gsize content_len;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3940
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3941 purple_debug_misc("util", "Response headers: '%.*s'\n",
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3942 header_len, gfud->webdata);
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3943
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3944 /* See if we can find a redirect. */
23531
87a6c3eb9f47 Remove a unused variable
Mark Doliner <markdoliner@pidgin.im>
parents: 23507
diff changeset
3945 if(parse_redirect(gfud->webdata, header_len, gfud))
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3946 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3947
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
3948 gfud->got_headers = TRUE;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3949
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3950 /* No redirect. See if we can find a content length. */
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3951 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
3952 gfud->chunked = content_is_chunked(gfud->webdata, header_len);
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3953
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3954 if (content_len == 0) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3955 /* We'll stick with an initial 8192 */
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3956 content_len = 8192;
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3957 } else {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3958 gfud->has_explicit_data_len = TRUE;
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3959 if (content_len > gfud->max_len) {
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3960 purple_debug_error("util",
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3961 "Overriding explicit Content-Length of %" G_GSIZE_FORMAT " with max of %" G_GSSIZE_FORMAT "\n",
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3962 content_len, gfud->max_len);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3963 content_len = gfud->max_len;
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3964 }
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3965 }
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
3966
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3967
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3968 /* If we're returning the headers too, we don't need to clean them out */
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3969 if (gfud->include_headers) {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3970 char *new_data;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
3971 gfud->data_len = content_len + header_len;
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3972 new_data = g_try_realloc(gfud->webdata, gfud->data_len);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3973 if (new_data == NULL) {
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3974 purple_debug_error("util",
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3975 "Failed to allocate %" G_GSIZE_FORMAT " bytes: %s\n",
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3976 content_len, g_strerror(errno));
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3977 purple_util_fetch_url_error(gfud,
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3978 _("Unable to allocate enough memory to hold "
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3979 "the contents from %s. The web server may "
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3980 "be trying something malicious."),
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3981 gfud->website.address);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3982
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3983 return;
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3984 }
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3985 gfud->webdata = new_data;
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3986 } else {
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3987 char *new_data;
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
3988 gsize body_len = gfud->len - header_len;
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3989
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
3990 content_len = MAX(content_len, body_len);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3991
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
3992 new_data = g_try_malloc(content_len);
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
3993 if (new_data == NULL) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3994 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
3995 "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
3996 content_len, g_strerror(errno));
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
3997 purple_util_fetch_url_error(gfud,
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3998 _("Unable to allocate enough memory to hold "
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
3999 "the contents from %s. The web server may "
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4000 "be trying something malicious."),
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4001 gfud->website.address);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4002
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4003 return;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4004 }
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4005
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4006 /* We may have read part of the body when reading the headers, don't lose it */
31120
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
4007 if (body_len > 0) {
817530038335 Minor cleanup. Should be no functionality change, just a variable
Mark Doliner <markdoliner@pidgin.im>
parents: 31119
diff changeset
4008 memcpy(new_data, end_of_headers + 4, body_len);
12907
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4009 }
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4010
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4011 /* Out with the old... */
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4012 g_free(gfud->webdata);
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4013
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4014 /* In with the new. */
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4015 gfud->len = body_len;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4016 gfud->data_len = content_len;
5d2ed97ed7e3 [gaim-migrate @ 15260]
Daniel Atallah <datallah@pidgin.im>
parents: 12887
diff changeset
4017 gfud->webdata = new_data;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4018 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4019 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4020 }
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4021
13521
3739c2de7e00 [gaim-migrate @ 15896]
Daniel Atallah <datallah@pidgin.im>
parents: 13500
diff changeset
4022 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
4023 got_eof = TRUE;
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4024 break;
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4025 }
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4026 }
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4027
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4028 if(len < 0) {
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4029 if(errno == EAGAIN) {
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4030 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4031 } else {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4032 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
4033 gfud->website.address, g_strerror(errno));
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4034 return;
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4035 }
9240
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4036 }
52f712c0c976 [gaim-migrate @ 10039]
Ambrose Li <ambrose.li@gmail.com>
parents: 9233
diff changeset
4037
15021
ac53d5725886 [gaim-migrate @ 17738]
Evan Schoenberg <evands@pidgin.im>
parents: 15016
diff changeset
4038 if((len == 0) || got_eof) {
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4039 gfud->webdata = g_realloc(gfud->webdata, gfud->len + 1);
12109
10f7b7f64648 [gaim-migrate @ 14409]
Daniel Atallah <datallah@pidgin.im>
parents: 11920
diff changeset
4040 gfud->webdata[gfud->len] = '\0';
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4041
27462
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4042 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
4043 /* 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
4044 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
4045 }
f0069b4bddb7 Process the data correctly if the server sends chunked data.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 27361
diff changeset
4046
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4047 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
4048 purple_util_fetch_url_cancel(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4049 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4050 }
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4051
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4052 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
4053 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4054 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
4055 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4056
27344
608181252ce8 Allow doxygen to pick up the comment for this function. It's
Mark Doliner <markdoliner@pidgin.im>
parents: 27243
diff changeset
4057 /**
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4058 * 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
4059 * to.
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4060 *
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4061 * @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
4062 * 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
4063 * 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
4064 * 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
4065 * 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
4066 */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4067 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4068 url_fetch_send_cb(gpointer data, gint source, PurpleInputCondition cond)
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4069 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4070 PurpleUtilFetchUrlData *gfud;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4071 int len, total_len;
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4072
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4073 gfud = data;
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4074
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4075 if (gfud->request == NULL) {
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4076
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4077 PurpleProxyInfo *gpi = purple_proxy_get_setup(gfud->account);
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4078 GString *request_str = g_string_new(NULL);
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4079
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4080 g_string_append_printf(request_str, "GET %s%s HTTP/%s\r\n"
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4081 "Connection: close\r\n",
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4082 (gfud->full ? "" : "/"),
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4083 (gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4084 (gfud->http11 ? "1.1" : "1.0"));
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4085
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4086 if (gfud->user_agent)
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4087 g_string_append_printf(request_str, "User-Agent: %s\r\n", gfud->user_agent);
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4088
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4089 /* 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
4090 * 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
4091 * 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
4092 * 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
4093 */
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4094 g_string_append_printf(request_str, "Accept: */*\r\n"
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4095 "Host: %s\r\n",
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4096 (gfud->website.address ? gfud->website.address : ""));
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4097
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4098 if (purple_proxy_info_get_username(gpi) != NULL
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4099 && (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_ENVVAR
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4100 || purple_proxy_info_get_type(gpi) == PURPLE_PROXY_HTTP)) {
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4101 /* This chunk of code was copied from proxy.c http_start_connect_tunneling()
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4102 * This is really a temporary hack - we need a more complete proxy handling solution,
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4103 * so I didn't think it was worthwhile to refactor for reuse
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31120
diff changeset
4104 */
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4105 char *t1, *t2, *ntlm_type1;
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4106 char hostname[256];
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4107 int ret;
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31120
diff changeset
4108
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4109 ret = gethostname(hostname, sizeof(hostname));
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4110 hostname[sizeof(hostname) - 1] = '\0';
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4111 if (ret < 0 || hostname[0] == '\0') {
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4112 purple_debug_warning("util", "proxy - gethostname() failed -- is your hostname set?");
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4113 strcpy(hostname, "localhost");
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4114 }
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31120
diff changeset
4115
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4116 t1 = g_strdup_printf("%s:%s",
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4117 purple_proxy_info_get_username(gpi),
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4118 purple_proxy_info_get_password(gpi) ?
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4119 purple_proxy_info_get_password(gpi) : "");
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4120 t2 = purple_base64_encode((const guchar *)t1, strlen(t1));
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4121 g_free(t1);
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31120
diff changeset
4122
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4123 ntlm_type1 = purple_ntlm_gen_type1(hostname, "");
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31120
diff changeset
4124
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4125 g_string_append_printf(request_str,
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4126 "Proxy-Authorization: Basic %s\r\n"
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4127 "Proxy-Authorization: NTLM %s\r\n"
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4128 "Proxy-Connection: Keep-Alive\r\n",
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4129 t2, ntlm_type1);
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4130 g_free(ntlm_type1);
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4131 g_free(t2);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4132 }
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4133
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4134 g_string_append(request_str, "\r\n");
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4135
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4136 gfud->request = g_string_free(request_str, FALSE);
37696
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4137 gfud->request_len = strlen(gfud->request);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4138 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4139
27543
96889def856c Convert all uses of PURPLE_UNSAFE_DEBUG to the new API I added.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27528
diff changeset
4140 if(purple_debug_is_unsafe())
37895
b8f3613c8673 http: Use %.*s to debug print a non-null terminated string
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37696
diff changeset
4141 purple_debug_misc("util", "Request: '%.*s'\n", (int) gfud->request_len, gfud->request);
25763
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4142 else
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4143 purple_debug_misc("util", "request constructed\n");
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4144
37696
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4145 total_len = gfud->request_len;
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4146
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4147 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
4148 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
4149 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
4150 else
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4151 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
4152 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
4153
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4154 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
4155 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4156 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
4157 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
4158 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
4159 return;
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->request_written += len;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4162
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
4163 if (gfud->request_written < (gsize)total_len)
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4164 return;
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 /* 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
4167 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
4168 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
4169 gfud->inpa = 0;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4170 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
4171 } else {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4172 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
4173 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
4174 gfud);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4175 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4176 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4177
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4178 static void
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4179 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
4180 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4181 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4182
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4183 gfud = url_data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4184 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
4185
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4186 if (source == -1)
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 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
4189 (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
4190 return;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4191 }
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->fd = source;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4194
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4195 gfud->inpa = purple_input_add(source, PURPLE_INPUT_WRITE,
14144
ace3cb62001c [gaim-migrate @ 16703]
Mark Doliner <markdoliner@pidgin.im>
parents: 14101
diff changeset
4196 url_fetch_send_cb, gfud);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4197 url_fetch_send_cb(gfud, source, PURPLE_INPUT_WRITE);
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4198 }
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4199
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4200 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
4201 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4202 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4203
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4204 gfud = data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4205
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4206 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
4207 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
4208 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
4209 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4210
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4211 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
4212 {
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4213 PurpleUtilFetchUrlData *gfud;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4214
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4215 gfud = data;
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4216 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
4217
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4218 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
4219 (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
4220 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
4221 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4222
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4223 PurpleUtilFetchUrlData *
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4224 purple_util_fetch_url_request(const char *url, gboolean full,
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4225 const char *user_agent, gboolean http11,
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4226 const char *request, gboolean include_headers,
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4227 PurpleUtilFetchUrlCallback callback, void *user_data)
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4228 {
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4229 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
4230 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
4231 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
4232 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
4233 }
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4234
0cff24bf7dba Add temporary purple_util_fetch_url_request_len and purple_util_fetch_url_len
Daniel Atallah <datallah@pidgin.im>
parents: 23995
diff changeset
4235 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
4236 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
4237 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
4238 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
4239 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
4240 {
27192
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4241 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
4242 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
4243 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
4244 }
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4245
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4246 PurpleUtilFetchUrlData *
de49f0e36f18 Add yet another URL fetching function. This one takes an account as a
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27128
diff changeset
4247 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
4248 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
4249 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
4250 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
4251 {
37696
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4252 return purple_util_fetch_url_request_data_len_with_account(account, url, full,
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4253 user_agent, http11, request, request ? strlen (request) : 0, include_headers, max_len, callback,
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4254 user_data);
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4255 }
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4256
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4257 PurpleUtilFetchUrlData *
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4258 purple_util_fetch_url_request_data_len_with_account(PurpleAccount *account,
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4259 const char *url, gboolean full, const char *user_agent, gboolean http11,
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4260 const char *request, gsize request_len, gboolean include_headers, gssize max_len,
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4261 PurpleUtilFetchUrlCallback callback, void *user_data)
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4262 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4263 PurpleUtilFetchUrlData *gfud;
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4264
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4265 g_return_val_if_fail(url != NULL, NULL);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4266 g_return_val_if_fail(callback != NULL, NULL);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4267
27543
96889def856c Convert all uses of PURPLE_UNSAFE_DEBUG to the new API I added.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 27528
diff changeset
4268 if(purple_debug_is_unsafe())
25763
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4269 purple_debug_info("util",
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4270 "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
4271 url, full, user_agent?user_agent:"(null)", http11);
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4272 else
e9f0ad7afa7b *** Plucked rev c1ede5faf776dc1cc966dabb42c1ef0dbaea31db (rekkanoryo@pidgin.im):
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 25298
diff changeset
4273 purple_debug_info("util", "requesting to fetch a URL\n");
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4274
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4275 gfud = g_new0(PurpleUtilFetchUrlData, 1);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4276
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4277 gfud->callback = callback;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4278 gfud->user_data = user_data;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4279 gfud->url = g_strdup(url);
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
4280 gfud->user_agent = g_strdup(user_agent);
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4281 gfud->http11 = http11;
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4282 gfud->full = full;
40755
fb2056ce3c58 Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents: 39933
diff changeset
4283 gfud->request = request_len ? g_memdup2(request, request_len) : NULL;
37696
4d2e2182f901 Adding new API for fetch_url with binary request.
Youness Alaoui <kakaroto@kakaroto.homelinux.net>
parents: 37392
diff changeset
4284 gfud->request_len = request_len;
12887
4235bbee17b1 [gaim-migrate @ 15240]
Daniel Atallah <datallah@pidgin.im>
parents: 12880
diff changeset
4285 gfud->include_headers = include_headers;
20661
f7678627901e Initialize file-descriptors to -1.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 20656
diff changeset
4286 gfud->fd = -1;
35204
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
4287 if (max_len <= 0) {
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
4288 max_len = DEFAULT_MAX_HTTP_DOWNLOAD;
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
4289 purple_debug_error("util", "Defaulting max download from %s to %" G_GSSIZE_FORMAT "\n", url, max_len);
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
4290 }
cd529e1158d3 Fix purple_util_fetch_url_request variants to avoid implicitly trusting the
Daniel Atallah <datallah@pidgin.im>
parents: 33809
diff changeset
4291 gfud->max_len = (gsize) max_len;
30437
e2de518ff723 Attempt to improve handling of HTTP requests on port 80 when there is a HTTP
Daniel Atallah <datallah@pidgin.im>
parents: 30414
diff changeset
4292 gfud->account = account;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4293
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4294 purple_url_parse(url, &gfud->website.address, &gfud->website.port,
9227
95c28297b72c [gaim-migrate @ 10023]
Don Seiler <rizzo@gentoo.org>
parents: 9222
diff changeset
4295 &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4296
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4297 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
4298 if (!purple_ssl_is_supported()) {
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4299 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
4300 _("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
4301 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
4302 _("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
4303 return NULL;
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4304 }
7d709a8580b3 Add a friendly error message if something uses
Mark Doliner <markdoliner@pidgin.im>
parents: 26394
diff changeset
4305
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4306 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
4307 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
4308 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
4309 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
4310 } 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
4311 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
4312 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
4313 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
4314 }
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4315
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4316 if (gfud->ssl_connection == NULL && gfud->connect_data == NULL)
14151
34427f138b1f [gaim-migrate @ 16712]
Mark Doliner <markdoliner@pidgin.im>
parents: 14144
diff changeset
4317 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4318 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
4319 gfud->website.address);
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4320 return NULL;
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4321 }
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4322
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4323 return gfud;
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4324 }
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4325
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4326 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4327 purple_util_fetch_url_cancel(PurpleUtilFetchUrlData *gfud)
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4328 {
24857
c3c6b48534d8 Make our purple_util_fetch_url_request() function able to handle
Mark Doliner <markdoliner@pidgin.im>
parents: 24647
diff changeset
4329 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
4330 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
4331
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4332 if (gfud->connect_data != NULL)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4333 purple_proxy_connect_cancel(gfud->connect_data);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4334
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4335 if (gfud->inpa > 0)
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4336 purple_input_remove(gfud->inpa);
14416
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4337
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4338 if (gfud->fd >= 0)
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4339 close(gfud->fd);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4340
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4341 g_free(gfud->website.user);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4342 g_free(gfud->website.passwd);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4343 g_free(gfud->website.address);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4344 g_free(gfud->website.page);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4345 g_free(gfud->url);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4346 g_free(gfud->user_agent);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4347 g_free(gfud->request);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4348 g_free(gfud->webdata);
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4349
c95ffd983a39 [gaim-migrate @ 17060]
Mark Doliner <markdoliner@pidgin.im>
parents: 14395
diff changeset
4350 g_free(gfud);
7094
8f9588491993 [gaim-migrate @ 7659]
Christian Hammond <chipx86@chipx86.com>
parents: 7078
diff changeset
4351 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4352
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4353 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4354 purple_url_decode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4355 {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4356 static char buf[BUF_LEN];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
4357 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4358 char *bum;
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4359 char hex[3];
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4360
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4361 g_return_val_if_fail(str != NULL, NULL);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4362
9804
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4363 /*
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4364 * XXX - This check could be removed and buf could be made
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4365 * dynamically allocated, but this is easier.
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4366 */
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4367 if (strlen(str) >= BUF_LEN)
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4368 return NULL;
1fbe747c77aa [gaim-migrate @ 10672]
Mark Doliner <markdoliner@pidgin.im>
parents: 9786
diff changeset
4369
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4370 for (i = 0; i < strlen(str); i++) {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4371
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4372 if (str[i] != '%')
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4373 buf[j++] = str[i];
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4374 else {
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4375 strncpy(hex, str + ++i, 2);
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4376 hex[2] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4377
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4378 /* i is pointing to the start of the number */
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4379 i++;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4380
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4381 /*
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4382 * 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
4383 * will be at the next character.
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 buf[j++] = strtol(hex, NULL, 16);
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 }
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 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4390
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4391 if (!g_utf8_validate(buf, -1, (const char **)&bum))
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4392 *bum = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4393
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4394 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4395 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4396
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4397 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4398 purple_url_encode(const char *str)
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4399 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4400 const char *iter;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4401 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4402 char utf_char[6];
7631
0e9e516bb6c3 [gaim-migrate @ 8255]
Nathan Walp <nwalp@pidgin.im>
parents: 7628
diff changeset
4403 guint i, j = 0;
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4404
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4405 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4406 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
4407
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4408 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4409 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
4410 gunichar c = g_utf8_get_char(iter);
10800
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
4411 /* If the character is an ASCII character and is alphanumeric
00a2c404c1dc [gaim-migrate @ 12446]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10732
diff changeset
4412 * no need to escape */
28538
fb879aa298ee Change purple_url_encode() to not encode . _ - ~ because it's not
Mark Doliner <markdoliner@pidgin.im>
parents: 28438
diff changeset
4413 if (c < 128 && (isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~')) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4414 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4415 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4416 int bytes = g_unichar_to_utf8(c, utf_char);
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
4417 for (i = 0; (int)i < bytes; i++) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4418 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4419 break;
36037
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
4420 if (i >= sizeof(utf_char)) {
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
4421 g_warn_if_reached();
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
4422 break;
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
4423 }
28538
fb879aa298ee Change purple_url_encode() to not encode . _ - ~ because it's not
Mark Doliner <markdoliner@pidgin.im>
parents: 28438
diff changeset
4424 sprintf(buf + j, "%%%02X", utf_char[i] & 0xff);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4425 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
4426 }
7134
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4427 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4428 }
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4429
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4430 buf[j] = '\0';
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4431
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4432 return buf;
e999c4697e38 [gaim-migrate @ 7701]
Sean Egan <seanegan@pidgin.im>
parents: 7110
diff changeset
4433 }
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4434
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4435 /* Originally lifted from
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4436 * 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
4437 * ... and slightly modified to be a bit more rfc822 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4438 * ... and modified a bit more to make domain checking rfc1035 compliant
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4439 * 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
4440 * but not completely checking to avoid conflicts with IP addresses
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4441 */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4442 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4443 purple_email_is_valid(const char *address)
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4444 {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4445 const char *c, *domain;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4446 static char *rfc822_specials = "()<>@,;:\\\"[]";
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4447
24645
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
4448 g_return_val_if_fail(address != NULL, FALSE);
da3a357c07c1 Fix CID #385
Richard Laager <rlaager@pidgin.im>
parents: 24644
diff changeset
4449
30444
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
4450 if (*address == '.') return FALSE;
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
4451
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4452 /* first we validate the name portion (name@domain) (rfc822)*/
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4453 for (c = address; *c; c++) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4454 if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4455 while (*++c) {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4456 if (*c == '\\') {
38922
9f05d7f41a53 purple_email_is_valid: fix out of bounds read
dx <dx@dxzone.com.ar>
parents: 38737
diff changeset
4457 if (*c++ && *c < 127 && *c > 0 && *c != '\n' && *c != '\r') continue;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4458 else return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4459 }
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4460 if (*c == '\"') break;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4461 if (*c < ' ' || *c >= 127) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4462 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4463 if (!*c++) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4464 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4465 if (*c != '.') return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4466 continue;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4467 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4468 if (*c == '@') break;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4469 if (*c <= ' ' || *c >= 127) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4470 if (strchr(rfc822_specials, *c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4471 }
18871
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
4472
078df6ae587a Valgrind was showing "Invalid read of size 1" when a string is passed
Mark Doliner <markdoliner@pidgin.im>
parents: 18813
diff changeset
4473 /* 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
4474 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
4475
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4476 /* 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
4477 * we should permit user.@domain type addresses - they do work :) */
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4478 if (c == address) return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4479
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4480 /* next we validate the domain portion (name@domain) (rfc1035 & rfc1011) */
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4481 if (!*(domain = ++c)) return FALSE;
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4482 do {
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4483 if (*c == '.' && (c == domain || *(c - 1) == '.' || *(c - 1) == '-'))
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4484 return FALSE;
30444
d871c3fd6637 Catch some more invalid email addresses, thanks to Mark for additional
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 30437
diff changeset
4485 if (*c == '-' && (*(c - 1) == '.' || *(c - 1) == '@')) return FALSE;
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4486 if ((*c < '0' && *c != '-' && *c != '.') || (*c > '9' && *c < 'A') ||
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4487 (*c > 'Z' && *c < 'a') || (*c > 'z')) return FALSE;
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4488 } while (*++c);
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4489
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4490 if (*(c - 1) == '-') return FALSE;
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4491
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4492 return ((c - domain) > 3 ? TRUE : FALSE);
9045
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4493 }
c665ceb89b85 [gaim-migrate @ 9821]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 8976
diff changeset
4494
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
4495 gboolean
27732
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4496 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
4497 {
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
4498 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
4499 char end;
24643
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4500
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4501 g_return_val_if_fail(ip != NULL, FALSE);
f08461bd0827 Fix CID #387
Richard Laager <rlaager@pidgin.im>
parents: 24642
diff changeset
4502
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
4503 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
4504 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
4505 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
4506 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
4507 }
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
4508
27727
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4509 gboolean
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4510 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
4511 {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4512 const gchar *c;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4513 gboolean double_colon = FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4514 gint chunks = 1;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4515 gint in = 0;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4516
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4517 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
4518
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4519 if (*ip == '\0')
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4520 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4521
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4522 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
4523 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
4524 (*c >= 'a' && *c <= 'f') ||
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4525 (*c >= 'A' && *c <= 'F')) {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4526 if (++in > 4)
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4527 /* 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
4528 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4529 continue;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4530 } else if (*c == ':') {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4531 /* 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
4532 ++chunks;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4533 in = 0;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4534 if (*(c + 1) == ':') {
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4535 /*
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4536 * '::' 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
4537 * 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
4538 */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4539 if (double_colon)
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4540 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4541 double_colon = TRUE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4542 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4543 } else
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4544 return FALSE;
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4545 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4546
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4547 /*
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4548 * 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
4549 * 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
4550 */
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4551 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
4552 }
0c888674bbfc Add purple_ipv6_address_is_valid; guess what it does?
Paul Aurich <darkrain42@pidgin.im>
parents: 27707
diff changeset
4553
27732
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4554 /* 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
4555 gboolean
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4556 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
4557 {
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4558 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
4559 }
3df98cc829ac Added the function in util.h, forgot it here.
Paul Aurich <darkrain42@pidgin.im>
parents: 27727
diff changeset
4560
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4561 /* Stolen from gnome_uri_list_extract_uris */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4562 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4563 purple_uri_list_extract_uris(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4564 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4565 const gchar *p, *q;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4566 gchar *retval;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4567 GList *result = NULL;
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
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4571 p = uri_list;
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 /* 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
4574 * 2396, or even check for allowed characters - we just ignore
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4575 * comments and trim whitespace off the ends. We also
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4576 * allow LF delimination as well as the specified CRLF.
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4577 */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4578 while (p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4579 if (*p != '#') {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4580 while (isspace(*p))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4581 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4582
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4583 q = p;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4584 while (*q && (*q != '\n') && (*q != '\r'))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4585 q++;
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 if (q > p) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4588 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4589 while (q > p && isspace(*q))
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4590 q--;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4591
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4592 retval = (gchar*)g_malloc (q - p + 2);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4593 strncpy (retval, p, q - p + 1);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4594 retval[q - p + 1] = '\0';
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4595
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4596 result = g_list_prepend (result, retval);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4597 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4598 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4599 p = strchr (p, '\n');
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4600 if (p)
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4601 p++;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4602 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4603
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4604 return g_list_reverse (result);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4605 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4606
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4607
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4608 /* Stolen from gnome_uri_list_extract_filenames */
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4609 GList *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4610 purple_uri_list_extract_filenames(const gchar *uri_list)
11135
063678d038f9 [gaim-migrate @ 13196]
Mark Doliner <markdoliner@pidgin.im>
parents: 11132
diff changeset
4611 {
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4612 GList *tmp_list, *node, *result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4613
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4614 g_return_val_if_fail (uri_list != NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4615
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4616 result = purple_uri_list_extract_uris(uri_list);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4617
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4618 tmp_list = result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4619 while (tmp_list) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4620 gchar *s = (gchar*)tmp_list->data;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4621
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4622 node = tmp_list;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4623 tmp_list = tmp_list->next;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4624
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4625 if (!strncmp (s, "file:", 5)) {
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4626 node->data = g_filename_from_uri (s, NULL, NULL);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4627 /* not sure if this fallback is useful at all */
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4628 if (!node->data) node->data = g_strdup (s+5);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4629 } 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
4630 result = g_list_delete_link(result, node);
9670
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4631 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4632 g_free (s);
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4633 }
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4634 return result;
4e8cb7ef72ab [gaim-migrate @ 10522]
Daniel Atallah <datallah@pidgin.im>
parents: 9642
diff changeset
4635 }
9054
481fddb7dc5a [gaim-migrate @ 9830]
Tim Ringenbach <marv@pidgin.im>
parents: 9045
diff changeset
4636
38737
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4637 char *
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4638 purple_uri_escape_for_open(const char *unescaped)
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4639 {
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4640 /* Replace some special characters like $ with their percent-encoded value.
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4641 * This shouldn't be necessary because we shell-escape the entire arg before
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4642 * exec'ing the browser, however, we had a report that a URL containing
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4643 * $(xterm) was causing xterm to start on his system. This is obviously a
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4644 * bug on his system, but it's pretty easy for us to protect against it. */
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4645 return g_uri_escape_string(unescaped, "[]:;/%#,+?=&@", FALSE);
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4646 }
d85c241e3183 Add unit tests for xdg-open URI escaping
Daniel Kamil Kozar <dkk089@gmail.com>
parents: 38371
diff changeset
4647
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4648 /**************************************************************************
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4649 * UTF8 String Functions
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4650 **************************************************************************/
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4651 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4652 purple_utf8_try_convert(const char *str)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4653 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4654 gsize converted;
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4655 gchar *utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4656
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4657 g_return_val_if_fail(str != NULL, NULL);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4658
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4659 if (g_utf8_validate(str, -1, NULL)) {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4660 return g_strdup(str);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4661 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4662
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4663 utf8 = g_locale_to_utf8(str, -1, &converted, NULL, NULL);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4664 if (utf8 != NULL)
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4665 return utf8;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4666
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4667 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
4668 if ((utf8 != NULL) && (converted == strlen(str)))
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4669 return utf8;
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4670
14097
0c340861ab79 [gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents: 14002
diff changeset
4671 g_free(utf8);
9642
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4672
ec0b88cf9161 [gaim-migrate @ 10490]
Mark Doliner <markdoliner@pidgin.im>
parents: 9427
diff changeset
4673 return NULL;
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4674 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4675
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4676 #define utf8_first(x) ((x & 0x80) == 0 || (x & 0xe0) == 0xc0 \
33802
448dd56e312d Fix purple_utf8_salvage() to correctly identify the 4-byte start byte
Daniel Atallah <datallah@pidgin.im>
parents: 31731
diff changeset
4677 || (x & 0xf0) == 0xe0 || (x & 0xf8) == 0xf0)
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4678 gchar *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4679 purple_utf8_salvage(const char *str)
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4680 {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4681 GString *workstr;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4682 const char *end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4683
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4684 g_return_val_if_fail(str != NULL, NULL);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4685
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4686 workstr = g_string_sized_new(strlen(str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4687
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4688 do {
35991
e6937e52930b Fix some CWE-252 coverity warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35978
diff changeset
4689 (void)g_utf8_validate(str, -1, &end);
10258
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4690 workstr = g_string_append_len(workstr, str, end - str);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4691 str = end;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4692 if (*str == '\0')
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4693 break;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4694 do {
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4695 workstr = g_string_append_c(workstr, '?');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4696 str++;
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4697 } while (!utf8_first(*str));
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4698 } while (*str != '\0');
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4699
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4700 return g_string_free(workstr, FALSE);
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4701 }
21cfe876ca17 [gaim-migrate @ 11400]
Ethan Blanton <elb@pidgin.im>
parents: 10203
diff changeset
4702
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4703 gchar *
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4704 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
4705 {
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4706 gchar *workstr, *iter;
28389
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4707 const gchar *bad;
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4708
27243
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4709 if (str == NULL)
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4710 /* 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
4711 return NULL;
fb50a38b034b Strip unprintable UTF-8 characters from buddy list strings. Fixes #8776.
Paul Aurich <darkrain42@pidgin.im>
parents: 27237
diff changeset
4712
28390
5c701ddc9c81 Oops, I think it's either sleep or coffee time.
Paul Aurich <darkrain42@pidgin.im>
parents: 28389
diff changeset
4713 if (!g_utf8_validate(str, -1, &bad)) {
28389
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4714 purple_debug_error("util", "purple_utf8_strip_unprintables(%s) failed; "
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4715 "first bad character was %02x (%c)\n",
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4716 str, *bad, *bad);
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4717 g_return_val_if_reached(NULL);
3f6d1ba8a58b Add more verbose debugging to purple_utf8_strip_unprintables.
Paul Aurich <darkrain42@pidgin.im>
parents: 28388
diff changeset
4718 }
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4719
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4720 workstr = iter = g_new(gchar, strlen(str) + 1);
30143
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4721 while (*str) {
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4722 gunichar ch = g_utf8_get_char(str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4723 gchar *next = g_utf8_next_char(str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4724 /*
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4725 * Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] |
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4726 * [#x10000-#x10FFFF]
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4727 */
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4728 if ((ch == '\t' || ch == '\n' || ch == '\r') ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4729 (ch >= 0x20 && ch <= 0xD7FF) ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4730 (ch >= 0xE000 && ch <= 0xFFFD) ||
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4731 (ch >= 0x10000 && ch <= 0x10FFFF)) {
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4732 memcpy(iter, str, next - str);
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4733 iter += (next - str);
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4734 }
30143
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4735
468e3b69fd10 util: Better validation of the allowed character values in XML 1.0
Paul Aurich <darkrain42@pidgin.im>
parents: 30031
diff changeset
4736 str = next;
27237
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4737 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4738
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4739 /* 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
4740 *iter = '\0';
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4741
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4742 return workstr;
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4743 }
0643ac0e5658 Add purple_utf8_strip_unprintables and use it on outgoing XMPP messages.
Paul Aurich <darkrain42@pidgin.im>
parents: 27234
diff changeset
4744
21978
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4745 /*
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4746 * 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
4747 * gai_strerror().
637cf8396faf Add a comment that I took this from glib
Mark Doliner <markdoliner@pidgin.im>
parents: 21977
diff changeset
4748 */
39933
e3c4fde8a94a G_CONST_RETURN has been deprecated for awhile and honestly it's not necessary for us
Gary Kramlich <grim@reaperworld.com>
parents: 38922
diff changeset
4749 const gchar *
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4750 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
4751 {
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4752 #if GLIB_CHECK_VERSION(2, 32, 0)
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4753 static GPrivate msg_private = G_PRIVATE_INIT(g_free);
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4754 #else
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4755 static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4756 #endif
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4757 char *msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4758 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
4759
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4760 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
4761
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4762 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
4763 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
4764 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4765 /* 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
4766 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
4767 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
4768 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4769 else
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4770 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4771 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
4772 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
4773 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4774 /* 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
4775 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
4776 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
4777
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4778 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
4779 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
4780 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
4781 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4782 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4783
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4784 #if GLIB_CHECK_VERSION(2, 32, 0)
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4785 msg = g_private_get(&msg_private);
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4786 #else
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4787 msg = g_static_private_get(&msg_private);
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4788 #endif
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4789 if (!msg)
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4790 {
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4791 msg = g_new(gchar, 64);
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4792 #if GLIB_CHECK_VERSION(2, 32, 0)
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4793 g_private_set(&msg_private, msg);
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4794 #else
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4795 g_static_private_set(&msg_private, msg, g_free);
35978
c0b60f37a7db Backport warning fixes for libpurple from default
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 35966
diff changeset
4796 #endif
21977
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4797 }
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4798
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4799 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
4800
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4801 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
4802 return msg;
c87889698afb Create a purple_gai_strerror() function similar to g_str_error() which
Mark Doliner <markdoliner@pidgin.im>
parents: 21909
diff changeset
4803 }
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4804
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4805 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4806 purple_utf8_ncr_encode(const char *str)
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4807 {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4808 GString *out;
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4809
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4810 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4811 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
4812
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4813 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4814
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4815 for(; *str; str = g_utf8_next_char(str)) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4816 gunichar wc = g_utf8_get_char(str);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4817
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4818 /* super simple check. hopefully not too wrong. */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4819 if(wc >= 0x80) {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4820 g_string_append_printf(out, "&#%u;", (guint32) wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4821 } else {
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4822 g_string_append_unichar(out, wc);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4823 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4824 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4825
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4826 return g_string_free(out, FALSE);
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4827 }
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4828
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4829
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4830 char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4831 purple_utf8_ncr_decode(const char *str)
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4832 {
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4833 GString *out;
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4834 char *buf, *b;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4835
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4836 g_return_val_if_fail(str != NULL, NULL);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4837 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
4838
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4839 buf = (char *) str;
12813
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4840 out = g_string_new("");
6f67cfa0e6a0 [gaim-migrate @ 15161]
Christopher O'Brien <siege@pidgin.im>
parents: 12802
diff changeset
4841
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4842 while( (b = strstr(buf, "&#")) ) {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4843 gunichar wc;
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4844 int base = 0;
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4845
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4846 /* append everything leading up to the &# */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4847 g_string_append_len(out, buf, b-buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4848
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4849 b += 2; /* skip past the &# */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4850
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4851 /* 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
4852 if(*b == 'x' || *b == 'X') {
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4853 base = 16;
13489
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4854 b++;
6fbb8904f434 [gaim-migrate @ 15864]
Christopher O'Brien <siege@pidgin.im>
parents: 13465
diff changeset
4855 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4856
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4857 /* advances buf to the end of the ncr segment */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4858 wc = (gunichar) strtoul(b, &buf, base);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4859
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4860 /* this mimics the previous impl of ncr_decode */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4861 if(*buf == ';') {
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4862 g_string_append_unichar(out, wc);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4863 buf++;
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4864 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4865 }
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4866
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4867 /* append whatever's left */
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4868 g_string_append(out, buf);
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4869
9161
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4870 return g_string_free(out, FALSE);
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4871 }
0561de0af1c6 [gaim-migrate @ 9946]
Tim Ringenbach <marv@pidgin.im>
parents: 9160
diff changeset
4872
12880
eb39a798ff9a [gaim-migrate @ 15232]
Christopher O'Brien <siege@pidgin.im>
parents: 12813
diff changeset
4873
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4874 int
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4875 purple_utf8_strcasecmp(const char *a, const char *b)
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4876 {
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4877 char *a_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4878 char *b_norm = NULL;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4879 int ret = -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4880
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4881 if(!a && b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4882 return -1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4883 else if(!b && a)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4884 return 1;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4885 else if(!a && !b)
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4886 return 0;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4887
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4888 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
4889 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4890 purple_debug_error("purple_utf8_strcasecmp",
7108
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4891 "One or both parameters are invalid UTF8\n");
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4892 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4893 }
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4894
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4895 a_norm = g_utf8_casefold(a, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4896 b_norm = g_utf8_casefold(b, -1);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4897 ret = g_utf8_collate(a_norm, b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4898 g_free(a_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4899 g_free(b_norm);
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4900
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4901 return ret;
82655fa54acb [gaim-migrate @ 7673]
Christian Hammond <chipx86@chipx86.com>
parents: 7107
diff changeset
4902 }
7162
dfd30c70acde [gaim-migrate @ 7729]
Nathan Walp <nwalp@pidgin.im>
parents: 7134
diff changeset
4903
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4904 /* previously conversation::find_nick() */
13201
8c224ef70efa [gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents: 13164
diff changeset
4905 gboolean
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4906 purple_utf8_has_word(const char *haystack, const char *needle)
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4907 {
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4908 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
4909 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
4910 gunichar before, after;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4911 int n;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4912 gboolean ret = FALSE;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4913
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4914 start = hay = g_utf8_strdown(haystack, -1);
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4915
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4916 pin = g_utf8_strdown(needle, -1);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4917 n = strlen(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4918
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4919 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
4920 prev_char = g_utf8_find_prev_char(hay, p);
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
4921 before = (gunichar)-2;
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4922 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
4923 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
4924 }
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4925 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
4926
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4927 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
4928 /* 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
4929 ("!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
4930 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
4931 and isn't the '&' from a "&amp;" or some such entity*/
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
4932 (before != (gunichar)-2 && !g_unichar_isalnum(before) && *(p - 1) != '&'))
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
4933 && after != (gunichar)-2 && !g_unichar_isalnum(after)) {
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4934 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
4935 break;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4936 }
25276
b178d389afe0 Make purple_utf8_has_word() better about detecting word boundaries (still not
Daniel Atallah <datallah@pidgin.im>
parents: 24857
diff changeset
4937 start = p + 1;
11552
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4938 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4939
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4940 g_free(pin);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4941 g_free(hay);
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4942
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4943 return ret;
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4944 }
674a2a79943a [gaim-migrate @ 13812]
Casey Harkins <charkins@pidgin.im>
parents: 11493
diff changeset
4945
13090
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4946 void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4947 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
4948 {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4949 gchar *message_conv;
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4950 GError *error = NULL;
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4951
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4952 /* Try to convert 'message' to user's locale */
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4953 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
4954 if (message_conv != NULL) {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4955 fputs(message_conv, filestream);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4956 g_free(message_conv);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4957 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4958 else
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4959 {
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4960 /* use 'message' as a fallback */
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4961 g_warning("%s\n", error->message);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4962 g_error_free(error);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4963 fputs(message, filestream);
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4964 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4965 }
aee4ed853ff3 [gaim-migrate @ 15451]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents: 13033
diff changeset
4966
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
4967 gboolean purple_message_meify(char *message, gssize len)
7564
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4968 {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4969 char *c;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4970 gboolean inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4971
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4972 g_return_val_if_fail(message != NULL, FALSE);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4973
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4974 if(len == -1)
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4975 len = strlen(message);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4976
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4977 for (c = message; *c; c++, len--) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4978 if(inside_html) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4979 if(*c == '>')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4980 inside_html = FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4981 } else {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4982 if(*c == '<')
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4983 inside_html = TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4984 else
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4985 break;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4986 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4987 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4988
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4989 if(*c && !g_ascii_strncasecmp(c, "/me ", 4)) {
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4990 memmove(c, c+4, len-3);
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4991 return TRUE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4992 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4993
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4994 return FALSE;
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4995 }
baab99d239d8 [gaim-migrate @ 8180]
Nathan Walp <nwalp@pidgin.im>
parents: 7478
diff changeset
4996
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
4997 char *purple_text_strip_mnemonic(const char *in)
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4998 {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
4999 char *out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5000 char *a;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5001 char *a0;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5002 const char *b;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5003
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5004 g_return_val_if_fail(in != NULL, NULL);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5005
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5006 out = g_malloc(strlen(in)+1);
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5007 a = out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5008 b = in;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5009
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5010 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
5011
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5012 while(*b) {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5013 if(*b == '_') {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5014 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
5015 /* Detected CJK style shortcut (Bug 875311) */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5016 a = a0; /* undo the left parenthesis */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5017 b += 3; /* and skip the whole mess */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5018 } else if(*(b+1) == '_') {
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5019 *(a++) = '_';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5020 b += 2;
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5021 a0 = a;
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5022 } else {
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5023 b++;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5024 }
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5025 /* 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
5026 } else if (!(*b & 0x80)) { /* other 1-byte char */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5027 if (*b != ' ')
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5028 a0 = a;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5029 *(a++) = *(b++);
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5030 } else {
8561
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5031 /* Multibyte utf8 char, don't look for _ inside these */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5032 int n = 0;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5033 int i;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5034 if ((*b & 0xe0) == 0xc0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5035 n = 2;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5036 } else if ((*b & 0xf0) == 0xe0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5037 n = 3;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5038 } else if ((*b & 0xf8) == 0xf0) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5039 n = 4;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5040 } else if ((*b & 0xfc) == 0xf8) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5041 n = 5;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5042 } else if ((*b & 0xfe) == 0xfc) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5043 n = 6;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5044 } else { /* Illegal utf8 */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5045 n = 1;
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5046 }
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5047 a0 = a; /* unless we want to delete CJK spaces too */
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5048 for (i = 0; i < n && *b; i += 1) {
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5049 *(a++) = *(b++);
fb105b6434ef [gaim-migrate @ 9305]
Ambrose Li <ambrose.li@gmail.com>
parents: 8538
diff changeset
5050 }
7889
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5051 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5052 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5053 *a = '\0';
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5054
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5055 return out;
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5056 }
34cc5467bf55 [gaim-migrate @ 8547]
Nathan Walp <nwalp@pidgin.im>
parents: 7858
diff changeset
5057
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5058 const char* purple_unescape_filename(const char *escaped) {
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5059 return purple_url_decode(escaped);
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5060 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5061
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5062
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5063 /* 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
5064 * being used above), but we want to keep certain characters unescaped
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5065 * for compat reasons */
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5066 const char *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5067 purple_escape_filename(const char *str)
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5068 {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5069 const char *iter;
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5070 static char buf[BUF_LEN];
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5071 char utf_char[6];
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5072 guint i, j = 0;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5073
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5074 g_return_val_if_fail(str != NULL, NULL);
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5075 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
5076
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5077 iter = str;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5078 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
5079 gunichar c = g_utf8_get_char(iter);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5080 /* If the character is an ASCII character and is alphanumeric,
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5081 * 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
5082 if (c < 128 && (g_ascii_isalnum(c) || c == '@' || c == '-' ||
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5083 c == '_' || c == '.' || c == '#')) {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5084 buf[j++] = c;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5085 } else {
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5086 int bytes = g_unichar_to_utf8(c, utf_char);
36256
a437550a9308 Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 36037
diff changeset
5087 for (i = 0; (int)i < bytes; i++) {
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5088 if (j > (BUF_LEN - 4))
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5089 break;
36037
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
5090 if (i >= sizeof(utf_char)) {
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
5091 g_warn_if_reached();
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
5092 break;
e2ef692ff10a Fix outstaning Coverity bugs
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents: 36030
diff changeset
5093 }
10700
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5094 sprintf(buf + j, "%%%02x", utf_char[i] & 0xff);
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5095 j += 3;
93f5099b2775 [gaim-migrate @ 12273]
Daniel Atallah <datallah@pidgin.im>
parents: 10636
diff changeset
5096 }
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5097 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5098 }
30414
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5099 #ifdef _WIN32
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5100 /* File/Directory names in windows cannot end in periods/spaces.
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5101 * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5102 */
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5103 while (j > 0 && (buf[j - 1] == '.' || buf[j - 1] == ' '))
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5104 j--;
b334269e9ecf Apparently file/directory names in windows cannot end in periods/spaces.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 30413
diff changeset
5105 #endif
9926
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5106 buf[j] = '\0';
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5107
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5108 return buf;
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5109 }
9957e01fd88a [gaim-migrate @ 10818]
Nathan Walp <nwalp@pidgin.im>
parents: 9916
diff changeset
5110
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5111 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
5112 {
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
5113 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
5114 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
5115 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
5116 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
5117 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
5118 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
5119 }
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
5120 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
5121 }
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
5122
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15845
diff changeset
5123 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
5124 {
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
5125 #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
5126 #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
5127 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
5128 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
5129 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
5130 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
5131 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
5132 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
5133
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
5134 #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
5135 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
5136 #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
5137
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
5138 #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
5139 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
5140 #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
5141
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
5142 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
5143 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
5144 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
5145 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
5146 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
5147 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
5148 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
5149 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
5150 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
5151 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
5152 #endif /* HAVE_SIGNAL_H */
15726
03539465ace5 Merge fix and build fix for win32
Daniel Atallah <datallah@pidgin.im>
parents: 15725
diff changeset
5153 #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
5154 }
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5155
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5156 static void
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5157 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
5158 {
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5159 va_list args;
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5160 va_start(args, status);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5161 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
5162 va_end(args);
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5163 }
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5164
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5165 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
5166 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5167 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
5168 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
5169 PurplePresence *presence;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5170 PurpleStatus *tune;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5171 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
5172 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
5173 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5174
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5175 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
5176 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
5177 if (!tune)
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5178 continue;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5179 if (title) {
22217
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5180 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
5181 PURPLE_TUNE_TITLE, title,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5182 PURPLE_TUNE_ARTIST, artist,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5183 PURPLE_TUNE_ALBUM, album,
f06fcbcb6ca5 Make setting 'now listening' actually work, thanks to khc.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22181
diff changeset
5184 NULL);
22133
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5185 } else {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5186 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
5187 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5188 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5189 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5190
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5191 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
5192 {
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5193 GString *string;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5194 char *esc;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5195
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5196 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
5197 return NULL;
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5198
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5199 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
5200 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
5201 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
5202 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5203
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5204 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
5205 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
5206 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
5207 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5208 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5209
22181
4b62573becd9 Ignore both NULL and empty strings.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 22133
diff changeset
5210 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
5211 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
5212 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
5213 g_free(esc);
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5214 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5215
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5216 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
5217 }
6eb22afb9701 Utility functions to set and format song information. Closes #4398.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 21978
diff changeset
5218
23850
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5219 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
5220 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
5221 {
b68e174fffc2 Add purple_get_host_name to get the hostname of the machine.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents: 23531
diff changeset
5222 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
5223 }
29538
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5224
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5225 gchar *
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5226 purple_uuid_random(void)
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5227 {
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5228 guint32 tmp, a, b;
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5229
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5230 tmp = g_random_int();
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5231 a = 0x4000 | (tmp & 0xFFF); /* 0x4000 to 0x4FFF */
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5232 tmp >>= 12;
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5233 b = ((1 << 3) << 12) | (tmp & 0x3FFF); /* 0x8000 to 0xBFFF */
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5234
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5235 tmp = g_random_int();
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5236
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5237 return g_strdup_printf("%08x-%04x-%04x-%04x-%04x%08x",
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5238 g_random_int(),
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5239 tmp & 0xFFFF,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5240 a,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5241 b,
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5242 (tmp >> 16) & 0xFFFF, g_random_int());
f1c9c6791e98 Broke out the generation of random UUIDs to its own function
Marcus Lundblad <malu@pidgin.im>
parents: 29519
diff changeset
5243 }

mercurial