X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftool%2Ftool.c;h=b00e235eb739039f8d6d66a519689cb7d299308e;hb=4330f5d1c9119c4461c8fb7c8cf1f78a3ea53e4d;hp=effa640da84ad625e73647d0b361c880e975fdcc;hpb=cba9270845a6a6b03b4e163eb7fd5d3b9df96a50;p=ngircd-alex.git

diff --git a/src/tool/tool.c b/src/tool/tool.c
index effa640d..b00e235e 100644
--- a/src/tool/tool.c
+++ b/src/tool/tool.c
@@ -1,28 +1,35 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Tool functions
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.4 2006/03/22 08:05:10 alex Exp $";
+/**
+ * @file
+ * Tool functions
+ */
 
-#include "imp.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+
+#include <netinet/in.h>
+
+#ifdef SYSLOG
+#define SYSLOG_NAMES 1
+#include <syslog.h>
+#endif
 
-#include "exp.h"
 #include "tool.h"
 
 
@@ -40,11 +47,18 @@ ngt_TrimStr(char *String)
 	start = String;
 
 	/* Remove whitespaces at the beginning of the string ... */
-	while (*start == ' ' || *start == '\t')
+	while (*start == ' ' || *start == '\t' ||
+	       *start == '\n' || *start == '\r')
 		start++;
 
+	if (!*start) {
+		*String = '\0';
+		return;
+	}
+
 	/* ... and at the end: */
 	end = strchr(start, '\0');
+	end--;
 	while ((*end == ' ' || *end == '\t' || *end == '\n' || *end == '\r')
 	       && end >= start)
 		end--;
@@ -52,29 +66,44 @@ ngt_TrimStr(char *String)
 	/* New trailing NULL byte */
 	*(++end) = '\0';
 
-	memmove(String, start, (size_t)(end - start));
+	memmove(String, start, (size_t)(end - start)+1);
 } /* ngt_TrimStr */
 
 
+/**
+ * Convert a string to uppercase letters.
+ */
 GLOBAL char *
-ngt_LowerStr( char *String )
+ngt_UpperStr(char *String)
 {
-	/* String in Kleinbuchstaben konvertieren. Der uebergebene
-	 * Speicherbereich wird durch das Ergebnis ersetzt, zusaetzlich
-	 * wird dieser auch als Pointer geliefert. */
+	char *ptr;
+
+	assert(String != NULL);
+
+	ptr = String;
+	while(*ptr) {
+		*ptr = toupper((int)*ptr);
+		ptr++;
+	}
+	return String;
+} /* ngt_UpperStr */
+
 
+/**
+ * Convert a string to lowercase letters.
+ */
+GLOBAL char *
+ngt_LowerStr(char *String)
+{
 	char *ptr;
 
-	assert( String != NULL );
+	assert(String != NULL);
 
-	/* Zeichen konvertieren */
 	ptr = String;
-	while( *ptr )
-	{
-		*ptr = tolower( *ptr );
+	while(*ptr) {
+		*ptr = tolower((int)*ptr);
 		ptr++;
 	}
-	
 	return String;
 } /* ngt_LowerStr */
 
@@ -85,17 +114,136 @@ ngt_TrimLastChr( char *String, const char Chr)
 	/* If last character in the string matches Chr, remove it.
 	 * Empty strings are handled correctly. */
 
-        unsigned int len;
+	size_t len;
 
-	assert( String != NULL );
+	assert(String != NULL);
 
-	len = strlen( String );
-	if( len == 0 ) return;
+	len = strlen(String);
+	if(len == 0)
+		return;
 
 	len--;
 
-	if( String[len] == Chr ) String[len] = '\0';
+	if(String[len] == Chr)
+		String[len] = '\0';
 } /* ngt_TrimLastChr */
 
 
+/**
+ * Fill a String with random chars
+ */
+GLOBAL char *
+ngt_RandomStr(char *String, const size_t len)
+{
+	static const char chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!\"#$&'()*+,-./:;<=>?@[\\]^_`";
+	struct timeval t;
+	size_t i;
+
+	assert(String != NULL);
+
+	gettimeofday(&t, NULL);
+#ifndef HAVE_ARC4RANDOM
+	srand((unsigned)(t.tv_usec * t.tv_sec));
+
+	for (i = 0; i < len; ++i) {
+		String[i] = chars[rand() % (sizeof(chars) - 1)];
+	}
+#else
+	for (i = 0; i < len; ++i)
+		String[i] = chars[arc4random() % (sizeof(chars) - 1)];
+#endif
+	String[len] = '\0';
+
+	return String;
+} /* ngt_RandomStr */
+
+
+#ifdef SYSLOG
+
+
+#ifndef INTERNAL_MARK
+
+#ifndef _code
+typedef struct _code {
+        char    *c_name;
+        int     c_val;
+} CODE;
+#endif
+
+CODE facilitynames[] = {
+#ifdef LOG_AUTH
+	{ "auth",	LOG_AUTH },
+#endif
+#ifdef LOG_AUTHPRIV
+	{ "authpriv",	LOG_AUTHPRIV },
+#endif
+#ifdef LOG_CRON
+	{ "cron", 	LOG_CRON },
+#endif
+#ifdef LOG_DAEMON
+	{ "daemon",	LOG_DAEMON },
+#endif
+#ifdef LOG_FTP
+	{ "ftp",	LOG_FTP },
+#endif
+#ifdef LOG_LPR
+	{ "lpr",	LOG_LPR },
+#endif
+#ifdef LOG_MAIL
+	{ "mail",	LOG_MAIL },
+#endif
+#ifdef LOG_NEWS
+	{ "news",	LOG_NEWS },
+#endif
+#ifdef LOG_UUCP
+	{ "uucp",	LOG_UUCP },
+#endif
+#ifdef LOG_USER
+	{ "user",	LOG_USER },
+#endif
+#ifdef LOG_LOCAL7
+	{ "local0",	LOG_LOCAL0 },
+	{ "local1",	LOG_LOCAL1 },
+	{ "local2",	LOG_LOCAL2 },
+	{ "local3",	LOG_LOCAL3 },
+	{ "local4",	LOG_LOCAL4 },
+	{ "local5",	LOG_LOCAL5 },
+	{ "local6",	LOG_LOCAL6 },
+	{ "local7",	LOG_LOCAL7 },
+#endif
+	{ 0,		-1 }
+};
+
+#endif
+
+
+GLOBAL const char*
+ngt_SyslogFacilityName(int Facility)
+{
+	int i = 0;
+	while(facilitynames[i].c_name) {
+		if (facilitynames[i].c_val == Facility)
+			return facilitynames[i].c_name;
+		i++;
+	}
+	return "unknown";
+}
+
+
+GLOBAL int
+ngt_SyslogFacilityID(char *Name, int DefaultFacility)
+{
+	int i = 0;
+	while(facilitynames[i].c_name) {
+		if (strcasecmp(facilitynames[i].c_name, Name) == 0)
+			return facilitynames[i].c_val;
+		i++;
+	}
+	return DefaultFacility;
+}
+
+
+#endif
+
+
 /* -eof- */