Skip to content

calling getenv() without arguments should return the environment variables as an array #1567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2015
Merged

calling getenv() without arguments should return the environment variables as an array #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d221821
calling getenv() without arguments should return the environment vari…
Tyrael Oct 12, 2015
54670c8
initialize *str
Tyrael Oct 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "php_streams.h"
#include "php_main.h"
#include "php_globals.h"
#include "php_variables.h"
#include "php_ini.h"
#include "php_standard.h"
#include "php_math.h"
Expand Down Expand Up @@ -631,7 +632,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0)
ZEND_ARG_INFO(0, proper_address)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_getenv, 0)
ZEND_BEGIN_ARG_INFO_EX(arginfo_getenv, 0, 0, 0)
ZEND_ARG_INFO(0, varname)
ZEND_END_ARG_INFO()

Expand Down Expand Up @@ -4008,17 +4009,24 @@ PHP_FUNCTION(long2ip)
* System Functions *
********************/

/* {{{ proto string getenv(string varname)
Get the value of an environment variable */
/* {{{ proto string getenv([string varname])
Get the value of an environment variable or every available environment variable
if no varname is present */
PHP_FUNCTION(getenv)
{
char *ptr, *str;
char *ptr, *str = NULL;
size_t str_len;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &str, &str_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &str, &str_len) == FAILURE) {
RETURN_FALSE;
}

if (!str) {
array_init(return_value);
php_import_environment_variables(return_value);
return;
}

/* SAPI method returns an emalloc()'d string */
ptr = sapi_getenv(str, str_len);
if (ptr) {
Expand Down
16 changes: 16 additions & 0 deletions ext/standard/tests/general_functions/getenv.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--TEST--
getenv() basic tests
--ENV--
FOO=bar
--FILE--
<?php

var_dump(getenv("FOO"));
var_dump(getenv()["FOO"]);

echo "Done\n";
?>
--EXPECTF--
string(3) "bar"
string(3) "bar"
Done