albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sort "feature string" alphabetically

This commit is contained in:
Alexander Barton 2012-09-17 00:55:30 +02:00
parent cfec819f0d
commit 1413a4886f
1 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/ngircd/ngircd.c
View File

@ -347,70 +347,99 @@ main(int argc, const char *argv[])
* line switch. * line switch.
*/ */
static void static void
Fill_Version( void ) Fill_Version(void)
{ {
NGIRCd_VersionAddition[0] = '\0'; NGIRCd_VersionAddition[0] = '\0';
#ifdef SYSLOG #ifdef DEBUG
strlcpy( NGIRCd_VersionAddition, "SYSLOG", sizeof NGIRCd_VersionAddition ); if (NGIRCd_VersionAddition[0])
#endif strlcat(NGIRCd_VersionAddition, "+",
#ifdef ZLIB sizeof NGIRCd_VersionAddition);
if( NGIRCd_VersionAddition[0] ) strlcat(NGIRCd_VersionAddition, "DEBUG",
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); sizeof NGIRCd_VersionAddition);
strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition );
#endif
#ifdef SSL_SUPPORT
if ( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "SSL", sizeof NGIRCd_VersionAddition );
#endif
#ifdef TCPWRAP
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
#endif #endif
#ifdef IDENTAUTH #ifdef IDENTAUTH
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "IDENT", sizeof NGIRCd_VersionAddition );
#endif
#ifdef PAM
if (NGIRCd_VersionAddition[0]) if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition); strlcat(NGIRCd_VersionAddition, "+",
strlcat(NGIRCd_VersionAddition, "PAM", sizeof NGIRCd_VersionAddition); sizeof NGIRCd_VersionAddition);
#endif strlcat(NGIRCd_VersionAddition, "IDENT",
#ifdef DEBUG sizeof NGIRCd_VersionAddition);
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "DEBUG", sizeof NGIRCd_VersionAddition );
#endif
#ifdef SNIFFER
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "SNIFFER", sizeof NGIRCd_VersionAddition );
#endif
#ifdef STRICT_RFC
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "RFC", sizeof NGIRCd_VersionAddition );
#endif
#ifdef IRCPLUS
if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "IRCPLUS", sizeof NGIRCd_VersionAddition );
#endif #endif
#ifdef WANT_IPV6 #ifdef WANT_IPV6
if (NGIRCd_VersionAddition[0]) if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+", sizeof(NGIRCd_VersionAddition)); strlcat(NGIRCd_VersionAddition, "+",
strlcat(NGIRCd_VersionAddition, "IPv6", sizeof(NGIRCd_VersionAddition)); sizeof(NGIRCd_VersionAddition));
strlcat(NGIRCd_VersionAddition, "IPv6",
sizeof(NGIRCd_VersionAddition));
#endif #endif
if( NGIRCd_VersionAddition[0] ) #ifdef IRCPLUS
strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition )); if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "IRCPLUS",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef PAM
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "PAM",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef STRICT_RFC
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "RFC",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef SNIFFER
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "SNIFFER",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef SSL_SUPPORT
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "SSL",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef SYSLOG
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "SYSLOG",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef TCPWRAP
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "TCPWRAP",
sizeof NGIRCd_VersionAddition);
#endif
#ifdef ZLIB
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "+",
sizeof NGIRCd_VersionAddition);
strlcat(NGIRCd_VersionAddition, "ZLIB",
sizeof NGIRCd_VersionAddition);
#endif
if (NGIRCd_VersionAddition[0])
strlcat(NGIRCd_VersionAddition, "-",
sizeof(NGIRCd_VersionAddition));
strlcat( NGIRCd_VersionAddition, HOST_CPU, sizeof( NGIRCd_VersionAddition )); strlcat(NGIRCd_VersionAddition, HOST_CPU,
strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); sizeof(NGIRCd_VersionAddition));
strlcat( NGIRCd_VersionAddition, HOST_VENDOR, sizeof( NGIRCd_VersionAddition )); strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition));
strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); strlcat(NGIRCd_VersionAddition, HOST_VENDOR,
strlcat( NGIRCd_VersionAddition, HOST_OS, sizeof( NGIRCd_VersionAddition )); sizeof(NGIRCd_VersionAddition));
strlcat(NGIRCd_VersionAddition, "/", sizeof(NGIRCd_VersionAddition));
strlcat(NGIRCd_VersionAddition, HOST_OS,
sizeof(NGIRCd_VersionAddition));
snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);