mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-19 21:09:22 +08:00
c87be3e4d6
* libc/signal/signal.c (_signal_r) : Removed unused local variable temp. * libc/stdio/findfp.c (std): Added declaration of flags and file.
* libc/stdio/mktemp.c (_gettemp, _mkstemp_r, mkstemp): Added int
return type.
* libc/stdio/putchar.c (putchar): Added return statement.
* libc/stdio/refill.c (lflush): Added correct parentheses.
* libc/stdio/vfprintf.c (_VFPRINTF_R): Ditto.
* libc/stdio/vfscanf.c (__svfscanf): Changed sprintf call which
prints long value to use l qualifier.
* libc/stdlib/dtoa.c (_dtoa_r): Added parentheses to remove warning
messages and initialized local values: ilim, ilim1, and spec_case.
* libc/stdlib/ecvtbuf.c (print_e): Removed unused variable dp.
* libc/stdlib/mbctype.h (_issjis1, _issjis2): Added parentheses.
* libc/stdlib/mprec.c: Ditto.
* libc/stdlib/setenv_r.c: Ditto.
* libc/stdlib/strtod.c: Ditto.
* libc/stdlib/strtol.c: Ditto.
* libc/stdlib/strtoul.c: Ditto.
* libm/common/sf_expm1.c: Added curly braces to if else clauses.
* libm/common/sf_log1p.c: Ditto.
* libm/common/sf_scalbn.c: Ditto.
* libm/math/ef_log.c: Ditto.
140 lines
3.7 KiB
C
140 lines
3.7 KiB
C
/* This file may have been modified by DJ Delorie (Jan 1991). If so,
|
|
** these modifications are Coyright (C) 1991 DJ Delorie, 24 Kirsten Ave,
|
|
** Rochester NH, 03867-2954, USA.
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 1987 Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that: (1) source distributions retain this entire copyright
|
|
* notice and comment, and (2) distributions including binaries display
|
|
* the following acknowledgement: ``This product includes software
|
|
* developed by the University of California, Berkeley and its contributors''
|
|
* in the documentation or other materials provided with the distribution
|
|
* and in all advertising materials mentioning features or use of this
|
|
* software. Neither the name of the University nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
#include <reent.h>
|
|
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "envlock.h"
|
|
|
|
/* _findenv_r is defined in getenv_r.c. */
|
|
extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *));
|
|
|
|
/*
|
|
* _setenv_r --
|
|
* Set the value of the environmental variable "name" to be
|
|
* "value". If rewrite is set, replace any current value.
|
|
*/
|
|
|
|
int
|
|
_DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
|
|
struct _reent *reent_ptr _AND
|
|
_CONST char *name _AND
|
|
_CONST char *value _AND
|
|
int rewrite)
|
|
{
|
|
extern char **environ;
|
|
static int alloced; /* if allocated space before */
|
|
register char *C;
|
|
int l_value, offset;
|
|
|
|
ENV_LOCK;
|
|
|
|
if (*value == '=') /* no `=' in value */
|
|
++value;
|
|
l_value = strlen (value);
|
|
if ((C = _findenv_r (reent_ptr, name, &offset)))
|
|
{ /* find if already exists */
|
|
if (!rewrite)
|
|
{
|
|
ENV_UNLOCK;
|
|
return 0;
|
|
}
|
|
if (strlen (C) >= l_value)
|
|
{ /* old larger; copy over */
|
|
while ((*C++ = *value++) != 0);
|
|
ENV_UNLOCK;
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
{ /* create new slot */
|
|
register int cnt;
|
|
register char **P;
|
|
|
|
for (P = environ, cnt = 0; *P; ++P, ++cnt);
|
|
if (alloced)
|
|
{ /* just increase size */
|
|
environ = (char **) _realloc_r (reent_ptr, (char *) environ,
|
|
(size_t) (sizeof (char *) * (cnt + 2)));
|
|
if (!environ)
|
|
{
|
|
ENV_UNLOCK;
|
|
return -1;
|
|
}
|
|
}
|
|
else
|
|
{ /* get new space */
|
|
alloced = 1; /* copy old entries into it */
|
|
P = (char **) _malloc_r (reent_ptr, (size_t) (sizeof (char *) * (cnt + 2)));
|
|
if (!P)
|
|
{
|
|
ENV_UNLOCK;
|
|
return (-1);
|
|
}
|
|
bcopy ((char *) environ, (char *) P, cnt * sizeof (char *));
|
|
environ = P;
|
|
}
|
|
environ[cnt + 1] = NULL;
|
|
offset = cnt;
|
|
}
|
|
for (C = (char *) name; *C && *C != '='; ++C); /* no `=' in name */
|
|
if (!(environ[offset] = /* name + `=' + value */
|
|
_malloc_r (reent_ptr, (size_t) ((int) (C - name) + l_value + 2))))
|
|
{
|
|
ENV_UNLOCK;
|
|
return -1;
|
|
}
|
|
for (C = environ[offset]; (*C = *name++) && *C != '='; ++C);
|
|
for (*C++ = '='; (*C++ = *value++) != 0;);
|
|
|
|
ENV_UNLOCK;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* _unsetenv_r(name) --
|
|
* Delete environmental variable "name".
|
|
*/
|
|
void
|
|
_DEFUN (_unsetenv_r, (reent_ptr, name),
|
|
struct _reent *reent_ptr _AND
|
|
_CONST char *name)
|
|
{
|
|
extern char **environ;
|
|
register char **P;
|
|
int offset;
|
|
|
|
ENV_LOCK;
|
|
|
|
while (_findenv_r (reent_ptr, name, &offset)) /* if set multiple times */
|
|
for (P = &environ[offset];; ++P)
|
|
if (!(*P = *(P + 1)))
|
|
break;
|
|
|
|
ENV_UNLOCK;
|
|
}
|