9bab236702
or replace (i.e., zdump) the environment after a call to setenv(), putenv()
or unsetenv() has been made, a few changes were made.
- getenv() will return the value from the new environ array.
- setenv() was split into two functions: __setenv() which is most of the
previous setenv() without checks on the name and setenv() which
contains the checks before calling __setenv().
- setenv(), putenv() and unsetenv() will unset all previous values and
call __setenv() on all entries in the new environ array which in turn
adds them to the end of the envVars array. Calling __setenv() instead
of setenv() is done to avoid the temporary replacement of the '=' in a
string with a NUL byte. Some strings may be read-only data.
Added more regression checks for clearing the environment array.
Replaced gettimeofday() with getrusage() in timing regression check for
better accuracy.
Fixed an off-by-one bug in __remove_putenv() in the use of memmove(). This
went unnoticed due to the allocation of double the number of environ
entries when building envVars.
Fixed a few spelling mistakes in the comments.
Reviewed by: ache
Approved by: wes
Approved by: re (kensmith)
204 lines
4.6 KiB
Bash
204 lines
4.6 KiB
Bash
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Sean C. Farley <scf@FreeBSD.org>
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer,
|
|
# without modification, immediately at the beginning of the file.
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# $FreeBSD$
|
|
|
|
|
|
# Initialization.
|
|
testndx=0
|
|
|
|
|
|
# Testing function.
|
|
run_test()
|
|
{
|
|
lasttest="${@}"
|
|
result=`./envctl -t "${@}"`
|
|
|
|
if [ ${?} -ne 0 ]
|
|
then
|
|
echo "Test program failed" >&2
|
|
exit 1
|
|
fi
|
|
|
|
return
|
|
}
|
|
|
|
|
|
# Perform test on results.
|
|
check_result()
|
|
{
|
|
testndx=$((testndx + 1))
|
|
|
|
echo "${result}" | sed 's/[ \t]*$//' | grep -q "^${@}$"
|
|
if [ ${?} -eq 0 ]
|
|
then
|
|
echo "ok ${testndx}"
|
|
else
|
|
echo "not ok ${testndx} - '${lasttest}'"
|
|
fi
|
|
|
|
return
|
|
}
|
|
|
|
|
|
#
|
|
# Regression tests
|
|
#
|
|
|
|
# Setup environment for tests.
|
|
readonly BAR="bar"
|
|
readonly NEWBAR="newbar"
|
|
export FOO=${BAR}
|
|
|
|
|
|
# Gets from environ.
|
|
run_test -g FOO
|
|
check_result "${FOO}"
|
|
|
|
run_test -c -g FOO
|
|
check_result ""
|
|
|
|
run_test -g FOOBAR
|
|
check_result ""
|
|
|
|
run_test -c -g FOOBAR
|
|
check_result ""
|
|
|
|
run_test -G
|
|
check_result ""
|
|
|
|
|
|
# Sets.
|
|
run_test -s FOO ${NEWBAR} 0 -g FOO
|
|
check_result "0 0 ${BAR}"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 ${NEWBAR}"
|
|
|
|
run_test -c -s FOO ${NEWBAR} 0 -g FOO
|
|
check_result "0 0 ${NEWBAR}"
|
|
|
|
run_test -c -s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 ${NEWBAR}"
|
|
|
|
run_test -s "FOO=" ${NEWBAR} 1 -g FOO
|
|
check_result "-1 22 ${BAR}"
|
|
|
|
run_test -s "=FOO" ${NEWBAR} 1
|
|
check_result "-1 22"
|
|
|
|
run_test -s "=" ${NEWBAR} 1
|
|
check_result "-1 22"
|
|
|
|
run_test -s "" ${NEWBAR} 1
|
|
check_result "-1 22"
|
|
|
|
run_test -S ${NEWBAR} 1
|
|
check_result "-1 22"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -g FOO
|
|
check_result "0 0 0 0 ${BAR}"
|
|
|
|
run_test -c -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -g FOO
|
|
check_result "0 0 0 0 ${BAR}"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 0 0 0 0 ${NEWBAR}"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1 -s FOO ${NEWBAR} 1 -s FOO ${BAR} 1\
|
|
-g FOO
|
|
check_result "0 0 0 0 0 0 0 0 ${BAR}"
|
|
|
|
run_test -c -s FOO ${BAR} 1 -g FOO -c -s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 ${BAR} 0 0 ${NEWBAR}"
|
|
|
|
|
|
# Unsets.
|
|
run_test -u FOO -g FOO
|
|
check_result "0 0"
|
|
|
|
run_test -c -u FOO -g FOO
|
|
check_result "0 0"
|
|
|
|
run_test -U
|
|
check_result "-1 22"
|
|
|
|
run_test -u ""
|
|
check_result "-1 22"
|
|
|
|
run_test -u "=${BAR}"
|
|
check_result "-1 22"
|
|
|
|
run_test -c -s FOO ${NEWBAR} 1 -g FOO -u FOO -g FOO
|
|
check_result "0 0 ${NEWBAR} 0 0"
|
|
|
|
run_test -c -u FOO -s FOO ${BAR} 1 -g FOO -u FOO -g FOO -c -u FOO\
|
|
-s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 0 0 ${BAR} 0 0 0 0 0 0 ${NEWBAR}"
|
|
|
|
|
|
# Puts.
|
|
run_test -p FOO=${NEWBAR} -g FOO
|
|
check_result "0 0 ${NEWBAR}"
|
|
|
|
run_test -c -p FOO=${NEWBAR} -g FOO
|
|
check_result "0 0 ${NEWBAR}"
|
|
|
|
run_test -p FOO -g FOO
|
|
check_result "-1 22 ${BAR}"
|
|
|
|
run_test -p FOO=${BAR} -p FOO=${NEWBAR} -g FOO
|
|
check_result "0 0 0 0 ${NEWBAR}"
|
|
|
|
run_test -p FOO=${BAR} -s FOO ${NEWBAR} 1 -g FOO
|
|
check_result "0 0 0 0 ${NEWBAR}"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -g FOO
|
|
check_result "0 0 0 0 ${BAR}"
|
|
|
|
run_test -p FOO=${BAR} -u FOO
|
|
check_result "0 0 0 0"
|
|
|
|
run_test -p FOO=${BAR} -s FOO ${NEWBAR} 1 -u FOO
|
|
check_result "0 0 0 0 0 0"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -u FOO
|
|
check_result "0 0 0 0 0 0"
|
|
|
|
run_test -s FOO ${NEWBAR} 1 -p FOO=${BAR} -c -g FOO -p FOO=${NEWBAR} -g FOO
|
|
check_result "0 0 0 0 0 0 ${NEWBAR}"
|
|
|
|
run_test -c -p FOO=${BAR} -g FOO -c -p FOO=${NEWBAR} -g FOO
|
|
check_result "0 0 ${BAR} 0 0 ${NEWBAR}"
|
|
|
|
|
|
# environ replacements.
|
|
run_test -r -g FOO -s FOO ${BAR} 1 -g FOO -u FOO -g FOO
|
|
check_result "${BAR} 0 0 ${BAR} 0 0"
|
|
|
|
run_test -r -g FOO -u FOO -g FOO -s FOO ${BAR} 1 -g FOO
|
|
check_result "${BAR} 0 0 0 0 ${BAR}"
|