Commit Diff
Diff:
c7bd9da4461d502f1114bf52637a596650a72905
097c7bd741931bfbb9deef26fca4861b42e3bda6
Commit:
097c7bd741931bfbb9deef26fca4861b42e3bda6
Tree:
bca02770d6146b28f70340a1e293889504635878
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Sun Apr 9 12:53:07 2006 UTC
Message:
Fix up ngt_TrimStr() once more ... :-/
blob - 27051ced632cdc5e8280bb11f35c37a79b059082
blob + 01d892fd97a903c4e21cdde716bccbad2ffef67a
--- src/tool/tool.c
+++ src/tool/tool.c
@@ -14,7 +14,7 @@
#include "portab.h"
-static char UNUSED id[] = "$Id: tool.c,v 1.5 2006/03/24 23:25:39 fw Exp $";
+static char UNUSED id[] = "$Id: tool.c,v 1.6 2006/04/09 12:53:07 alex Exp $";
#include "imp.h"
#include <assert.h>
@@ -40,18 +40,20 @@ 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;
+ *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 */
IRCNow