mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 11:00:04 +08:00
729d1ff9d8
* libc/argz/argz_add.c: Change to use _DEFUN macro for function
definition.
* libc/argz/argz_add_sep.c: Ditto.
* libc/argz/argz_append.c libc/argz/argz_count.c: Ditto.
* libc/argz/argz_create.c libc/argz/argz_create_sep.c: Ditto.
* libc/argz/argz_delete.c libc/argz/argz_extract.c: Ditto.
* libc/argz/argz_insert.c libc/argz/argz_next.c: Ditto.
* libc/argz/argz_replace.c libc/argz/argz_stringify.c: Ditto.
* libc/argz/envz_add.c libc/argz/envz_entry.c: Ditto.
* libc/argz/envz_get.c libc/argz/envz_merge.c: Ditto.
* libc/argz/envz_remove.c libc/argz/envz_strip.c: Ditto.
* libc/locale/nl_langinfo.c libc/misc/ffs.c: Ditto.
* libc/posix/closedir.c libc/posix/creat.c: Ditto.
* libc/posix/execl.c libc/posix/execle.c: Ditto.
* libc/posix/execlp.c libc/posix/execve.c: Ditto.
* libc/posix/isatty.c libc/posix/opendir.c: Ditto.
* libc/posix/popen.c libc/posix/readdir.c: Ditto.
* libc/posix/readdir_r.c libc/posix/rewinddir.c: Ditto.
* libc/posix/scandir.c libc/posix/seekdir.c: Ditto.
* libc/posix/telldir.c libc/search/hcreate.c: Ditto.
* libc/search/tdelete.c libc/search/tdestroy.c: Ditto.
* libc/search/tfind.c libc/search/tsearch.c: Ditto.
* libc/search/twalk.c libc/signal/signal.c: Ditto.
62 lines
1.4 KiB
C
62 lines
1.4 KiB
C
/* Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software
|
|
* is freely granted, provided that this notice is preserved.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <sys/types.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <argz.h>
|
|
#include <envz.h>
|
|
|
|
error_t
|
|
_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
|
|
char **envz _AND
|
|
size_t *envz_len _AND
|
|
const char *envz2 _AND
|
|
size_t envz2_len _AND
|
|
int override)
|
|
{
|
|
char *entry = NULL;
|
|
char *name_str = NULL;
|
|
char *val_str = NULL;
|
|
char *name_iter = NULL;
|
|
int retval = 0;
|
|
|
|
while((entry = argz_next((char *)envz2, envz2_len, entry)) && !retval)
|
|
{
|
|
if (!override)
|
|
{
|
|
name_str = strdup (entry);
|
|
name_iter = strchr(name_str, '=');
|
|
if(name_iter)
|
|
*name_iter = '\0';
|
|
|
|
if(!envz_entry(*envz, *envz_len, name_str))
|
|
{
|
|
retval = argz_add(envz, envz_len, entry);
|
|
}
|
|
free(name_str);
|
|
}
|
|
else
|
|
{
|
|
name_str = strdup (entry);
|
|
name_iter = strchr(name_str, '=');
|
|
if(name_iter)
|
|
{
|
|
*name_iter = '\0';
|
|
val_str = name_iter + 1;
|
|
}
|
|
else
|
|
{
|
|
val_str = NULL;
|
|
}
|
|
|
|
retval = envz_add(envz, envz_len, name_str, val_str);
|
|
}
|
|
}
|
|
return retval;
|
|
}
|