mcabber: mcabber/mcabber/utils.c annotate

annotate mcabber/mcabber/utils.c @ 2309:e00ae0763468

Do not use litteral command char (':', '/')

author	Mikael Berthe <mikael@lilotux.net>
date	Sat, 11 Feb 2017 12:40:43 +0100
parents	6e1ead98930d
children	6424627913be

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

Mercurial > ~mikael > mcabber > hg

annotate mcabber/mcabber/utils.c @ 2309:e00ae0763468