Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 05:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

seems -t is what args.empty() tried to accomodate.

Browse source 
--with-time with no other arguments was showing no output.
This commit is contained in:
Aaron Gyes 2016-07-10 18:42:54 -07:00
parent b2b327fec4
commit 8cb560dc7e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/builtin.cpp
View file

@ -2825,6 +2825,7 @@ static bool format_history_record(const history_item_t &item, const bool with_ti
return false; return false;
} }
char timestamp_string[22]; char timestamp_string[22];
// TODO: this should probably be formatted appropriately per the users' locale.
if (strftime(timestamp_string, 22, "%Y-%m-%d %H:%M:%S ", &timestamp) != 21) { if (strftime(timestamp_string, 22, "%Y-%m-%d %H:%M:%S ", &timestamp) != 21) {
return false; return false;
} }
@ -2864,7 +2865,7 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
// from webconfig.py. // from webconfig.py.
if (!history) history = &history_t::history_with_name(L"fish"); if (!history) history = &history_t::history_with_name(L"fish");
while ((opt = w.wgetopt_long_only(argc, argv, L"pdscvlmht", long_options, &opt_index)) != EOF) { while ((opt = w.wgetopt_long(argc, argv, L"pdscvlmht", long_options, &opt_index)) != EOF) {
switch (opt) { switch (opt) {
case 'p': { case 'p': {
search_prefix = true; search_prefix = true;
@ -2917,7 +2918,7 @@ static int builtin_history(parser_t &parser, io_streams_t &streams, wchar_t **ar
// Everything after is an argument. // Everything after is an argument.
const wcstring_list_t args(argv + w.woptind, argv + argc); const wcstring_list_t args(argv + w.woptind, argv + argc);
if (argc == 1) { if (argc == 1 || with_time) {
for (int i = 1; // 0 is the current input for (int i = 1; // 0 is the current input
!history->item_at_index(i).empty(); ++i) { !history->item_at_index(i).empty(); ++i) {
if (!format_history_record(history->item_at_index(i), with_time, &streams.out)) { if (!format_history_record(history->item_at_index(i), with_time, &streams.out)) {