diff options
Diffstat (limited to 'string/argz-ctsep.c')
| -rw-r--r-- | string/argz-ctsep.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/string/argz-ctsep.c b/string/argz-ctsep.c index 9560591cb3..461b9beb87 100644 --- a/string/argz-ctsep.c +++ b/string/argz-ctsep.c @@ -1,21 +1,21 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <argz.h> #include <errno.h> @@ -28,11 +28,11 @@ __argz_create_sep (const char *string, int delim, char **argz, size_t *len) { size_t nlen = strlen (string) + 1; - if (nlen != 0) + if (nlen > 1) { const char *rp; char *wp; - + *argz = (char *) malloc (nlen); if (*argz == NULL) return ENOMEM; @@ -50,10 +50,19 @@ __argz_create_sep (const char *string, int delim, char **argz, size_t *len) else *wp++ = *rp; while (*rp++ != '\0'); + + if (nlen == 0) + { + free (*argz); + *argz = NULL; + *len = 0; + } + } + else + { + *argz = NULL; + *len = 0; } - if (nlen == 0) - *argz = NULL; - *len = nlen; return 0; } |