--- libelwix/src/str.c 2013/05/26 20:03:19 1.2.4.1 +++ libelwix/src/str.c 2018/05/31 15:35:16 1.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: str.c,v 1.2.4.1 2013/05/26 20:03:19 misho Exp $ +* $Id: str.c,v 1.8 2018/05/31 15:35:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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, 2012, 2013 +Copyright 2004 - 2018 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -230,7 +230,7 @@ str_Hex2Dig(const char *psLine) { register int i, j; char *str, szWork[3] = { 0, 0, 0 }; - ait_val_t *v, s; + ait_val_t *v, s = AIT_VAL_INIT; u_char *b; int n; @@ -429,4 +429,65 @@ str_Lower(char * __restrict psLine) } return cx; +} + +/* + * str_getString() - Get NULL delimited string from data buffer + * + * @data = Const data buffer + * @dlen = Data length + * @next = Return next position after string if !=NULL + * return: -1 error or size of string + */ +int +str_getString(const u_char * __restrict data, int dlen, char ** __restrict next) +{ + const u_char *pos; + + if (!data || !dlen) + return -1; + + for (pos = data; pos < data + dlen; pos++) + if (!*pos) + break; + if (*pos) { + elwix_SetErr(ENOEXEC, "Not found null-terminated string"); + return -1; + } + + if (next) + *next = (char*) pos + 1; + return pos - data + 1; +} + +/* + * str_getString2() - Get string from data buffer with delimiter + * + * @data = Data buffer + * @dlen = Data length + * @delim = Data delimiter + * @next = Return next position after delimited string if !=NULL + * return: -1 error or size of string + */ +int +str_getString2(char * __restrict data, int dlen, char delim, char ** __restrict next) +{ + char *pos; + + if (!data || !dlen) + return -1; + + for (pos = data; pos < data + dlen; pos++) + if (!*pos || *pos == (u_char) delim) { + *pos = 0; + break; + } + if (*pos) { + elwix_SetErr(ENOEXEC, "Not found null-terminated string"); + return -1; + } + + if (next) + *next = (char*) pos + 1; + return pos - data; }