diff options
author | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:00:46 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:00:46 +0100 |
commit | 04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7 (patch) | |
tree | 676a2c175d7b2e6fe993344409db35137d8186e5 /lib/kernel | |
parent | 22b3a285aadffdb02f04230b78c167f52f7d7bc1 (diff) | |
parent | b2e4599affa6718bba60ef3846d130513e9a740d (diff) | |
download | otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.tar.gz otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.tar.bz2 otp-04f5e4e820f792b3f07dd232f582e6a7e0a3d3f7.zip |
Merge branch 'maint'
Conflicts:
bootstrap/lib/kernel/ebin/os.beam
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/doc/src/os.xml | 11 | ||||
-rw-r--r-- | lib/kernel/src/os.erl | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml index 1e66f124ee..2b57e75023 100644 --- a/lib/kernel/doc/src/os.xml +++ b/lib/kernel/doc/src/os.xml @@ -177,6 +177,17 @@ format_utc_timestamp() -> </desc> </func> <func> + <name name="unsetenv" arity="1"/> + <fsummary>Delete an environment variable</fsummary> + <desc> + <p>Deletes the environment variable <c><anno>VarName</anno></c>.</p> + <p>If Unicode filename encoding is in effect (see the <seealso + marker="erts:erl#file_name_encoding">erl manual + page</seealso>), the string (<c><anno>VarName</anno></c>) may + contain characters with codepoints > 255.</p> + </desc> + </func> + <func> <name name="version" arity="0"/> <fsummary>Return the Operating System version</fsummary> <desc> diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl index c92bb463c1..9ffa9adeab 100644 --- a/lib/kernel/src/os.erl +++ b/lib/kernel/src/os.erl @@ -26,7 +26,7 @@ %%% BIFs --export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0]). +-export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0, unsetenv/1]). -spec getenv() -> [string()]. @@ -58,6 +58,12 @@ putenv(_, _) -> timestamp() -> erlang:nif_error(undef). +-spec unsetenv(VarName) -> true when + VarName :: string(). + +unsetenv(_) -> + erlang:nif_error(undef). + %%% End of BIFs -spec type() -> {Osfamily, Osname} when |