--- libelwix/src/str.c 2014/01/29 14:16:54 1.4 +++ libelwix/src/str.c 2015/06/25 00:36:48 1.5.8.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: str.c,v 1.4 2014/01/29 14:16:54 misho Exp $ +* $Id: str.c,v 1.5.8.1 2015/06/25 00:36:48 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 - 2014 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -429,4 +429,33 @@ str_Lower(char * __restrict psLine) } return cx; +} + +/* + * str_getString() - Get string from data buffer + * + * @data = 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; }