From bebfbedf3fdf801a028c17a5b4395f705391462d Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 24 Mar 2006 23:25:38 +0000 Subject: fix ngt_TrimStr(), fix format string --- src/tool/tool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/tool/tool.c') 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 @@ -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 */ -- cgit 1.4.1