diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Makefile.am | 3 | ||||
| -rw-r--r-- | src/common/cfgfiles.c | 5 | ||||
| -rw-r--r-- | src/common/common.vcxproj | 2 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 6 | ||||
| -rw-r--r-- | src/common/servlist.c | 22 | ||||
| -rw-r--r-- | src/common/strlutil.c | 84 | ||||
| -rw-r--r-- | src/common/strlutil.h | 2 | ||||
| -rw-r--r-- | src/common/text.c | 18 | ||||
| -rw-r--r-- | src/common/util.h | 1 |
9 files changed, 130 insertions, 13 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6a35da91..409aa324 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = \ servlist.h \ ssl.h \ ssl.c \ + strlutil.c \ text.h \ textenums.h \ textevents.h \ @@ -54,7 +55,7 @@ SUBDIRS = $(dbusdir) . libxchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \ inbound.c modes.c msproxy.c network.c notify.c outbound.c \ plugin.c plugin-timer.c proto-irc.c server.c servlist.c $(ssl_c) \ - text.c tree.c url.c userlist.c util.c xchat.c + strlutil.c text.c tree.c url.c userlist.c util.c xchat.c libxchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) textevents: make-te diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 8bcfdd87..e696729e 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -733,7 +733,6 @@ load_config (void) /* prefs.userhost = 1; */ prefs.gui_chanlist_maxusers = 9999; prefs.gui_chanlist_minusers = 5; - prefs.gui_url_mod = 4; /* ctrl */ prefs.gui_tray = 1; prefs.gui_pane_left_size = 100; prefs.gui_pane_right_size = 100; @@ -745,7 +744,7 @@ load_config (void) prefs.input_tray_priv = prefs.input_tray_hilight = 1; prefs.autodccsend = 2; /* browse mode */ prefs.url_grabber = 1; - prefs.url_grabber_limit = 0; /* 0 means unlimited for backcompat */ + prefs.url_grabber_limit = 50; /* 0 means unlimited */ prefs.text_search_follow = 1; #ifdef WIN32 prefs.identd = 1; @@ -788,7 +787,7 @@ load_config (void) strcpy (prefs.font_alternative, DEF_FONT_ALTER); #endif strcpy (prefs.dnsprogram, "host"); - strcpy (prefs.irc_no_hilight, "NickServ,ChanServ"); + strcpy (prefs.irc_no_hilight, "NickServ,ChanServ,InfoServ,N,Q"); g_free ((char *)username); g_free ((char *)realname); diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 595a76fc..4cfb13ed 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -33,6 +33,7 @@ <ClInclude Include="server.h" /> <ClInclude Include="servlist.h" /> <ClInclude Include="ssl.h" /> + <ClInclude Include="strlutil.h" /> <ClInclude Include="text.h" /> <ClInclude Include="textenums.h" /> <ClInclude Include="textevents.h" /> @@ -65,6 +66,7 @@ <ClCompile Include="server.c" /> <ClCompile Include="servlist.c" /> <ClCompile Include="ssl.c" /> + <ClCompile Include="strlutil.c" /> <ClCompile Include="text.c" /> <ClCompile Include="thread.c" /> <ClCompile Include="tree.c" /> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index afb66e63..5be20199 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -110,6 +110,9 @@ <ClInclude Include="..\..\config.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="strlutil.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="cfgfiles.c"> @@ -190,5 +193,8 @@ <ClCompile Include="xchat.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="strlutil.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/common/servlist.c b/src/common/servlist.c index f58d2ce8..f41c3d50 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -288,17 +288,18 @@ static const struct defaultserver def[] = {"IdleMonkeys", 0}, {0, "irc.idlemonkeys.net"}, + {"IndirectIRC", 0}, +#ifdef USE_OPENSSL + {0, "irc.indirectirc.com/+6697"}, +#endif + {0, "irc.indirectirc.com"}, + /* {"Infinity-IRC", 0}, {0, "Atlanta.GA.US.Infinity-IRC.Org"}, {0, "Babylon.NY.US.Infinity-IRC.Org"}, {0, "Sunshine.Ca.US.Infinity-IRC.Org"}, {0, "IRC.Infinity-IRC.Org"},*/ - {"iZ-smart.net", 0}, - {0, "irc.iZ-smart.net/6666"}, - {0, "irc.iZ-smart.net/6667"}, - {0, "irc.iZ-smart.net/6668"}, - {"IrcLink", 0}, {0, "irc.irclink.net"}, {0, "Alesund.no.eu.irclink.net"}, @@ -322,6 +323,17 @@ static const struct defaultserver def[] = {"Irctoo.net", 0}, {0, "irc.irctoo.net"}, + {"IronDust", 0}, +#ifdef USE_OPENSSL + {0, "irc.irondust.net/+6697"}, +#endif + {0, "irc.irondust.net"}, + + {"iZ-smart.net", 0}, + {0, "irc.iZ-smart.net/6666"}, + {0, "irc.iZ-smart.net/6667"}, + {0, "irc.iZ-smart.net/6668"}, + {"Krstarica", 0}, {0, "irc.krstarica.com"}, diff --git a/src/common/strlutil.c b/src/common/strlutil.c new file mode 100644 index 00000000..c823c1e8 --- /dev/null +++ b/src/common/strlutil.c @@ -0,0 +1,84 @@ +/* + * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> +#include <string.h> + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t +strlcat(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return(dlen + (s - src)); /* count does not include NUL */ +} + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +} diff --git a/src/common/strlutil.h b/src/common/strlutil.h new file mode 100644 index 00000000..968aab53 --- /dev/null +++ b/src/common/strlutil.h @@ -0,0 +1,2 @@ +size_t strlcat(char *dst, const char *src, size_t siz); +size_t strlcpy(char *dst, const char *src, size_t siz); diff --git a/src/common/text.c b/src/common/text.c index 220fca1b..e12021c9 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -595,15 +595,25 @@ log_create_pathname (char *servname, char *channame, char *netname) tm = localtime (&now); strftime (fnametime, sizeof (fnametime), fname, tm); - /* create final path/filename */ + /* create final path/filename, check if it's absolute or relative */ #ifdef WIN32 - if (fnametime[0] == '/' || (fnametime[0] >= 'A' && fnametime[1] == ':')) + if ((fnametime[0] >= 'A' && fnametime[0] <= 'Z') || (fnametime[0] >= 'a' && fnametime[0] <= 'z') && fnametime[1] == ':') #else - if (fnametime[0] == '/') /* is it fullpath already? */ + /* If one uses log mask variables, such as "%c/...", %c will be empty upon + * connecting since there's no channel name yet, so we have to make sure + * we won't try to write to the FS root. On Windows we can be sure it's + * full path if the 2nd character is a colon since Windows doesn't allow + * colons in filenames. + */ + if (fnametime[0] == '/' && prefs.logmask[0] != '%') #endif + { snprintf (fname, sizeof (fname), "%s", fnametime); - else + } + else /* relative path */ + { snprintf (fname, sizeof (fname), "%s/logs/%s", get_xdir_utf8 (), fnametime); + } /* now we need it in FileSystem encoding */ fs = xchat_filename_from_utf8 (fname, -1, 0, 0, 0); diff --git a/src/common/util.h b/src/common/util.h index c2f1e118..e7e22524 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -14,6 +14,7 @@ #ifndef XCHAT_UTIL_H #define XCHAT_UTIL_H +#include "strlutil.h" #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)]) extern const unsigned char rfc_tolowertab[]; |