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

diff --git a/src/tool/tool.c b/src/tool/tool.c
index effa640d..27051ced 100644
--- a/src/tool/tool.c
+++ b/src/tool/tool.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: tool.c,v 1.4 2006/03/22 08:05:10 alex Exp $";
+static char UNUSED id[] = "$Id: tool.c,v 1.5 2006/03/24 23:25:39 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -43,16 +43,21 @@ ngt_TrimStr(char *String)
 	while (*start == ' ' || *start == '\t')
 		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 > start)
 		end--;
 
 	/* New trailing NULL byte */
 	*(++end) = '\0';
 
-	memmove(String, start, (size_t)(end - start));
+	memmove(String, start, (size_t)(end - start)+1);
 } /* ngt_TrimStr */