--- libaitio/src/Attic/tools.c 2010/04/05 08:51:34 1.1.2.3 +++ libaitio/src/Attic/tools.c 2011/04/20 22:56:32 1.4 @@ -1,11 +1,48 @@ /************************************************************************* -* (C) 2008 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.1.2.3 2010/04/05 08:51:34 misho Exp $ +* $Id: tools.c,v 1.4 2011/04/20 22:56:32 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "aitio.h" @@ -15,7 +52,7 @@ * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_LTrimStr(u_char *psLine) +inline int io_LTrimStr(u_char * __restrict psLine) { int pos = 0; u_char *s; @@ -35,7 +72,7 @@ inline int io_LTrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_RTrimStr(u_char *psLine) +inline int io_RTrimStr(u_char * __restrict psLine) { u_char *t, *pos; @@ -54,7 +91,7 @@ inline int io_RTrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_TrimStr(u_char *psLine) +inline int io_TrimStr(u_char * __restrict psLine) { int ret = 0; @@ -69,7 +106,7 @@ inline int io_TrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ -inline int io_UnquotStr(u_char *psLine) +inline int io_UnquotStr(u_char * __restrict psLine) { char *pos, *str = NULL; int flg; @@ -97,30 +134,30 @@ inline int io_UnquotStr(u_char *psLine) } /* - * io_Char2Hex() Convert from Char string to Hex string + * io_Ch2Hex() Convert from Char string to Hex string * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) */ -inline char *io_Char2Hex(u_char *psLine, int lineLen) +inline u_char *io_Ch2Hex(u_char *psLine, int lineLen) { register int i; - char szWork[3], *str; + char szWork[3]; + u_char *str; if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen * 2 + 1); + str = malloc(lineLen / 2); if (!str) { LOGERR; return NULL; } else - memset(str, 0, lineLen * 2 + 1); + memset(str, 0, lineLen / 2); - for (i = 0; i < lineLen && psLine[i]; i++) { - memset(szWork, 0, 3); - snprintf(szWork, 3, "%02X", (u_char) psLine[i]); - strncat(str, szWork, 2); + for (i = 0; i < lineLen && psLine[i * 2]; i++) { + strlcpy(szWork, (char*) &psLine[i * 2], 3); + str[i] = (u_char) strtol(szWork, NULL, 16); } return str; @@ -128,12 +165,12 @@ inline char *io_Char2Hex(u_char *psLine, int lineLen) /* - * io_Hex2Char() Convert from Hex string to Char string + * io_Hex2Ch() Convert from Hex string to Char string * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) */ -inline char *io_Hex2Char(u_char *psLine, int lineLen) +inline char *io_Hex2Ch(u_char *psLine, int lineLen) { register int i; char szWork[3], *str; @@ -141,16 +178,17 @@ inline char *io_Hex2Char(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen / 2 + 1); + str = malloc(lineLen * 2 + 1); if (!str) { LOGERR; return NULL; } else - memset(str, 0, lineLen / 2 + 1); + memset(str, 0, lineLen * 2 + 1); - for (i = 0; i < lineLen && psLine[i * 2]; i++) { - strlcpy(szWork, (char*) &psLine[i * 2], 3); - str[i] = (char) strtol(szWork, NULL, 16); + for (i = 0; i <= lineLen; i++) { + memset(szWork, 0, 3); + snprintf(szWork, 3, "%02X", (u_char) psLine[i]); + strncat(str, szWork, 2); } return str;