annotate mcabber/libjabber/str.c @ 401:84222be1f440

Kill a warning in the libjabber library This is useless change, but it prevents some gcc from complaining...
author Mikael Berthe <mikael@lilotux.net>
date Mon, 22 Aug 2005 20:32:11 +0200
parents bf3d6e241714
children c3ae9251c197
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
1 /*
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
2 * This program is free software; you can redistribute it and/or modify
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
3 * it under the terms of the GNU General Public License as published by
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
4 * the Free Software Foundation; either version 2 of the License, or
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
5 * (at your option) any later version.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
6 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
7 * This program is distributed in the hope that it will be useful,
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
8 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
10 * GNU General Public License for more details.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
11 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
12 * You should have received a copy of the GNU General Public License
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
13 * along with this program; if not, write to the Free Software
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
14 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
15 *
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
16 * Jabber
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
17 * Copyright (C) 1998-1999 The Jabber Team http://jabber.org/
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
18 */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
19
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
20 #include "libxode.h"
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
21
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
22 char *j_strdup(const char *str)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
23 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
24 if(str == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
25 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
26 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
27 return strdup(str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
28 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
29
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
30 char *j_strcat(char *dest, char *txt)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
31 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
32 if(!txt) return(dest);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
33
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
34 while(*txt)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
35 *dest++ = *txt++;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
36 *dest = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
37
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
38 return(dest);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
39 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
40
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
41 int j_strcmp(const char *a, const char *b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
42 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
43 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
44 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
45 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
46 return strcmp(a, b);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
47 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
48
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
49 int j_strcasecmp(const char *a, const char *b)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
50 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
51 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
52 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
53 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
54 return strcasecmp(a, b);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
55 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
56
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
57 int j_strncmp(const char *a, const char *b, int i)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
58 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
59 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
60 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
61 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
62 return strncmp(a, b, i);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
63 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
64
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
65 int j_strncasecmp(const char *a, const char *b, int i)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
66 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
67 if(a == NULL || b == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
68 return -1;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
69 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
70 return strncasecmp(a, b, i);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
71 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
72
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
73 int j_strlen(const char *a)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
74 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
75 if(a == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
76 return 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
77 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
78 return strlen(a);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
79 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
80
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
81 int j_atoi(const char *a, int def)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
82 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
83 if(a == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
84 return def;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
85 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
86 return atoi(a);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
87 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
88
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
89 spool spool_new(pool p)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
90 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
91 spool s;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
92
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
93 s = pmalloc(p, sizeof(struct spool_struct));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
94 s->p = p;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
95 s->len = 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
96 s->last = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
97 s->first = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
98 return s;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
99 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
100
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
101 void spool_add(spool s, char *str)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
102 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
103 struct spool_node *sn;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
104 int len;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
105
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
106 if(str == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
107 return;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
108
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
109 len = strlen(str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
110 if(len == 0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
111 return;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
112
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
113 sn = pmalloc(s->p, sizeof(struct spool_node));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
114 sn->c = pstrdup(s->p, str);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
115 sn->next = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
116
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
117 s->len += len;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
118 if(s->last != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
119 s->last->next = sn;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
120 s->last = sn;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
121 if(s->first == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
122 s->first = sn;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
123 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
124
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
125 void spooler(spool s, ...)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
126 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
127 va_list ap;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
128 char *arg = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
129
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
130 if(s == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
131 return;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
132
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
133 va_start(ap, s);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
134
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
135 /* loop till we hit our end flag, the first arg */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
136 while(1)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
137 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
138 arg = va_arg(ap,char *);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
139 if((int)arg == (int)s)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
140 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
141 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
142 spool_add(s, arg);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
143 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
144
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
145 va_end(ap);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
146 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
147
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
148 char *spool_print(spool s)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
149 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
150 char *ret,*tmp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
151 struct spool_node *next;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
152
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
153 if(s == NULL || s->len == 0 || s->first == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
154 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
155
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
156 ret = pmalloc(s->p, s->len + 1);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
157 *ret = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
158
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
159 next = s->first;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
160 tmp = ret;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
161 while(next != NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
162 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
163 tmp = j_strcat(tmp,next->c);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
164 next = next->next;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
165 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
166
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
167 return ret;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
168 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
169
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
170 /* convenience :) */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
171 char *spools(pool p, ...)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
172 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
173 va_list ap;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
174 spool s;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
175 char *arg = NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
176
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
177 if(p == NULL)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
178 return NULL;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
179
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
180 s = spool_new(p);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
181
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
182 va_start(ap, p);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
183
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
184 /* loop till we hit our end flag, the first arg */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
185 while(1)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
186 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
187 arg = va_arg(ap,char *);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
188 if((int)arg == (int)p)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
189 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
190 else
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
191 spool_add(s, arg);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
192 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
193
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
194 va_end(ap);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
195
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
196 return spool_print(s);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
197 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
198
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
199
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
200 char *strunescape(pool p, char *buf)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
201 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
202 int i,j=0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
203 char *temp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
204
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
205 if (p == NULL || buf == NULL) return(NULL);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
206
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
207 if (strchr(buf,'&') == NULL) return(buf);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
208
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
209 temp = pmalloc(p,strlen(buf)+1);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
210
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
211 if (temp == NULL) return(NULL);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
212
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
213 for(i=0;i<strlen(buf);i++)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
214 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
215 if (buf[i]=='&')
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
216 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
217 if (strncmp(&buf[i],"&amp;",5)==0)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
218 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
219 temp[j] = '&';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
220 i += 4;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
221 } else if (strncmp(&buf[i],"&quot;",6)==0) {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
222 temp[j] = '\"';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
223 i += 5;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
224 } else if (strncmp(&buf[i],"&apos;",6)==0) {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
225 temp[j] = '\'';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
226 i += 5;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
227 } else if (strncmp(&buf[i],"&lt;",4)==0) {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
228 temp[j] = '<';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
229 i += 3;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
230 } else if (strncmp(&buf[i],"&gt;",4)==0) {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
231 temp[j] = '>';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
232 i += 3;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
233 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
234 } else {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
235 temp[j]=buf[i];
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
236 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
237 j++;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
238 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
239 temp[j]='\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
240 return(temp);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
241 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
242
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
243
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
244 char *strescape(pool p, char *buf)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
245 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
246 int i,j,oldlen,newlen;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
247 char *temp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
248
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
249 if (p == NULL || buf == NULL) return(NULL);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
250
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
251 oldlen = newlen = strlen(buf);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
252 for(i=0;i<oldlen;i++)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
253 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
254 switch(buf[i])
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
255 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
256 case '&':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
257 newlen+=5;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
258 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
259 case '\'':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
260 newlen+=6;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
261 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
262 case '\"':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
263 newlen+=6;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
264 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
265 case '<':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
266 newlen+=4;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
267 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
268 case '>':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
269 newlen+=4;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
270 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
271 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
272 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
273
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
274 if(oldlen == newlen) return buf;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
275
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
276 temp = pmalloc(p,newlen+1);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
277
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
278 if (temp==NULL) return(NULL);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
279
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
280 for(i=j=0;i<oldlen;i++)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
281 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
282 switch(buf[i])
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
283 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
284 case '&':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
285 memcpy(&temp[j],"&amp;",5);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
286 j += 5;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
287 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
288 case '\'':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
289 memcpy(&temp[j],"&apos;",6);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
290 j += 6;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
291 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
292 case '\"':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
293 memcpy(&temp[j],"&quot;",6);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
294 j += 6;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
295 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
296 case '<':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
297 memcpy(&temp[j],"&lt;",4);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
298 j += 4;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
299 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
300 case '>':
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
301 memcpy(&temp[j],"&gt;",4);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
302 j += 4;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
303 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
304 default:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
305 temp[j++] = buf[i];
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
306 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
307 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
308 temp[j] = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
309 return temp;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
310 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
311
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
312 char *zonestr(char *file, int line)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
313 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
314 static char buff[64];
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
315 int i;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
316
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
317 i = snprintf(buff,63,"%s:%d",file,line);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
318 buff[i] = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
319
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
320 return buff;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
321 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
322
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
323 void str_b64decode(char* str)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
324 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
325 char *cur;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
326 int d, dlast, phase;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
327 unsigned char c;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
328 static int table[256] = {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
329 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 00-0F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
330 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 10-1F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
331 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, /* 20-2F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
332 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1, /* 30-3F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
333 -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, /* 40-4F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
334 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, /* 50-5F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
335 -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, /* 60-6F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
336 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, /* 70-7F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
337 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 80-8F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
338 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 90-9F */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
339 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* A0-AF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
340 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* B0-BF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
341 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* C0-CF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
342 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* D0-DF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
343 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* E0-EF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
344 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 /* F0-FF */
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
345 };
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
346
401
84222be1f440 Kill a warning in the libjabber library
Mikael Berthe <mikael@lilotux.net>
parents: 25
diff changeset
347 dlast = 0;
25
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
348 phase = 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
349 for (cur = str; *cur != '\0'; ++cur )
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
350 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
351 d = table[(int)*cur];
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
352 if(d != -1)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
353 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
354 switch(phase)
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
355 {
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
356 case 0:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
357 ++phase;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
358 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
359 case 1:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
360 c = ((dlast << 2) | ((d & 0x30) >> 4));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
361 *str++ = c;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
362 ++phase;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
363 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
364 case 2:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
365 c = (((dlast & 0xf) << 4) | ((d & 0x3c) >> 2));
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
366 *str++ = c;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
367 ++phase;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
368 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
369 case 3:
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
370 c = (((dlast & 0x03 ) << 6) | d);
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
371 *str++ = c;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
372 phase = 0;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
373 break;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
374 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
375 dlast = d;
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
376 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
377 }
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
378 *str = '\0';
bf3d6e241714 [/trunk] Changeset 41 by mikael
mikael
parents:
diff changeset
379 }