stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Dont use strndup(). It's too GNUish

Browse source
This commit is contained in:
Andreas Öman 2010-02-16 19:53:53 +00:00
parent 197b460079
commit 8ae7d9e6f6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/htsstr.c
View file

@ -17,8 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _GNU_SOURCE /* strndup */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -28,6 +26,14 @@
static void htsstr_argsplit_add(char ***argv, int *argc, char *s);
static int htsstr_format0(const char *str, char *out, char **map);
static char *
mystrndup(const char *src, size_t len)
{
char *r = malloc(len + 1);
r[len] = 0;
return memcpy(r, src, len);
}
char *
htsstr_unescape(char *str) {
@ -79,7 +85,7 @@ htsstr_argsplit(const char *str) {
for(s = str; *s; s++) {
if(start && stop) {
htsstr_argsplit_add(&argv, &argc,
htsstr_unescape(strndup(start, stop - start)));
htsstr_unescape(mystrndup(start, stop - start)));
start = stop = NULL;
}
@ -125,7 +131,7 @@ htsstr_argsplit(const char *str) {
if(!stop)
stop = str + strlen(str);
htsstr_argsplit_add(&argv, &argc,
htsstr_unescape(strndup(start, stop - start)));
htsstr_unescape(mystrndup(start, stop - start)));
}
htsstr_argsplit_add(&argv, &argc, NULL);