author | franky |
Tue, 14 May 2019 22:19:33 +0200 | |
changeset 2346 | 7921c8d671c8 |
parent 2338 | 6424627913be |
permissions | -rw-r--r-- |
241 | 1 |
/* |
2 |
* utils.c -- Various utility functions |
|
393 | 3 |
* |
2134
fc7a758ebbde
Remove deprecated options comments, update headers
Mikael Berthe <mikael@lilotux.net>
parents:
2133
diff
changeset
|
4 |
* Copyright (C) 2005-2014 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 |
|
2268
f5402d705f67
Fix FSF addresses in all files
Mikael Berthe <mikael@lilotux.net>
parents:
2253
diff
changeset
|
19 |
* along with this program; if not, see <http://www.gnu.org/licenses/>. |
241 | 20 |
*/ |
21 |
||
1639 | 22 |
#include <config.h> |
23 |
||
24 | 24 |
#include <stdio.h> |
25 |
#include <stdlib.h> |
|
77 | 26 |
#include <string.h> |
24 | 27 |
#include <stdarg.h> |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
28 |
#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
|
29 |
|
1639 | 30 |
#ifdef HAVE_LIBIDN |
31 |
#include <idna.h> |
|
32 |
#include <stringprep.h> |
|
33 |
static char idnprep[1024]; |
|
34 |
#endif |
|
35 |
||
36 |
#include <glib.h> |
|
1598 | 37 |
#include <glib/gprintf.h> |
38 |
||
802
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
39 |
/* 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
|
40 |
#ifdef __CYGWIN__ |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
41 |
# define timezonevar |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
42 |
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
|
43 |
#endif |
24 | 44 |
#include <time.h> |
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
45 |
#include <unistd.h> |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
46 |
#include <sys/types.h> |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
47 |
#include <sys/stat.h> |
452 | 48 |
#include <ctype.h> |
24 | 49 |
|
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
50 |
#include "utils.h" |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
51 |
#include "logprint.h" |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
52 |
#include "settings.h" |
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
53 |
#include "main.h" |
2309
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
54 |
#include "screen.h" |
241 | 55 |
|
76 | 56 |
static int DebugEnabled; |
77 | 57 |
static char *FName; |
24 | 58 |
|
1598 | 59 |
// jidtodisp(jid) |
60 |
// Strips the resource part from the jid |
|
61 |
// The caller should g_free the result after use. |
|
62 |
char *jidtodisp(const char *fjid) |
|
63 |
{ |
|
64 |
char *ptr; |
|
65 |
char *alias; |
|
66 |
||
1910
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
67 |
if (!fjid) { |
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
68 |
scr_LogPrint(LPRINT_LOGNORM, "** jidtodisp: NULL JID, " |
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
69 |
"this is probably a bug, please report!"); |
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
70 |
return NULL; |
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
71 |
} |
3695266e16c7
Fix error presence packet handling.
Mikael Berthe <mikael@lilotux.net>
parents:
1897
diff
changeset
|
72 |
|
1598 | 73 |
alias = g_strdup(fjid); |
74 |
||
75 |
if ((ptr = strchr(alias, JID_RESOURCE_SEPARATOR)) != NULL) { |
|
76 |
*ptr = 0; |
|
77 |
} |
|
78 |
return alias; |
|
79 |
} |
|
80 |
||
2111 | 81 |
// The caller must free the string after use. |
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 |
|
2111 | 94 |
// The caller must free the string after use. |
2103
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
95 |
char *get_servername(const char *username, const char *servername) |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
96 |
{ |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
97 |
char *ptr; |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
98 |
char *server; |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
99 |
|
2283
6e1ead98930d
Check origin of roster pushes
Mikael Berthe <mikael@lilotux.net>
parents:
2268
diff
changeset
|
100 |
if (!username) { |
6e1ead98930d
Check origin of roster pushes
Mikael Berthe <mikael@lilotux.net>
parents:
2268
diff
changeset
|
101 |
return NULL; |
6e1ead98930d
Check origin of roster pushes
Mikael Berthe <mikael@lilotux.net>
parents:
2268
diff
changeset
|
102 |
} |
2103
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
103 |
if ((ptr = strchr(username, JID_DOMAIN_SEPARATOR)) != NULL) { |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
104 |
server = g_strdup(ptr+1); |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
105 |
return server; |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
106 |
} |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
107 |
|
2111 | 108 |
return g_strdup(servername); |
2103
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
109 |
} |
1210a22726d3
We can determine if the server supports carbons. By means of XEP-0030: Service
Roeland Jago Douma <roeland@famdouma.nl>
parents:
2050
diff
changeset
|
110 |
|
2111 | 111 |
// The caller must free the string after use. |
1598 | 112 |
char *compose_jid(const char *username, const char *servername, |
113 |
const char *resource) |
|
114 |
{ |
|
115 |
char *fjid; |
|
116 |
||
117 |
if (!strchr(username, JID_DOMAIN_SEPARATOR)) { |
|
118 |
fjid = g_strdup_printf("%s%c%s%c%s", username, |
|
119 |
JID_DOMAIN_SEPARATOR, servername, |
|
120 |
JID_RESOURCE_SEPARATOR, resource); |
|
121 |
} else { |
|
122 |
fjid = g_strdup_printf("%s%c%s", username, |
|
123 |
JID_RESOURCE_SEPARATOR, resource); |
|
124 |
} |
|
125 |
return fjid; |
|
126 |
} |
|
127 |
||
128 |
gboolean jid_equal(const char *jid1, const char *jid2) |
|
129 |
{ |
|
130 |
char *a,*b; |
|
131 |
int ret; |
|
132 |
if (!jid1 && !jid2) |
|
133 |
return TRUE; |
|
134 |
if (!jid1 || !jid2) |
|
135 |
return FALSE; |
|
136 |
||
137 |
a = jidtodisp(jid1); |
|
138 |
b = jidtodisp(jid2); |
|
139 |
ret = strcasecmp(a, b); |
|
140 |
g_free(a); |
|
141 |
g_free(b); |
|
142 |
return (ret == 0) ? TRUE : FALSE; |
|
143 |
} |
|
144 |
||
2346
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
145 |
const char *jid_get_resource_name(const char *fjid) |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
146 |
{ |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
147 |
const char * resource_name = NULL; |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
148 |
if (fjid) { |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
149 |
resource_name = strchr(fjid, JID_RESOURCE_SEPARATOR); |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
150 |
if (resource_name) |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
151 |
resource_name++; |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
152 |
} |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
153 |
return resource_name; |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
154 |
} |
7921c8d671c8
Implemented another helper function jid_get_resource_name
franky
parents:
2338
diff
changeset
|
155 |
|
1167
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
156 |
// expand_filename(filename) |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
157 |
// 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
|
158 |
// The caller must free the string after use. |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
159 |
char *expand_filename(const char *fname) |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
160 |
{ |
1222
75aee46d3aee
Fix a problem with the ssl_ca{file,path} variables expansion
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
161 |
if (!fname) |
75aee46d3aee
Fix a problem with the ssl_ca{file,path} variables expansion
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
162 |
return NULL; |
1167
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
163 |
if (!strncmp(fname, "~/", 2)) { |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
164 |
char *homedir = getenv("HOME"); |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
165 |
if (homedir) |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
166 |
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
|
167 |
} |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
168 |
return g_strdup(fname); |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
169 |
} |
9726c78a91f3
Allow '~' (HOME directory) in config options
Mikael Berthe <mikael@lilotux.net>
parents:
1122
diff
changeset
|
170 |
|
2248
377b6a52b25f
Prepare for loudmouth with sha256 support (>=1.5.3)
franky
parents:
2203
diff
changeset
|
171 |
#ifndef LOUDMOUTH_USES_SHA256 |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
172 |
// fingerprint_to_hex(fprstr, hex, fpr_len) |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
173 |
// Convert the binary fingerprint fprstr (which is fpr_len bytes long) |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
174 |
// to a NULL-terminated hexadecimal string hex. |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
175 |
// The destination array hex should have been preallocated by the caller, |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
176 |
// and should be big enough (i.e. >= 3*fpr_len bytes). |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
177 |
void fingerprint_to_hex(const char *fprstr, char *hex, size_t fpr_len) |
1598 | 178 |
{ |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
179 |
unsigned int i; |
2198
1591518a33b9
Minor change of the prototype for fingerprint_to_hex()
Mikael Berthe <mikael@lilotux.net>
parents:
2197
diff
changeset
|
180 |
const unsigned char *fpr = (const unsigned char *)fprstr; |
1598 | 181 |
char *p; |
182 |
||
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
183 |
hex[0] = 0; |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
184 |
if (!fpr || fpr_len < 16) return; |
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
185 |
|
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
186 |
for (p = hex, i = 0; i < fpr_len - 1; i++, p+=3) |
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
187 |
g_snprintf(p, 4, "%02X:", fpr[i]); |
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
188 |
g_snprintf(p, 3, "%02X", fpr[i]); |
1598 | 189 |
} |
190 |
||
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
191 |
// hex_to_fingerprint(hex, fpr, fpr_len) |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
192 |
// Convert the hexadecimal fingerprint hex to a byte array fpr[]. |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
193 |
// The fpr array should have been preallocated with a size >= fpr_len. |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
194 |
gboolean hex_to_fingerprint(const char *hex, char *fpr, size_t fpr_len) |
1598 | 195 |
{ |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
196 |
unsigned int i; |
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
197 |
const char *p; |
1598 | 198 |
|
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
199 |
if (fpr_len < 16) return FALSE; |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
200 |
|
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
201 |
fpr[0] = 0; |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
202 |
|
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
203 |
if (strlen(hex) != fpr_len*3 - 1) |
1598 | 204 |
return FALSE; |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
205 |
|
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
206 |
for (i = 0, p = hex; i < fpr_len && *p && *(p+1); i++, p += 3) { |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
207 |
// Check we have two hex digits followed by a colon (or end of string) |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
208 |
if (!isxdigit(*p) || !isxdigit(*(p+1))) |
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
209 |
return FALSE; |
2203
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
210 |
if (*(p+2) && (*(p+2) != ':')) |
170597f5365b
Use more generic routines to convert fingerprints to/from hexadecimal
Mikael Berthe <mikael@lilotux.net>
parents:
2198
diff
changeset
|
211 |
return FALSE; |
2197
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
212 |
fpr[i] = (char)g_ascii_strtoull(p, NULL, 16); |
189abf03ef24
Fix fingerprint management
Mikael Berthe <mikael@lilotux.net>
parents:
2168
diff
changeset
|
213 |
} |
1598 | 214 |
return TRUE; |
215 |
} |
|
2248
377b6a52b25f
Prepare for loudmouth with sha256 support (>=1.5.3)
franky
parents:
2203
diff
changeset
|
216 |
#endif |
1598 | 217 |
|
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
218 |
static gboolean tracelog_create(void) |
24 | 219 |
{ |
77 | 220 |
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
|
221 |
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
|
222 |
int err; |
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
223 |
char *v; |
77 | 224 |
|
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
225 |
fp = fopen(FName, "a"); |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
226 |
if (!fp) { |
2135
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
227 |
scr_LogPrint(LPRINT_NORMAL, "ERROR: Cannot open tracelog file: %s", |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
228 |
strerror(errno)); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
229 |
return FALSE; |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
230 |
} |
428
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
231 |
|
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
232 |
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
|
233 |
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
|
234 |
fclose(fp); |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
235 |
if (err) |
2135
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
236 |
scr_LogPrint(LPRINT_NORMAL, "ERROR: cannot stat the tracelog file: %s", |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
237 |
strerror(errno)); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
238 |
else |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
239 |
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
|
240 |
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
|
241 |
} |
2135
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
242 |
|
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
243 |
if (fchmod(fileno(fp), S_IRUSR|S_IWUSR)) { |
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
244 |
scr_LogPrint(LPRINT_NORMAL, "WARNING: Cannot set tracelog file permissions: %s", |
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
245 |
strerror(errno)); |
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
246 |
} |
428
4470868f90e5
Check the tracelog file actually belongs to the user (if logging enabled)
Mikael Berthe <mikael@lilotux.net>
parents:
419
diff
changeset
|
247 |
|
1897
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
248 |
v = mcabber_version(); |
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
249 |
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
|
250 |
"----------------------\n", v); |
efd7c4c34ff2
Display mcabber version when starting a trace log
Mikael Berthe <mikael@lilotux.net>
parents:
1859
diff
changeset
|
251 |
g_free(v); |
24 | 252 |
fclose(fp); |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
253 |
return TRUE; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
254 |
} |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
255 |
|
2111 | 256 |
// The caller must free the string after use. |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
257 |
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
|
258 |
{ |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
259 |
int new_level = 0; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
260 |
if (new_value) |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
261 |
new_level = atoi(new_value); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
262 |
if (DebugEnabled < 1 && new_level > 0 && FName && !tracelog_create()) |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
263 |
DebugEnabled = 0; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
264 |
else |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
265 |
DebugEnabled = new_level; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
266 |
return g_strdup(new_value); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
267 |
} |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
268 |
|
2111 | 269 |
// The caller must free the string after use. |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
270 |
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
|
271 |
{ |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
272 |
gchar *new_fname = NULL; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
273 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
274 |
if (new_value) |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
275 |
new_fname = expand_filename(new_value); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
276 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
277 |
if (g_strcmp0(FName, new_fname)) { |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
278 |
g_free(FName); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
279 |
FName = new_fname; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
280 |
if (DebugEnabled > 0 && !tracelog_create()) { |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
281 |
g_free(FName); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
282 |
FName = NULL; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
283 |
} |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
284 |
} else |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
285 |
g_free(new_fname); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
286 |
|
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
287 |
return g_strdup(new_value); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
288 |
} |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
289 |
|
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
290 |
// ut_init_debug() |
2111 | 291 |
// Install option guards before initial config file parsing. |
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
292 |
void ut_init_debug(void) |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
293 |
{ |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
294 |
DebugEnabled = 0; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
295 |
FName = NULL; |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
296 |
settings_set_guard("tracelog_level", tracelog_level_guard); |
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
297 |
settings_set_guard("tracelog_file", tracelog_file_guard); |
24 | 298 |
} |
299 |
||
1780
e4378fbab5d7
Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents:
1729
diff
changeset
|
300 |
void ut_write_log(unsigned int flag, const char *data) |
24 | 301 |
{ |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
302 |
if (!DebugEnabled || !FName) return; |
393 | 303 |
|
1617 | 304 |
if (((DebugEnabled >= 2) && (flag & (LPRINT_LOG|LPRINT_DEBUG))) || |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
305 |
((DebugEnabled == 1) && (flag & LPRINT_LOG))) { |
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
306 |
FILE *fp = fopen(FName, "a+"); |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
307 |
if (!fp) { |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
308 |
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
|
309 |
strerror(errno)); |
378
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
310 |
return; |
2e6c7b1440d1
Improve debugging/logging
Mikael Berthe <mikael@lilotux.net>
parents:
374
diff
changeset
|
311 |
} |
2135
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
312 |
|
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
313 |
// Check file permissions again (it could be a new file) |
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
314 |
fchmod(fileno(fp), S_IRUSR|S_IWUSR); |
361603828d9e
Set the trace log file permissions again when we write to it
Mikael Berthe <mikael@lilotux.net>
parents:
2134
diff
changeset
|
315 |
|
1531
9f92c0edde1c
Display a warning when writing to the tracelog file fails
Mikael Berthe <mikael@lilotux.net>
parents:
1460
diff
changeset
|
316 |
if (fputs(data, fp) == EOF) |
1674
f02e7076ccec
Use option guards for tracelog
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
317 |
scr_LogPrint(LPRINT_NORMAL, "ERROR: Cannot write to tracelog file."); |
24 | 318 |
fclose(fp); |
319 |
} |
|
320 |
} |
|
321 |
||
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
322 |
// checkset_perm(name, setmode) |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
323 |
// Check the permissions of the "name" file/dir |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
324 |
// 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
|
325 |
// 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
|
326 |
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
|
327 |
{ |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
328 |
int fd; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
329 |
struct stat buf; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
330 |
|
2253
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2248
diff
changeset
|
331 |
if (!name) return -1; |
5a107c907e71
Read $HOME/.mcabberrc if there is no mcabber configuration directory
Mikael Berthe <mikael@lilotux.net>
parents:
2248
diff
changeset
|
332 |
|
816
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
333 |
#ifdef __CYGWIN__ |
1460 | 334 |
// Permission checking isn't efficient on Cygwin |
816
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
335 |
return 0; |
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
336 |
#endif |
a6628f0aabc1
Skip file permission checks on Cygwin
Mikael Berthe <mikael@lilotux.net>
parents:
803
diff
changeset
|
337 |
|
1459
d76eff4ed71d
Use stat() to check permissions in checkset_perm() (Dave Holland)
Mikael Berthe <mikael@lilotux.net>
parents:
1458
diff
changeset
|
338 |
fd = stat(name, &buf); |
362
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
339 |
if (fd == -1) return -1; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
340 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
341 |
if (buf.st_uid != geteuid()) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
342 |
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
|
343 |
return 1; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
344 |
} |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
345 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
346 |
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
|
347 |
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
|
348 |
if (setmode) { |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
349 |
mode_t newmode = 0; |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
350 |
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
|
351 |
if (S_ISDIR(buf.st_mode)) |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
352 |
newmode |= S_IXUSR; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
353 |
newmode |= S_IRUSR | S_IWUSR; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
354 |
if (chmod(name, newmode)) { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
355 |
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
|
356 |
return 1; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
357 |
} |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
358 |
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
|
359 |
} else { |
374
bd5638c21834
Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents:
364
diff
changeset
|
360 |
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
|
361 |
return 1; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
362 |
} |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
363 |
} |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
364 |
|
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
365 |
return 0; |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
366 |
} |
d8f147d6e872
Check directory and config file permissions
Mikael Berthe <mikael@lilotux.net>
parents:
281
diff
changeset
|
367 |
|
524
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
368 |
const char *ut_get_tmpdir(void) |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
369 |
{ |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
370 |
static const char *tmpdir; |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
371 |
const char *tmpvars[] = { "MCABBERTMPDIR", "TMP", "TMPDIR", "TEMP" }; |
735 | 372 |
unsigned int i; |
524
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
373 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
374 |
if (tmpdir) |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
375 |
return tmpdir; |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
376 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
377 |
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
|
378 |
tmpdir = getenv(tmpvars[i]); |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
379 |
if (tmpdir && tmpdir[0] && tmpdir[0] == '/' && tmpdir[1]) { |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
380 |
// Looks ok. |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
381 |
return tmpdir; |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
382 |
} |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
383 |
} |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
384 |
|
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
385 |
// Default temporary directory |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
386 |
tmpdir = "/tmp"; |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
387 |
return tmpdir; |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
388 |
} |
05c0e55c4bb1
Pass message body to external command
Mikael Berthe <mikael@lilotux.net>
parents:
463
diff
changeset
|
389 |
|
241 | 390 |
// to_iso8601(dststr, timestamp) |
391 |
// Convert timestamp to iso8601 format, and store it in dststr. |
|
392 |
// NOTE: dststr should be at last 19 chars long. |
|
393 |
// Return should be 0 |
|
394 |
int to_iso8601(char *dststr, time_t timestamp) |
|
395 |
{ |
|
396 |
struct tm *tm_time; |
|
397 |
int ret; |
|
398 |
||
399 |
tm_time = gmtime(×tamp); |
|
400 |
||
401 |
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
|
402 |
(int)(1900+tm_time->tm_year), tm_time->tm_mon+1, tm_time->tm_mday, |
241 | 403 |
tm_time->tm_hour, tm_time->tm_min, tm_time->tm_sec); |
404 |
||
405 |
return ((ret == -1) ? -1 : 0); |
|
406 |
} |
|
407 |
||
408 |
// from_iso8601(timestamp, utc) |
|
1361 | 409 |
// This function came from the Pidgin project, gaim_str_to_time(). |
241 | 410 |
// (Actually date may not be pure iso-8601) |
411 |
// 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
|
412 |
// ** Modified by somian 10 Apr 2006 with advice from ysth. |
241 | 413 |
time_t from_iso8601(const char *timestamp, int utc) |
414 |
{ |
|
415 |
struct tm t; |
|
416 |
time_t retval = 0; |
|
417 |
char buf[32]; |
|
418 |
char *c; |
|
419 |
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
|
420 |
int hms_succ = 0; |
1458
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
421 |
int tmpyear; |
241 | 422 |
|
423 |
time(&retval); |
|
424 |
localtime_r(&retval, &t); |
|
425 |
||
463
339e85418b49
from_iso8601(): set time to 00:00:00 if not specified
Mikael Berthe <mikael@lilotux.net>
parents:
456
diff
changeset
|
426 |
/* 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
|
427 |
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
|
428 |
|
241 | 429 |
snprintf(buf, sizeof(buf), "%s", timestamp); |
430 |
c = buf; |
|
431 |
||
432 |
/* 4 digit year */ |
|
1458
17e95be6c39b
time_t fix from the MirBSD port (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents:
1452
diff
changeset
|
433 |
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
|
434 |
t.tm_year = tmpyear; |
241 | 435 |
c+=4; |
436 |
if (*c == '-') |
|
437 |
c++; |
|
438 |
||
439 |
t.tm_year -= 1900; |
|
440 |
||
441 |
/* 2 digit month */ |
|
442 |
if (!sscanf(c, "%02d", &t.tm_mon)) return 0; |
|
443 |
c+=2; |
|
444 |
if (*c == '-') |
|
445 |
c++; |
|
446 |
||
447 |
t.tm_mon -= 1; |
|
448 |
||
449 |
/* 2 digit day */ |
|
450 |
if (!sscanf(c, "%02d", &t.tm_mday)) return 0; |
|
451 |
c+=2; |
|
452 |
if (*c == 'T' || *c == '.') { /* we have more than a date, keep going */ |
|
453 |
c++; /* skip the "T" */ |
|
454 |
||
455 |
/* 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
|
456 |
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
|
457 |
{ |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
458 |
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
|
459 |
c += 8; |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
460 |
} |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
461 |
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
|
462 |
{ |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
463 |
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
|
464 |
c += 6; |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
465 |
} |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
466 |
|
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
467 |
if (hms_succ) { |
241 | 468 |
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
|
469 |
|
241 | 470 |
if (*c == '.') /* dealing with precision we don't care about */ |
2168
87244845fd9c
Handle fractional seconds with more (or less) than 3 digits in timestamps
Mikael Berthe <mikael@lilotux.net>
parents:
2135
diff
changeset
|
471 |
while (isdigit(*++c)) |
87244845fd9c
Handle fractional seconds with more (or less) than 3 digits in timestamps
Mikael Berthe <mikael@lilotux.net>
parents:
2135
diff
changeset
|
472 |
; |
241 | 473 |
|
474 |
if ((*c == '+' || *c == '-') && |
|
475 |
sscanf(c+1, "%02d:%02d", &tzhrs, &tzmins)) { |
|
476 |
tzoff = tzhrs*60*60 + tzmins*60; |
|
477 |
if (*c == '+') |
|
478 |
tzoff *= -1; |
|
479 |
} |
|
480 |
||
481 |
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
|
482 |
#ifdef HAVE_TM_GMTOFF |
241 | 483 |
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
|
484 |
#else |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
485 |
# 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
|
486 |
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
|
487 |
tzoff -= timezone; |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
488 |
# endif |
dd860da62002
Enable use on systems that do not have tm_gmtoff including Cygwin
Soren Andersen <somian@pobox.com>
parents:
735
diff
changeset
|
489 |
#endif |
241 | 490 |
} |
491 |
} |
|
492 |
} |
|
493 |
||
494 |
t.tm_isdst = -1; |
|
495 |
||
496 |
retval = mktime(&t); |
|
497 |
||
498 |
retval += tzoff; |
|
499 |
||
500 |
return retval; |
|
501 |
} |
|
419 | 502 |
|
452 | 503 |
/** |
504 |
* Derived from libjabber/jid.c, because the libjabber version is not |
|
505 |
* really convenient for our usage. |
|
506 |
* |
|
507 |
* Check if the full JID is valid |
|
508 |
* Return 0 if it is valid, non zero otherwise |
|
509 |
*/ |
|
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
510 |
int check_jid_syntax(const char *fjid) |
452 | 511 |
{ |
1292
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
512 |
const char *str; |
382ec54b584e
Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1241
diff
changeset
|
513 |
const char *domain, *resource; |
452 | 514 |
int domlen; |
1639 | 515 |
#ifdef HAVE_LIBIDN |
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
516 |
char *idnpp; |
1639 | 517 |
int r; |
518 |
#endif |
|
452 | 519 |
|
1058 | 520 |
if (!fjid) return 1; |
452 | 521 |
|
1058 | 522 |
domain = strchr(fjid, JID_DOMAIN_SEPARATOR); |
452 | 523 |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
524 |
/* the username is optional */ |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
525 |
if (!domain) { |
1058 | 526 |
domain = fjid; |
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
527 |
} else { |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
528 |
/* node identifiers may not be longer than 1023 bytes */ |
1058 | 529 |
if ((domain == fjid) || (domain-fjid > 1023)) |
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
530 |
return 1; |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
531 |
domain++; |
452 | 532 |
|
1639 | 533 |
#ifdef HAVE_LIBIDN |
534 |
idnpp = idnprep; |
|
535 |
str = fjid; |
|
536 |
while (*str != JID_DOMAIN_SEPARATOR) |
|
537 |
*idnpp++ = *str++; |
|
538 |
*idnpp = 0; |
|
539 |
||
540 |
r = stringprep(idnprep, 1023, 0, stringprep_xmpp_nodeprep); |
|
541 |
if (r != STRINGPREP_OK || !idnprep[0]) |
|
542 |
return 1; |
|
543 |
/* the username looks okay */ |
|
544 |
#else |
|
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
545 |
/* check for low and invalid ascii characters in the username */ |
1058 | 546 |
for (str = fjid; *str != JID_DOMAIN_SEPARATOR; str++) { |
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
547 |
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
|
548 |
*str == '<' || *str == '>' || *str == '\'' || |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
549 |
*str == '"' || *str == '&') { |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
550 |
return 1; |
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
551 |
} |
452 | 552 |
} |
456
471c9ccde028
Make username optional in check_jid_syntax()
Mikael Berthe <mikael@lilotux.net>
parents:
452
diff
changeset
|
553 |
/* the username is okay as far as we can tell without LIBIDN */ |
1639 | 554 |
#endif |
452 | 555 |
} |
556 |
||
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
557 |
resource = strchr(domain, JID_RESOURCE_SEPARATOR); |
452 | 558 |
|
559 |
/* the resource is optional */ |
|
560 |
if (resource) { |
|
561 |
domlen = resource - domain; |
|
562 |
resource++; |
|
563 |
/* resources may not be longer than 1023 bytes */ |
|
564 |
if ((*resource == '\0') || strlen(resource) > 1023) |
|
565 |
return 1; |
|
1639 | 566 |
#ifdef HAVE_LIBIDN |
567 |
strncpy(idnprep, resource, sizeof(idnprep)); |
|
568 |
r = stringprep(idnprep, 1023, 0, stringprep_xmpp_resourceprep); |
|
569 |
if (r != STRINGPREP_OK || !idnprep[0]) |
|
570 |
return 1; |
|
571 |
#endif |
|
452 | 572 |
} else { |
573 |
domlen = strlen(domain); |
|
574 |
} |
|
575 |
||
576 |
/* there must be a domain identifier */ |
|
577 |
if (domlen == 0) return 1; |
|
578 |
||
579 |
/* and it must not be longer than 1023 bytes */ |
|
580 |
if (domlen > 1023) return 1; |
|
581 |
||
1859
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
582 |
/* /.+/ is not a valid domain name pattern */ |
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
583 |
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
|
584 |
if (*str != '.') break; |
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
585 |
if (!*str || *str == JID_RESOURCE_SEPARATOR) |
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
586 |
return 1; /* domain contains only dots */ |
a20701a2840c
"." is not a valid Jabber domain name
Mikael Berthe <mikael@lilotux.net>
parents:
1811
diff
changeset
|
587 |
|
1639 | 588 |
#ifdef HAVE_LIBIDN |
589 |
idnpp = idnprep; |
|
590 |
str = domain; |
|
591 |
while (*str != '\0' && *str != JID_RESOURCE_SEPARATOR) |
|
592 |
*idnpp++ = *str++; |
|
593 |
*idnpp = 0; |
|
594 |
||
595 |
r = stringprep_nameprep(idnprep, 1023); |
|
596 |
if (r != STRINGPREP_OK || !idnprep[0]) |
|
597 |
return 1; |
|
598 |
||
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
599 |
if (idna_to_ascii_8z(idnprep, &idnpp, IDNA_USE_STD3_ASCII_RULES) != |
1639 | 600 |
IDNA_SUCCESS) |
601 |
return 1; |
|
602 |
else |
|
1641
c3c7d6d0348f
Remove (probably) unnecessary check
Mikael Berthe <mikael@lilotux.net>
parents:
1640
diff
changeset
|
603 |
free(idnpp); |
1639 | 604 |
#else |
452 | 605 |
/* make sure the hostname is valid characters */ |
977
5b01de4ac5e1
Cosmetic changes
Alexis Hildebrandt <afh [at] 2drop [dot] net>
parents:
952
diff
changeset
|
606 |
for (str = domain; *str != '\0' && *str != JID_RESOURCE_SEPARATOR; str++) { |
452 | 607 |
if (!(isalnum(*str) || *str == '.' || *str == '-' || *str == '_')) |
608 |
return 1; |
|
609 |
} |
|
1639 | 610 |
#endif |
452 | 611 |
|
1639 | 612 |
/* it's okay as far as we can tell */ |
452 | 613 |
return 0; |
614 |
} |
|
615 |
||
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
616 |
|
2338 | 617 |
void mc_strtolower(char *str) |
452 | 618 |
{ |
619 |
if (!str) return; |
|
620 |
for ( ; *str; str++) |
|
621 |
*str = tolower(*str); |
|
622 |
} |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
623 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
624 |
// strip_arg_special_chars(string) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
625 |
// Remove quotes and backslashes before an escaped quote |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
626 |
// Only quotes need a backslash |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
627 |
// 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
|
628 |
void strip_arg_special_chars(char *s) |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
629 |
{ |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
630 |
int instring = FALSE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
631 |
int escape = FALSE; |
2133
69d00a118c0c
Fix ANSI C-incompatible change
Mikael Berthe <mikael@lilotux.net>
parents:
2119
diff
changeset
|
632 |
char *p, *t; |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
633 |
|
979
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
634 |
if (!s) return; |
ea939ff047d8
Improve /buffer search_*
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
635 |
|
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
636 |
for (p = s; *p; p++) { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
637 |
if (*p == '"') { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
638 |
if (!escape) { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
639 |
instring = !instring; |
2119
3b26f3a58cb9
Fix command line issue reported by Minos
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
640 |
//memmove(p, p+1, strlen(p)); |
2133
69d00a118c0c
Fix ANSI C-incompatible change
Mikael Berthe <mikael@lilotux.net>
parents:
2119
diff
changeset
|
641 |
for (t=p; *t; t++) |
2119
3b26f3a58cb9
Fix command line issue reported by Minos
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
642 |
*t = *(t+1); |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
643 |
p--; |
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
644 |
} else |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
645 |
escape = FALSE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
646 |
} else if (*p == '\\') { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
647 |
if (!escape) { |
2119
3b26f3a58cb9
Fix command line issue reported by Minos
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
648 |
//memmove(p, p+1, strlen(p)); |
2133
69d00a118c0c
Fix ANSI C-incompatible change
Mikael Berthe <mikael@lilotux.net>
parents:
2119
diff
changeset
|
649 |
for (t=p; *t; t++) |
2119
3b26f3a58cb9
Fix command line issue reported by Minos
Mikael Berthe <mikael@lilotux.net>
parents:
2111
diff
changeset
|
650 |
*t = *(t+1); |
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
651 |
p--; |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
652 |
} |
1452
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
653 |
escape = !escape; |
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
654 |
} else |
83e275dca409
Fix escaping bug in strip_arg_special_chars()
Mikael Berthe <mikael@lilotux.net>
parents:
1440
diff
changeset
|
655 |
escape = FALSE; |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
656 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
657 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
658 |
|
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
659 |
// split_arg(arg, n, preservelast) |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
660 |
// 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
|
661 |
// double quotes. |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
662 |
// 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
|
663 |
// 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
|
664 |
// 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
|
665 |
// processing of quote chars) |
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
666 |
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
|
667 |
{ |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
668 |
char **arglst; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
669 |
const char *p, *start, *end; |
735 | 670 |
unsigned int i = 0; |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
671 |
int instring = FALSE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
672 |
int escape = FALSE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
673 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
674 |
arglst = g_new0(char*, n+1); |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
675 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
676 |
if (!arg || !n) return arglst; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
677 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
678 |
// Skip leading space |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
679 |
for (start = arg; *start && *start == ' '; start++) ; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
680 |
// End of string pointer |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
681 |
for (end = start; *end; end++) ; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
682 |
// Skip trailing space |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
683 |
while (end > start+1 && *(end-1) == ' ') |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
684 |
end--; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
685 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
686 |
for (p = start; p < end; p++) { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
687 |
if (*p == '"' && !escape) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
688 |
instring = !instring; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
689 |
if (*p == '\\' && !escape) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
690 |
escape = TRUE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
691 |
else if (escape) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
692 |
escape = FALSE; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
693 |
if (*p == ' ' && !instring && i+1 < n) { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
694 |
// end of parameter |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
695 |
*(arglst+i) = g_strndup(start, p-start); |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
696 |
strip_arg_special_chars(*(arglst+i)); |
556 | 697 |
for (start = p+1; *start && *start == ' '; start++) ; |
1367 | 698 |
p = start-1; |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
699 |
i++; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
700 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
701 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
702 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
703 |
if (start < end) { |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
704 |
*(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
|
705 |
if (!dontstriplast || i+1 < n) |
554
2424bbf0a6db
Some more work on do_room()
Mikael Berthe <mikael@lilotux.net>
parents:
553
diff
changeset
|
706 |
strip_arg_special_chars(*(arglst+i)); |
551
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
707 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
708 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
709 |
return arglst; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
710 |
} |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
711 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
712 |
// free_arg_lst(arglst) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
713 |
// Free an array allocated by split_arg() |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
714 |
void free_arg_lst(char **arglst) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
715 |
{ |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
716 |
char **arg_elt; |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
717 |
|
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
718 |
for (arg_elt = arglst; *arg_elt; arg_elt++) |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
719 |
g_free(*arg_elt); |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
720 |
g_free(arglst); |
c71699efa5cc
Add split_arg() / free_arg_lst()
Mikael Berthe <mikael@lilotux.net>
parents:
524
diff
changeset
|
721 |
} |
576 | 722 |
|
655
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
723 |
// 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
|
724 |
// 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
|
725 |
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
|
726 |
{ |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
727 |
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
|
728 |
if (p) { |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
729 |
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
|
730 |
strcpy(p, "(...)"); |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
731 |
else |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
732 |
*p = 0; |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
733 |
} |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
734 |
} |
de6837908702
Use "(...)" when cutting a multi-line status message in the log window
Mikael Berthe <mikael@lilotux.net>
parents:
580
diff
changeset
|
735 |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
736 |
// ut_expand_tabs(text) |
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
737 |
// 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
|
738 |
// 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
|
739 |
// 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
|
740 |
// 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
|
741 |
// 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
|
742 |
// string after use. |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
743 |
char *ut_expand_tabs(const char *text) |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
744 |
{ |
1572
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
745 |
char *xtext, *linestart; |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
746 |
char *p, *q; |
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
747 |
guint n = 0, bc = 0; |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
748 |
|
2049
0ba755e5dc48
ut_expand_tabs: Check the argument is not null
Mikael Berthe <mikael@lilotux.net>
parents:
1910
diff
changeset
|
749 |
if (!text) |
0ba755e5dc48
ut_expand_tabs: Check the argument is not null
Mikael Berthe <mikael@lilotux.net>
parents:
1910
diff
changeset
|
750 |
return NULL; |
0ba755e5dc48
ut_expand_tabs: Check the argument is not null
Mikael Berthe <mikael@lilotux.net>
parents:
1910
diff
changeset
|
751 |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
752 |
xtext = (char*)text; |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
753 |
for (p=xtext; *p; p++) |
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
754 |
if (*p == '\t') |
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
755 |
n++; |
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
756 |
else if (*p == '\x0d') |
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
757 |
bc++; |
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
758 |
// 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
|
759 |
|
1122
648fe6f715a6
Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents:
1106
diff
changeset
|
760 |
if (!n && !bc) |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
761 |
return (char*)text; |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
762 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
763 |
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
|
764 |
p = (char*)text; |
1572
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
765 |
q = linestart = xtext; |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
766 |
do { |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
767 |
if (*p == '\t') { |
1572
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
768 |
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
|
769 |
} else if (*p != '\x0d') { |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
770 |
*q++ = *p; |
1572
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
771 |
if (*p =='\n') |
e89787ee40f7
Fix tab expansion when using say_to -f
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1531
diff
changeset
|
772 |
linestart = q; |
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
773 |
} |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
774 |
} while (*p++); |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
775 |
|
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
776 |
return xtext; |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
777 |
} |
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
778 |
|
2050
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
779 |
// ut_unescape_tabs_cr(text) |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
780 |
// Expand CR or TAB character sequences (\n, \t) in string text. |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
781 |
// If there is no CR/TAB in text, then the original pointer is returned |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
782 |
// (be careful _not_ to free the pointer in this case). |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
783 |
// If there are some unescaped sequences, a new string with those chars |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
784 |
// replaced with real newline/tab characters is allocated; in this case |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
785 |
// this is up to the caller to free this string after use. |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
786 |
char *ut_unescape_tabs_cr(const char *text) |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
787 |
{ |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
788 |
char *xtext, *linestart; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
789 |
char *p, *q; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
790 |
|
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
791 |
if (!text) |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
792 |
return NULL; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
793 |
|
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
794 |
p = g_strstr_len(text, -1, "\\n"); |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
795 |
if (!p) { |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
796 |
p = g_strstr_len(text, -1, "\\t"); |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
797 |
if (!p) |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
798 |
return (char*)text; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
799 |
} |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
800 |
|
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
801 |
xtext = g_new(char, strlen(text) + 1); |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
802 |
p = (char*)text; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
803 |
q = linestart = xtext; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
804 |
do { |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
805 |
if (*p == '\\') { |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
806 |
if (*(p+1) == '\\' && (*(p+2) == 'n' || *(p+2) == 't')) { |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
807 |
// This is an escaped CR sequence |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
808 |
*q++ = '\\'; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
809 |
*q++ = 'n'; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
810 |
p += 2; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
811 |
continue; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
812 |
} |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
813 |
if (*(p+1) == 'n' || *(p+1) == 't') { |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
814 |
// This is a CR sequence |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
815 |
p++; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
816 |
*q++ = (*p == 'n' ? '\n' : '\t'); |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
817 |
continue; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
818 |
} |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
819 |
} |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
820 |
*q++ = *p; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
821 |
} while (*p++); |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
822 |
|
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
823 |
return xtext; |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
824 |
} |
998feaa54ef0
Add ut_unescape_tabs_cr()
Mikael Berthe <mikael@lilotux.net>
parents:
2049
diff
changeset
|
825 |
|
727
1c3620668857
Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
826 |
|
803
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
827 |
/* Cygwin's newlib does not have strcasestr() */ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
828 |
/* 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
|
829 |
* Jeffrey Stedfast <fejj@ximian.com> |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
830 |
* 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
|
831 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
832 |
#if !defined(HAVE_STRCASESTR) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
833 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
834 |
# 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
|
835 |
# 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
|
836 |
# 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
|
837 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
838 |
/* 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
|
839 |
# 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
|
840 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
841 |
static unsigned char * |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
842 |
__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
|
843 |
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
|
844 |
{ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
845 |
register unsigned char *hc_ptr, *nc_ptr; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
846 |
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
|
847 |
size_t skiptable[256], n; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
848 |
register int i; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
849 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
850 |
#ifdef BOYER_MOORE_CHECKS |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
851 |
/* 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
|
852 |
/* 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
|
853 |
if (haystacklen < needlelen) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
854 |
return NULL; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
855 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
856 |
/* 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
|
857 |
if (needlelen == 0) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
858 |
return (unsigned char *) haystack; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
859 |
#endif /* BOYER_MOORE_CHECKS */ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
860 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
861 |
/* 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
|
862 |
ne_ptr = (unsigned char *) needle + needlelen - 1; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
863 |
he_ptr = (unsigned char *) haystack + haystacklen - 1; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
864 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
865 |
/* create our skip table */ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
866 |
for (i = 0; i < 256; i++) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
867 |
skiptable[i] = needlelen; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
868 |
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
|
869 |
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
|
870 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
871 |
h_ptr = (unsigned char *) haystack; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
872 |
while (haystacklen >= needlelen) { |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
873 |
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
|
874 |
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
|
875 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
876 |
/* 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
|
877 |
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
|
878 |
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
|
879 |
break; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
880 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
881 |
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
|
882 |
n = skiptable[bm_index (*hc_ptr, icase)]; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
883 |
if (n == needlelen && i) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
884 |
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
|
885 |
n--; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
886 |
h_ptr += n; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
887 |
haystacklen -= n; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
888 |
} else |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
889 |
return (unsigned char *) h_ptr; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
890 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
891 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
892 |
return NULL; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
893 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
894 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
895 |
/* |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
896 |
* strcasestr: |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
897 |
* @haystack: string to search |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
898 |
* @needle: substring to search for |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
899 |
* |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
900 |
* 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
|
901 |
* string @haystack ignoring case. |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
902 |
* |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
903 |
* 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
|
904 |
* @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
|
905 |
**/ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
906 |
char * |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
907 |
strcasestr (const char *haystack, const char *needle) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
908 |
{ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
909 |
register unsigned char *h, *n, *hc, *nc; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
910 |
size_t needlelen; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
911 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
912 |
needlelen = strlen (needle); |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
913 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
914 |
if (needlelen == 0) { |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
915 |
return (char *) haystack; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
916 |
} else if (bm_optimal (0, needlelen)) { |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
917 |
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
|
918 |
strlen (haystack), |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
919 |
(const unsigned char *) needle, |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
920 |
needlelen, 1); |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
921 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
922 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
923 |
h = (unsigned char *) haystack; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
924 |
n = (unsigned char *) needle; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
925 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
926 |
while (*(h + needlelen - 1)) { |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
927 |
if (lowercase (*h) == lowercase (*n)) { |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
928 |
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
|
929 |
if (lowercase (*hc) != lowercase (*nc)) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
930 |
break; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
931 |
|
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
932 |
if (!*nc) |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
933 |
return (char *) h; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
934 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
935 |
h++; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
936 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
937 |
return NULL; |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
938 |
} |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
939 |
#endif /* !HAVE_STRCASESTR */ |
8f8d8f8157a2
Take care of the strcasestr lacking (Cygwin)
Soren Andersen <somian@pobox.com>
parents:
802
diff
changeset
|
940 |
|
1203 | 941 |
// startswith(str, word, ignore_case) |
1192 | 942 |
// Returns TRUE if string str starts with word. |
1203 | 943 |
int startswith(const char *str, const char *word, guint ignore_case) |
1192 | 944 |
{ |
1203 | 945 |
if (ignore_case && !strncasecmp(str, word, strlen(word))) |
946 |
return TRUE; |
|
947 |
else if (!ignore_case && !strncmp(str, word, strlen(word))) |
|
1192 | 948 |
return TRUE; |
949 |
return FALSE; |
|
950 |
} |
|
951 |
||
2309
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
952 |
// mkcmdstr(cmd) returns a pointer to a const string with the command |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
953 |
// prefixed with COMMAND_CHAR. |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
954 |
const char *mkcmdstr(const char *cmd) |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
955 |
{ |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
956 |
static char fcmd[INPUTLINE_LENGTH+1]; |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
957 |
|
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
958 |
fcmd[0] = COMMAND_CHAR; |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
959 |
fcmd[1] = 0; |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
960 |
|
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
961 |
strncat(fcmd+1, cmd, INPUTLINE_LENGTH-1); |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
962 |
return fcmd; |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
963 |
} |
e00ae0763468
Do not use litteral command char (':', '/')
Mikael Berthe <mikael@lilotux.net>
parents:
2283
diff
changeset
|
964 |
|
1811 | 965 |
/* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */ |