Mercurial > ~mikael > mcabber > hg
annotate mcabber/mcabber/utils.c @ 1910:3695266e16c7
Fix error presence packet handling.
This should also fix the segfault reported by pbd in issue #56.
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Thu, 13 May 2010 12:26:48 +0200 |
| parents | efd7c4c34ff2 |
| children | 0ba755e5dc48 |
| rev | line source |
|---|---|
| 241 | 1 /* |
| 2 * utils.c -- Various utility functions | |
| 393 | 3 * |
|
1729
e6e89b1d7831
Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents:
1674
diff
changeset
|
4 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net> |
| 1599 | 5 * Some of the ut_* functions are derived from Cabber debug/log code. |
| 1361 | 6 * from_iso8601() comes from the Pidgin (libpurple) project. |
| 241 | 7 * |
| 8 * This program is free software; you can redistribute it and/or modify | |
| 9 * it under the terms of the GNU General Public License as published by | |
| 10 * the Free Software Foundation; either version 2 of the License, or (at | |
| 11 * your option) any later version. | |
| 12 * | |
| 13 * This program is distributed in the hope that it will be useful, but | |
| 14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU General Public License | |
| 19 * along with this program; if not, write to the Free Software | |
| 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
| 21 * USA | |
| 22 */ | |
| 23 | |
| 1639 | 24 #include <config.h> |
| 25 | |
| 24 | 26 #include <stdio.h> |
| 27 #include <stdlib.h> | |
| 77 | 28 #include <string.h> |
| 24 | 29 #include <stdarg.h> |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
30 #include <errno.h> |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
31 |
| 1639 | 32 #ifdef HAVE_LIBIDN |
| 33 #include <idna.h> | |
| 34 #include <stringprep.h> | |
| 35 static char idnprep[1024]; | |
| 36 #endif | |
| 37 | |
| 38 #include <glib.h> | |
| 1598 | 39 #include <glib/gprintf.h> |
| 40 | |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
41 /* For Cygwin (thanks go to Yitzchak Scott-Thoennes) */ |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
42 #ifdef __CYGWIN__ |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
43 # define timezonevar |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
44 extern long timezone; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
45 #endif |
| 24 | 46 #include <time.h> |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
47 #include <unistd.h> |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
48 #include <sys/types.h> |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
49 #include <sys/stat.h> |
| 452 | 50 #include <ctype.h> |
| 24 | 51 |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
52 #include "utils.h" |
|
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
53 #include "logprint.h" |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
54 #include "settings.h" |
|
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
55 #include "main.h" |
| 241 | 56 |
| 76 | 57 static int DebugEnabled; |
| 77 | 58 static char *FName; |
| 24 | 59 |
| 1598 | 60 // jidtodisp(jid) |
| 61 // Strips the resource part from the jid | |
| 62 // The caller should g_free the result after use. | |
| 63 char *jidtodisp(const char *fjid) | |
| 64 { | |
| 65 char *ptr; | |
| 66 char *alias; | |
| 67 | |
|
1910
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
68 if (!fjid) { |
|
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
69 scr_LogPrint(LPRINT_LOGNORM, "** jidtodisp: NULL JID, " |
|
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
70 "this is probably a bug, please report!"); |
|
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
71 return NULL; |
|
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
72 } |
|
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
73 |
| 1598 | 74 alias = g_strdup(fjid); |
| 75 | |
| 76 if ((ptr = strchr(alias, JID_RESOURCE_SEPARATOR)) != NULL) { | |
| 77 *ptr = 0; | |
| 78 } | |
| 79 return alias; | |
| 80 } | |
| 81 | |
|
1611
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
82 char *jid_get_username(const char *fjid) |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
83 { |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
84 char *ptr; |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
85 char *username; |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
86 |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
87 username = g_strdup(fjid); |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
88 if ((ptr = strchr(username, JID_DOMAIN_SEPARATOR)) != NULL) { |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
89 *ptr = 0; |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
90 } |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
91 return username; |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
92 } |
|
f9bf561e54d0
Use the username for authentication, added jid_get_username() to utils.c
franky
parents:
1599
diff
changeset
|
93 |
| 1598 | 94 char *compose_jid(const char *username, const char *servername, |
| 95 const char *resource) | |
| 96 { | |
| 97 char *fjid; | |
| 98 | |
| 99 if (!strchr(username, JID_DOMAIN_SEPARATOR)) { | |
| 100 fjid = g_strdup_printf("%s%c%s%c%s", username, | |
| 101 JID_DOMAIN_SEPARATOR, servername, | |
| 102 JID_RESOURCE_SEPARATOR, resource); | |
| 103 } else { | |
| 104 fjid = g_strdup_printf("%s%c%s", username, | |
| 105 JID_RESOURCE_SEPARATOR, resource); | |
| 106 } | |
| 107 return fjid; | |
| 108 } | |
| 109 | |
| 110 gboolean jid_equal(const char *jid1, const char *jid2) | |
| 111 { | |
| 112 char *a,*b; | |
| 113 int ret; | |
| 114 if (!jid1 && !jid2) | |
| 115 return TRUE; | |
| 116 if (!jid1 || !jid2) | |
| 117 return FALSE; | |
| 118 | |
| 119 a = jidtodisp(jid1); | |
| 120 b = jidtodisp(jid2); | |
| 121 ret = strcasecmp(a, b); | |
| 122 g_free(a); | |
| 123 g_free(b); | |
| 124 return (ret == 0) ? TRUE : FALSE; | |
| 125 } | |
| 126 | |
|
1167
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
127 // expand_filename(filename) |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
128 // Expand "~/" with the $HOME env. variable in a file name. |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
129 // The caller must free the string after use. |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
130 char *expand_filename(const char *fname) |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
131 { |
|
1222
75aee46d3aee
Fix a problem with the ssl_ca{file,path} variables expansion
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
132 if (!fname) |
|
75aee46d3aee
Fix a problem with the ssl_ca{file,path} variables expansion
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
133 return NULL; |
|
1167
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
134 if (!strncmp(fname, "~/", 2)) { |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
135 char *homedir = getenv("HOME"); |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
136 if (homedir) |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
137 return g_strdup_printf("%s%s", homedir, fname+1); |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
138 } |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
139 return g_strdup(fname); |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
140 } |
|
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
141 |
| 1598 | 142 void fingerprint_to_hex(const unsigned char *fpr, char hex[49]) |
| 143 { | |
| 144 int i; | |
| 145 char *p; | |
| 146 | |
| 147 for (p = hex, i = 0; i < 15; i++, p+=3) | |
| 148 g_sprintf(p, "%02X:", fpr[i]); | |
| 149 g_sprintf(p, "%02X", fpr[i]); | |
| 150 hex[48] = '\0'; | |
| 151 } | |
| 152 | |
| 153 gboolean hex_to_fingerprint(const char *hex, char fpr[16]) | |
| 154 { | |
| 155 int i; | |
| 156 char *p; | |
| 157 | |
| 158 if (strlen(hex) != 47) | |
| 159 return FALSE; | |
| 160 for (i = 0, p = (char*)hex; *p && *(p+1); i++, p += 3) | |
| 161 fpr[i] = (char) g_ascii_strtoull (p, NULL, 16); | |
| 162 return TRUE; | |
| 163 } | |
| 164 | |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
165 static gboolean tracelog_create(void) |
| 24 | 166 { |
| 77 | 167 FILE *fp; |
|
428
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
168 struct stat buf; |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
169 int err; |
|
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
170 char *v; |
| 77 | 171 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
172 fp = fopen(FName, "a"); |
|
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
173 if (!fp) { |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
174 scr_LogPrint(LPRINT_NORMAL, "ERROR: Cannot open tracelog file: %s!", |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
175 strerror(errno)); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
176 return FALSE; |
|
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
177 } |
|
428
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
178 |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
179 err = fstat(fileno(fp), &buf); |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
180 if (err || buf.st_uid != geteuid()) { |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
181 fclose(fp); |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
182 if (err) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
183 scr_LogPrint(LPRINT_NORMAL, "ERROR: cannot stat the tracelog file: %s!", |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
184 strerror(errno)); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
185 else |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
186 scr_LogPrint(LPRINT_NORMAL, "ERROR: tracelog file does not belong to you!"); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
187 return FALSE; |
|
428
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
188 } |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
189 fchmod(fileno(fp), S_IRUSR|S_IWUSR); |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
190 |
|
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
191 v = mcabber_version(); |
|
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
192 fprintf(fp, "New trace log started. MCabber version %s\n" |
|
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
193 "----------------------\n", v); |
|
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
194 g_free(v); |
| 24 | 195 fclose(fp); |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
196 return TRUE; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
197 } |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
198 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
199 static gchar *tracelog_level_guard(const gchar *key, const gchar *new_value) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
200 { |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
201 int new_level = 0; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
202 if (new_value) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
203 new_level = atoi(new_value); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
204 if (DebugEnabled < 1 && new_level > 0 && FName && !tracelog_create()) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
205 DebugEnabled = 0; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
206 else |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
207 DebugEnabled = new_level; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
208 return g_strdup(new_value); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
209 } |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
210 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
211 static gchar *tracelog_file_guard(const gchar *key, const gchar *new_value) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
212 { |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
213 gchar *new_fname = NULL; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
214 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
215 if (new_value) |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
216 new_fname = expand_filename(new_value); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
217 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
218 if (g_strcmp0(FName, new_fname)) { |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
219 g_free(FName); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
220 FName = new_fname; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
221 if (DebugEnabled > 0 && !tracelog_create()) { |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
222 g_free(FName); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
223 FName = NULL; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
224 } |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
225 } else |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
226 g_free(new_fname); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
227 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
228 return g_strdup(new_value); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
229 } |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
230 |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
231 // ut_init_debug() |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
232 // Installs otpion guards before initial config file parsing. |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
233 void ut_init_debug(void) |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
234 { |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
235 DebugEnabled = 0; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
236 FName = NULL; |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
237 settings_set_guard("tracelog_level", tracelog_level_guard); |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
238 settings_set_guard("tracelog_file", tracelog_file_guard); |
| 24 | 239 } |
| 240 | |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
241 void ut_write_log(unsigned int flag, const char *data) |
| 24 | 242 { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
243 if (!DebugEnabled || !FName) return; |
| 393 | 244 |
| 1617 | 245 if (((DebugEnabled >= 2) && (flag & (LPRINT_LOG|LPRINT_DEBUG))) || |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
246 ((DebugEnabled == 1) && (flag & LPRINT_LOG))) { |
|
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
247 FILE *fp = fopen(FName, "a+"); |
|
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
248 if (!fp) { |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
249 scr_LogPrint(LPRINT_NORMAL, "ERROR: Cannot open tracelog file: %s.", |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
250 strerror(errno)); |
|
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
251 return; |
|
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
252 } |
|
1531
9f92c0edde1c
Display a warning when writing to the tracelog file fails
Mikael Berthe <mikael@lilotux.net>
parents:
1460
diff
changeset
|
253 if (fputs(data, fp) == EOF) |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
254 scr_LogPrint(LPRINT_NORMAL, "ERROR: Cannot write to tracelog file."); |
| 24 | 255 fclose(fp); |
| 256 } | |
| 257 } | |
| 258 | |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
259 // checkset_perm(name, setmode) |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
260 // Check the permissions of the "name" file/dir |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
261 // If setmode is true, correct the permissions if they are wrong |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
262 // Return values: -1 == bad file/dir, 0 == success, 1 == cannot correct |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
263 int checkset_perm(const char *name, unsigned int setmode) |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
264 { |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
265 int fd; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
266 struct stat buf; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
267 |
|
816
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
268 #ifdef __CYGWIN__ |
| 1460 | 269 // Permission checking isn't efficient on Cygwin |
|
816
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
270 return 0; |
|
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
271 #endif |
|
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
272 |
|
1459
d76eff4ed71d
Use stat() to check permissions in checkset_perm() (Dave Holland)
Mikael Berthe <mikael@lilotux.net>
parents:
1458
diff
changeset
|
273 fd = stat(name, &buf); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
274 if (fd == -1) return -1; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
275 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
276 if (buf.st_uid != geteuid()) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
277 scr_LogPrint(LPRINT_LOGNORM, "Wrong file owner [%s]", name); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
278 return 1; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
279 } |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
280 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
281 if (buf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP) || |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
282 buf.st_mode & (S_IROTH | S_IWOTH | S_IXOTH)) { |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
283 if (setmode) { |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
284 mode_t newmode = 0; |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
285 scr_LogPrint(LPRINT_LOGNORM, "Bad permissions [%s]", name); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
286 if (S_ISDIR(buf.st_mode)) |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
287 newmode |= S_IXUSR; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
288 newmode |= S_IRUSR | S_IWUSR; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
289 if (chmod(name, newmode)) { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
290 scr_LogPrint(LPRINT_LOGNORM, "WARNING: Failed to correct permissions!"); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
291 return 1; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
292 } |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
293 scr_LogPrint(LPRINT_LOGNORM, "Permissions have been corrected"); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
294 } else { |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
295 scr_LogPrint(LPRINT_LOGNORM, "WARNING: Bad permissions [%s]", name); |
|
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
296 return 1; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
297 } |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
298 } |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
299 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
300 return 0; |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
301 } |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
302 |
|
524
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
303 const char *ut_get_tmpdir(void) |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
304 { |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
305 static const char *tmpdir; |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
306 const char *tmpvars[] = { "MCABBERTMPDIR", "TMP", "TMPDIR", "TEMP" }; |
| 735 | 307 unsigned int i; |
|
524
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
308 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
309 if (tmpdir) |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
310 return tmpdir; |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
311 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
312 for (i = 0; i < (sizeof(tmpvars) / sizeof(const char *)); i++) { |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
313 tmpdir = getenv(tmpvars[i]); |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
314 if (tmpdir && tmpdir[0] && tmpdir[0] == '/' && tmpdir[1]) { |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
315 // Looks ok. |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
316 return tmpdir; |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
317 } |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
318 } |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
319 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
320 // Default temporary directory |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
321 tmpdir = "/tmp"; |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
322 return tmpdir; |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
323 } |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
324 |
| 241 | 325 // to_iso8601(dststr, timestamp) |
| 326 // Convert timestamp to iso8601 format, and store it in dststr. | |
| 327 // NOTE: dststr should be at last 19 chars long. | |
| 328 // Return should be 0 | |
| 329 int to_iso8601(char *dststr, time_t timestamp) | |
| 330 { | |
| 331 struct tm *tm_time; | |
| 332 int ret; | |
| 333 | |
| 334 tm_time = gmtime(×tamp); | |
| 335 | |
| 336 ret = snprintf(dststr, 19, "%.4d%02d%02dT%02d:%02d:%02dZ", | |
|
1458
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
337 (int)(1900+tm_time->tm_year), tm_time->tm_mon+1, tm_time->tm_mday, |
| 241 | 338 tm_time->tm_hour, tm_time->tm_min, tm_time->tm_sec); |
| 339 | |
| 340 return ((ret == -1) ? -1 : 0); | |
| 341 } | |
| 342 | |
| 343 // from_iso8601(timestamp, utc) | |
| 1361 | 344 // This function came from the Pidgin project, gaim_str_to_time(). |
| 241 | 345 // (Actually date may not be pure iso-8601) |
| 346 // Thanks, guys! | |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
347 // ** Modified by somian 10 Apr 2006 with advice from ysth. |
| 241 | 348 time_t from_iso8601(const char *timestamp, int utc) |
| 349 { | |
| 350 struct tm t; | |
| 351 time_t retval = 0; | |
| 352 char buf[32]; | |
| 353 char *c; | |
| 354 int tzoff = 0; | |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
355 int hms_succ = 0; |
|
1458
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
356 int tmpyear; |
| 241 | 357 |
| 358 time(&retval); | |
| 359 localtime_r(&retval, &t); | |
| 360 | |
|
463
339e85418b49
from_iso8601(): set time to 00:00:00 if not specified
Mikael Berthe <mikael@lilotux.net>
parents:
456
diff
changeset
|
361 /* Reset time to midnight (00:00:00) */ |
|
339e85418b49
from_iso8601(): set time to 00:00:00 if not specified
Mikael Berthe <mikael@lilotux.net>
parents:
456
diff
changeset
|
362 t.tm_hour = t.tm_min = t.tm_sec = 0; |
|
339e85418b49
from_iso8601(): set time to 00:00:00 if not specified
Mikael Berthe <mikael@lilotux.net>
parents:
456
diff
changeset
|
363 |
| 241 | 364 snprintf(buf, sizeof(buf), "%s", timestamp); |
| 365 c = buf; | |
| 366 | |
| 367 /* 4 digit year */ | |
|
1458
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
368 if (!sscanf(c, "%04d", &tmpyear)) return 0; |
|
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
369 t.tm_year = tmpyear; |
| 241 | 370 c+=4; |
| 371 if (*c == '-') | |
| 372 c++; | |
| 373 | |
| 374 t.tm_year -= 1900; | |
| 375 | |
| 376 /* 2 digit month */ | |
| 377 if (!sscanf(c, "%02d", &t.tm_mon)) return 0; | |
| 378 c+=2; | |
| 379 if (*c == '-') | |
| 380 c++; | |
| 381 | |
| 382 t.tm_mon -= 1; | |
| 383 | |
| 384 /* 2 digit day */ | |
| 385 if (!sscanf(c, "%02d", &t.tm_mday)) return 0; | |
| 386 c+=2; | |
| 387 if (*c == 'T' || *c == '.') { /* we have more than a date, keep going */ | |
| 388 c++; /* skip the "T" */ | |
| 389 | |
| 390 /* 2 digit hour */ | |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
391 if (sscanf(c, "%02d:%02d:%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3) |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
392 { |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
393 hms_succ = 1; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
394 c += 8; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
395 } |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
396 else if (sscanf(c, "%02d%02d%02d", &t.tm_hour, &t.tm_min, &t.tm_sec) == 3) |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
397 { |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
398 hms_succ = 1; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
399 c += 6; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
400 } |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
401 |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
402 if (hms_succ) { |
| 241 | 403 int tzhrs, tzmins; |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
404 |
| 241 | 405 if (*c == '.') /* dealing with precision we don't care about */ |
| 406 c += 4; | |
| 407 | |
| 408 if ((*c == '+' || *c == '-') && | |
| 409 sscanf(c+1, "%02d:%02d", &tzhrs, &tzmins)) { | |
| 410 tzoff = tzhrs*60*60 + tzmins*60; | |
| 411 if (*c == '+') | |
| 412 tzoff *= -1; | |
| 413 } | |
| 414 | |
| 415 if (tzoff || utc) { | |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
416 #ifdef HAVE_TM_GMTOFF |
| 241 | 417 tzoff += t.tm_gmtoff; |
|
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
418 #else |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
419 # ifdef HAVE_TIMEZONE |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
420 tzset(); /* making sure */ |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
421 tzoff -= timezone; |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
422 # endif |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
423 #endif |
| 241 | 424 } |
| 425 } | |
| 426 } | |
| 427 | |
| 428 t.tm_isdst = -1; | |
| 429 | |
| 430 retval = mktime(&t); | |
| 431 | |
| 432 retval += tzoff; | |
| 433 | |
| 434 return retval; | |
| 435 } | |
| 419 | 436 |
| 452 | 437 /** |
| 438 * Derived from libjabber/jid.c, because the libjabber version is not | |
| 439 * really convenient for our usage. | |
| 440 * | |
| 441 * Check if the full JID is valid | |
| 442 * Return 0 if it is valid, non zero otherwise | |
| 443 */ | |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
444 int check_jid_syntax(const char *fjid) |
| 452 | 445 { |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
446 const char *str; |
|
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
447 const char *domain, *resource; |
| 452 | 448 int domlen; |
| 1639 | 449 #ifdef HAVE_LIBIDN |
|
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
450 char *idnpp; |
| 1639 | 451 int r; |
| 452 #endif | |
| 452 | 453 |
| 1058 | 454 if (!fjid) return 1; |
| 452 | 455 |
| 1058 | 456 domain = strchr(fjid, JID_DOMAIN_SEPARATOR); |
| 452 | 457 |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
458 /* the username is optional */ |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
459 if (!domain) { |
| 1058 | 460 domain = fjid; |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
461 } else { |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
462 /* node identifiers may not be longer than 1023 bytes */ |
| 1058 | 463 if ((domain == fjid) || (domain-fjid > 1023)) |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
464 return 1; |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
465 domain++; |
| 452 | 466 |
| 1639 | 467 #ifdef HAVE_LIBIDN |
| 468 idnpp = idnprep; | |
| 469 str = fjid; | |
| 470 while (*str != JID_DOMAIN_SEPARATOR) | |
| 471 *idnpp++ = *str++; | |
| 472 *idnpp = 0; | |
| 473 | |
| 474 r = stringprep(idnprep, 1023, 0, stringprep_xmpp_nodeprep); | |
| 475 if (r != STRINGPREP_OK || !idnprep[0]) | |
| 476 return 1; | |
| 477 /* the username looks okay */ | |
| 478 #else | |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
479 /* check for low and invalid ascii characters in the username */ |
| 1058 | 480 for (str = fjid; *str != JID_DOMAIN_SEPARATOR; str++) { |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
481 if (*str <= ' ' || *str == ':' || *str == JID_DOMAIN_SEPARATOR || |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
482 *str == '<' || *str == '>' || *str == '\'' || |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
483 *str == '"' || *str == '&') { |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
484 return 1; |
|
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
485 } |
| 452 | 486 } |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
487 /* the username is okay as far as we can tell without LIBIDN */ |
| 1639 | 488 #endif |
| 452 | 489 } |
| 490 | |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
491 resource = strchr(domain, JID_RESOURCE_SEPARATOR); |
| 452 | 492 |
| 493 /* the resource is optional */ | |
| 494 if (resource) { | |
| 495 domlen = resource - domain; | |
| 496 resource++; | |
| 497 /* resources may not be longer than 1023 bytes */ | |
| 498 if ((*resource == '\0') || strlen(resource) > 1023) | |
| 499 return 1; | |
| 1639 | 500 #ifdef HAVE_LIBIDN |
| 501 strncpy(idnprep, resource, sizeof(idnprep)); | |
| 502 r = stringprep(idnprep, 1023, 0, stringprep_xmpp_resourceprep); | |
| 503 if (r != STRINGPREP_OK || !idnprep[0]) | |
| 504 return 1; | |
| 505 #endif | |
| 452 | 506 } else { |
| 507 domlen = strlen(domain); | |
| 508 } | |
| 509 | |
| 510 /* there must be a domain identifier */ | |
| 511 if (domlen == 0) return 1; | |
| 512 | |
| 513 /* and it must not be longer than 1023 bytes */ | |
| 514 if (domlen > 1023) return 1; | |
| 515 | |
|
1859
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
516 /* /.+/ is not a valid domain name pattern */ |
|
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
517 for (str = domain; *str && *str != JID_RESOURCE_SEPARATOR; str++) |
|
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
518 if (*str != '.') break; |
|
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
519 if (!*str || *str == JID_RESOURCE_SEPARATOR) |
|
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
520 return 1; /* domain contains only dots */ |
|
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
521 |
| 1639 | 522 #ifdef HAVE_LIBIDN |
| 523 idnpp = idnprep; | |
| 524 str = domain; | |
| 525 while (*str != '\0' && *str != JID_RESOURCE_SEPARATOR) | |
| 526 *idnpp++ = *str++; | |
| 527 *idnpp = 0; | |
| 528 | |
| 529 r = stringprep_nameprep(idnprep, 1023); | |
| 530 if (r != STRINGPREP_OK || !idnprep[0]) | |
| 531 return 1; | |
| 532 | |
|
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
533 if (idna_to_ascii_8z(idnprep, &idnpp, IDNA_USE_STD3_ASCII_RULES) != |
| 1639 | 534 IDNA_SUCCESS) |
| 535 return 1; | |
| 536 else | |
|
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
537 free(idnpp); |
| 1639 | 538 #else |
| 452 | 539 /* make sure the hostname is valid characters */ |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
540 for (str = domain; *str != '\0' && *str != JID_RESOURCE_SEPARATOR; str++) { |
| 452 | 541 if (!(isalnum(*str) || *str == '.' || *str == '-' || *str == '_')) |
| 542 return 1; | |
| 543 } | |
| 1639 | 544 #endif |
| 452 | 545 |
| 1639 | 546 /* it's okay as far as we can tell */ |
| 452 | 547 return 0; |
| 548 } | |
| 549 | |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
550 |
| 1106 | 551 inline void mc_strtolower(char *str) |
| 452 | 552 { |
| 553 if (!str) return; | |
| 554 for ( ; *str; str++) | |
| 555 *str = tolower(*str); | |
| 556 } | |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
557 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
558 // strip_arg_special_chars(string) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
559 // Remove quotes and backslashes before an escaped quote |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
560 // Only quotes need a backslash |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
561 // Ex.: ["a b"] -> [a b]; [a\"b] -> [a"b] |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
562 void strip_arg_special_chars(char *s) |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
563 { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
564 int instring = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
565 int escape = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
566 char *p; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
567 |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
568 if (!s) return; |
|
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
569 |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
570 for (p = s; *p; p++) { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
571 if (*p == '"') { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
572 if (!escape) { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
573 instring = !instring; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
574 strcpy(p, p+1); |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
575 p--; |
|
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
576 } else |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
577 escape = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
578 } else if (*p == '\\') { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
579 if (!escape) { |
|
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
580 strcpy(p, p+1); |
|
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
581 p--; |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
582 } |
|
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
583 escape = !escape; |
|
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
584 } else |
|
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
585 escape = FALSE; |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
586 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
587 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
588 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
589 // split_arg(arg, n, preservelast) |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
590 // Split the string arg into a maximum of n pieces, taking care of |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
591 // double quotes. |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
592 // Return a null-terminated array of strings. This array should be freed |
|
1167
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
593 // by the caller after use, for example with free_arg_lst(). |
|
559
4eb579399613
Fix a small bug in split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
556
diff
changeset
|
594 // If dontstriplast is true, the Nth argument isn't stripped (i.e. no |
|
4eb579399613
Fix a small bug in split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
556
diff
changeset
|
595 // processing of quote chars) |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
596 char **split_arg(const char *arg, unsigned int n, int dontstriplast) |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
597 { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
598 char **arglst; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
599 const char *p, *start, *end; |
| 735 | 600 unsigned int i = 0; |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
601 int instring = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
602 int escape = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
603 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
604 arglst = g_new0(char*, n+1); |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
605 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
606 if (!arg || !n) return arglst; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
607 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
608 // Skip leading space |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
609 for (start = arg; *start && *start == ' '; start++) ; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
610 // End of string pointer |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
611 for (end = start; *end; end++) ; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
612 // Skip trailing space |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
613 while (end > start+1 && *(end-1) == ' ') |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
614 end--; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
615 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
616 for (p = start; p < end; p++) { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
617 if (*p == '"' && !escape) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
618 instring = !instring; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
619 if (*p == '\\' && !escape) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
620 escape = TRUE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
621 else if (escape) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
622 escape = FALSE; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
623 if (*p == ' ' && !instring && i+1 < n) { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
624 // end of parameter |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
625 *(arglst+i) = g_strndup(start, p-start); |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
626 strip_arg_special_chars(*(arglst+i)); |
| 556 | 627 for (start = p+1; *start && *start == ' '; start++) ; |
| 1367 | 628 p = start-1; |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
629 i++; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
630 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
631 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
632 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
633 if (start < end) { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
634 *(arglst+i) = g_strndup(start, end-start); |
|
559
4eb579399613
Fix a small bug in split_arg()
Mikael Berthe <mikael@lilotux.net>
parents:
556
diff
changeset
|
635 if (!dontstriplast || i+1 < n) |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
636 strip_arg_special_chars(*(arglst+i)); |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
637 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
638 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
639 return arglst; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
640 } |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
641 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
642 // free_arg_lst(arglst) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
643 // Free an array allocated by split_arg() |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
644 void free_arg_lst(char **arglst) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
645 { |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
646 char **arg_elt; |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
647 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
648 for (arg_elt = arglst; *arg_elt; arg_elt++) |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
649 g_free(*arg_elt); |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
650 g_free(arglst); |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
651 } |
| 576 | 652 |
|
655
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
653 // replace_nl_with_dots(bufstr) |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
654 // Replace '\n' with "(...)" (or with a NUL if the string is too short) |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
655 void replace_nl_with_dots(char *bufstr) |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
656 { |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
657 char *p = strchr(bufstr, '\n'); |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
658 if (p) { |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
659 if (strlen(p) >= 5) |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
660 strcpy(p, "(...)"); |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
661 else |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
662 *p = 0; |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
663 } |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
664 } |
|
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
665 |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
666 // ut_expand_tabs(text) |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
667 // Expand tabs and filter out some bad chars in string text. |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
668 // If there is no tab and no bad chars in the string, a pointer to text |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
669 // is returned (be careful _not_ to free the pointer in this case). |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
670 // If there are some tabs or bad chars, a new string with expanded chars |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
671 // and no bad chars is returned; this is up to the caller to free this |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
672 // string after use. |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
673 char *ut_expand_tabs(const char *text) |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
674 { |
|
1568
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
675 char *xtext, *linestart; |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
676 char *p, *q; |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
677 guint n = 0, bc = 0; |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
678 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
679 xtext = (char*)text; |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
680 for (p=xtext; *p; p++) |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
681 if (*p == '\t') |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
682 n++; |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
683 else if (*p == '\x0d') |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
684 bc++; |
|
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
685 // XXX Are there other special chars we should filter out? |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
686 |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
687 if (!n && !bc) |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
688 return (char*)text; |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
689 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
690 xtext = g_new(char, strlen(text) + 1 + 8*n); |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
691 p = (char*)text; |
|
1568
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
692 q = linestart = xtext; |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
693 do { |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
694 if (*p == '\t') { |
|
1568
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
695 do { *q++ = ' '; } while ((q-linestart)%8); |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
696 } else if (*p != '\x0d') { |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
697 *q++ = *p; |
|
1568
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
698 if (*p =='\n') |
|
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
699 linestart = q; |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
700 } |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
701 } while (*p++); |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
702 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
703 return xtext; |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
704 } |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
705 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
706 |
|
803
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
707 /* Cygwin's newlib does not have strcasestr() */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
708 /* The author of the code before the endif is |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
709 * Jeffrey Stedfast <fejj@ximian.com> |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
710 * and this code is reusable in compliance with the GPL v2. -- somian */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
711 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
712 #if !defined(HAVE_STRCASESTR) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
713 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
714 # define lowercase(c) (isupper ((int) (c)) ? tolower ((int) (c)) : (int) (c)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
715 # define bm_index(c, icase) ((icase) ? lowercase (c) : (int) (c)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
716 # define bm_equal(c1, c2, icase) ((icase) ? lowercase (c1) == lowercase (c2) : (c1) == (c2)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
717 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
718 /* FIXME: this is just a guess... should really do some performace tests to get an accurate measure */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
719 # define bm_optimal(hlen, nlen) (((hlen) ? (hlen) > 20 : 1) && (nlen) > 10 ? 1 : 0) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
720 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
721 static unsigned char * |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
722 __boyer_moore (const unsigned char *haystack, size_t haystacklen, |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
723 const unsigned char *needle, size_t needlelen, int icase) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
724 { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
725 register unsigned char *hc_ptr, *nc_ptr; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
726 unsigned char *he_ptr, *ne_ptr, *h_ptr; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
727 size_t skiptable[256], n; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
728 register int i; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
729 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
730 #ifdef BOYER_MOORE_CHECKS |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
731 /* we don't need to do these checks since memmem/strstr/etc do it already */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
732 /* if the haystack is shorter than the needle then we can't possibly match */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
733 if (haystacklen < needlelen) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
734 return NULL; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
735 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
736 /* instant match if the pattern buffer is 0-length */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
737 if (needlelen == 0) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
738 return (unsigned char *) haystack; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
739 #endif /* BOYER_MOORE_CHECKS */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
740 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
741 /* set a pointer at the end of each string */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
742 ne_ptr = (unsigned char *) needle + needlelen - 1; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
743 he_ptr = (unsigned char *) haystack + haystacklen - 1; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
744 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
745 /* create our skip table */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
746 for (i = 0; i < 256; i++) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
747 skiptable[i] = needlelen; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
748 for (nc_ptr = (unsigned char *) needle; nc_ptr < ne_ptr; nc_ptr++) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
749 skiptable[bm_index (*nc_ptr, icase)] = (size_t) (ne_ptr - nc_ptr); |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
750 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
751 h_ptr = (unsigned char *) haystack; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
752 while (haystacklen >= needlelen) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
753 hc_ptr = h_ptr + needlelen - 1; /* set the haystack compare pointer */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
754 nc_ptr = ne_ptr; /* set the needle compare pointer */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
755 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
756 /* work our way backwards till they don't match */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
757 for (i = 0; nc_ptr > (unsigned char *) needle; nc_ptr--, hc_ptr--, i++) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
758 if (!bm_equal (*nc_ptr, *hc_ptr, icase)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
759 break; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
760 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
761 if (!bm_equal (*nc_ptr, *hc_ptr, icase)) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
762 n = skiptable[bm_index (*hc_ptr, icase)]; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
763 if (n == needlelen && i) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
764 if (bm_equal (*ne_ptr, ((unsigned char *) needle)[0], icase)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
765 n--; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
766 h_ptr += n; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
767 haystacklen -= n; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
768 } else |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
769 return (unsigned char *) h_ptr; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
770 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
771 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
772 return NULL; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
773 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
774 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
775 /* |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
776 * strcasestr: |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
777 * @haystack: string to search |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
778 * @needle: substring to search for |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
779 * |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
780 * Finds the first occurence of the substring @needle within the |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
781 * string @haystack ignoring case. |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
782 * |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
783 * Returns a pointer to the beginning of the substring match within |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
784 * @haystack, or NULL if the substring is not found. |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
785 **/ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
786 char * |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
787 strcasestr (const char *haystack, const char *needle) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
788 { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
789 register unsigned char *h, *n, *hc, *nc; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
790 size_t needlelen; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
791 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
792 needlelen = strlen (needle); |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
793 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
794 if (needlelen == 0) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
795 return (char *) haystack; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
796 } else if (bm_optimal (0, needlelen)) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
797 return (char *) __boyer_moore ((const unsigned char *) haystack, |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
798 strlen (haystack), |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
799 (const unsigned char *) needle, |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
800 needlelen, 1); |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
801 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
802 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
803 h = (unsigned char *) haystack; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
804 n = (unsigned char *) needle; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
805 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
806 while (*(h + needlelen - 1)) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
807 if (lowercase (*h) == lowercase (*n)) { |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
808 for (hc = h + 1, nc = n + 1; *hc && *nc; hc++, nc++) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
809 if (lowercase (*hc) != lowercase (*nc)) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
810 break; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
811 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
812 if (!*nc) |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
813 return (char *) h; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
814 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
815 h++; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
816 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
817 return NULL; |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
818 } |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
819 #endif /* !HAVE_STRCASESTR */ |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
820 |
| 1203 | 821 // startswith(str, word, ignore_case) |
| 1192 | 822 // Returns TRUE if string str starts with word. |
| 1203 | 823 int startswith(const char *str, const char *word, guint ignore_case) |
| 1192 | 824 { |
| 1203 | 825 if (ignore_case && !strncasecmp(str, word, strlen(word))) |
| 826 return TRUE; | |
| 827 else if (!ignore_case && !strncmp(str, word, strlen(word))) | |
| 1192 | 828 return TRUE; |
| 829 return FALSE; | |
| 830 } | |
| 831 | |
| 1811 | 832 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |