Skip to content

Make php -a history conform to XDG Base Directory Specification #12587

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

Open
paulfedorow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make php -a history conform to XDG Base Directory Specification #12587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 55 additions & 10 deletions ext/readline/readline_cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,13 +599,67 @@ static char **cli_code_completion(const char *text, int start, int end) /* {{{ *
}
/* }}} */

/* {{{ */
static char *cli_history_file()
{
#ifdef PHP_WIN32
char *history_file;
spprintf(&history_file, MAX_PATH, "%s/.php_history", getenv("USERPROFILE"));
return history_file;
#else
struct stat buffer;
char *history_file, *expanded, *xdg_data_home, *xdg_php_home;
bool use_xdg = false;

expanded = tilde_expand("~/.php_history");
spprintf(&history_file, 0, "%s", expanded);
free(expanded);

if (stat(history_file, &buffer) == 0) {
return history_file;
}

for (int i = 0; environ[i] != NULL; i++) {
if (strncmp(environ[i], "XDG_", strlen("XDG_")) == 0) {
use_xdg = true;
break;
}
}

if (!use_xdg) {
return history_file;
}

xdg_data_home = getenv("XDG_DATA_HOME");
if (!xdg_data_home) {
xdg_data_home = "~/.local/share";
}

expanded = tilde_expand(xdg_data_home);
spprintf(&xdg_php_home, 0, "%s/php", expanded);
free(expanded);

if (stat(xdg_php_home, &buffer) != 0 && mkdir(xdg_php_home, S_IRWXU) != 0) {
efree(xdg_php_home);
return history_file;
}

efree(history_file);
spprintf(&history_file, 0, "%s/history", xdg_php_home);
efree(xdg_php_home);

return history_file;
#endif
}
/* }}} */

static int readline_shell_run(void) /* {{{ */
{
char *line;
size_t size = 4096, pos = 0, len;
char *code = emalloc(size);
zend_string *prompt = cli_get_prompt("php", '>');
char *history_file;
char *history_file = cli_history_file();
int history_lines_to_write = 0;

if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
Expand All @@ -616,11 +670,6 @@ static int readline_shell_run(void) /* {{{ */
zend_destroy_file_handle(&prepend_file);
}

#ifndef PHP_WIN32
history_file = tilde_expand("~/.php_history");
#else
spprintf(&history_file, MAX_PATH, "%s/.php_history", getenv("USERPROFILE"));
#endif
/* Install the default completion function for 'php -a'.
*
* But if readline_completion_function() was called by PHP code prior to the shell starting
Expand Down Expand Up @@ -717,11 +766,7 @@ static int readline_shell_run(void) /* {{{ */

php_last_char = '\0';
}
#ifdef PHP_WIN32
efree(history_file);
#else
free(history_file);
#endif
efree(code);
zend_string_release_ex(prompt, 0);
return EG(exit_status);
Expand Down