picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update. 

* stdlib/Makefile: Add rules to build and run tst-putenv.
	* stdlib/tst-putenv.c: New file.
	* stdlib/tst-putenvmod.c: New file.
This commit is contained in:
Ulrich Drepper 2005-01-04 07:48:13 +00:00
parent 3fb2606af3
commit 574b268e7f
4 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
* sysdeps/generic/libc-start.c [SHARED] (__libc_start_main): Don't
initialize __environ again.
* stdlib/Makefile: Add rules to build and run tst-putenv.
* stdlib/tst-putenv.c: New file.
* stdlib/tst-putenvmod.c: New file.
* sysdeps/unix/sysv/linux/init-first.c: Clean file up. Don't
define unnecessary wrappers or aliases of static functions.

23
stdlib/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1991-2002, 2003, 2004 Free Software Foundation, Inc.
# Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -65,6 +65,11 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
tst-rand48 bug-strtod tst-setcontext test-a64l tst-qsort \
tst-system testmb2
include ../Makeconfig
ifeq ($(build-shared),yes)
tests += tst-putenv
endif
# Several mpn functions from GNU MP are used by the strtod function.
mpn-routines := inlines add_n addmul_1 cmp divmod_1 divrem udiv_qrnnd \
@ -75,9 +80,13 @@ routines := $(strip $(routines) $(mpn-routines)) \
dbl2mpn ldbl2mpn \
mpn2flt mpn2dbl mpn2ldbl
aux += fpioconst mp_clz_tab
distribute := $(distribute) $(mpn-headers) gen-mpn-copy fpioconst.h
distribute := $(distribute) $(mpn-headers) gen-mpn-copy fpioconst.h \
tst-putenvmod.c
generated += isomac isomac.out
tests-extras += tst-putenvmod
extra-objs += tst-putenvmod.os
generated += isomac isomac.out tst-putenvmod.so
CFLAGS-bsearch.c = $(uses-callbacks)
CFLAGS-msort.c = $(uses-callbacks)
@ -85,8 +94,6 @@ CFLAGS-qsort.c = $(uses-callbacks)
CFLAGS-system.c = -fexceptions
CFLAGS-fmtmsg.c = -fexceptions
include ../Makeconfig
ifneq (,$(filter %REENTRANT, $(defines)))
CFLAGS-strfmon.c = -D_IO_MTSAFE_IO
CFLAGS-strfmon_l.c = -D_IO_MTSAFE_IO
@ -124,3 +131,9 @@ $(objpfx)isomac: isomac.c
$(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
$(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
$(build-module)
CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1

18
stdlib/tst-putenv.c Normal file
View File

@ -0,0 +1,18 @@
#include <stdio.h>
#include <stdlib.h>
static int
do_test (void)
{
char *p = getenv ("SOMETHING_NOBODY_USES");
if (p == NULL)
{
puts ("envvar not defined");
return 1;
}
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

17
stdlib/tst-putenvmod.c Normal file
View File

@ -0,0 +1,17 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
void
__attribute ((constructor))
init (void)
{
puts ("init DSO");
static char str[] = "SOMETHING_NOBODY_USES=something_else";
if (putenv (str) != 0)
{
puts ("putenv failed");
_exit (1);
}
}