2016-04-18 05:47:37 +00:00
|
|
|
// History functions, part of the user interface.
|
|
|
|
#include <assert.h>
|
|
|
|
#include <ctype.h>
|
2005-09-20 13:26:39 +00:00
|
|
|
#include <errno.h>
|
2006-10-20 22:36:49 +00:00
|
|
|
#include <fcntl.h>
|
2016-05-03 23:23:30 +00:00
|
|
|
#include <pthread.h>
|
2016-04-18 05:47:37 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2006-10-20 22:36:49 +00:00
|
|
|
#include <string.h>
|
2016-04-18 05:47:37 +00:00
|
|
|
#include <sys/mman.h>
|
|
|
|
#include <sys/stat.h>
|
2006-10-20 22:36:49 +00:00
|
|
|
#include <time.h>
|
2016-04-18 05:47:37 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <wchar.h>
|
2015-07-25 15:14:25 +00:00
|
|
|
#include <wctype.h>
|
2016-04-18 05:47:37 +00:00
|
|
|
#include <algorithm>
|
2015-07-25 15:14:25 +00:00
|
|
|
#include <iterator>
|
2016-04-18 05:47:37 +00:00
|
|
|
#include <map>
|
2016-04-21 06:00:54 +00:00
|
|
|
|
2005-09-20 13:26:39 +00:00
|
|
|
#include "common.h"
|
2015-07-25 15:14:25 +00:00
|
|
|
#include "env.h"
|
2016-04-18 05:47:37 +00:00
|
|
|
#include "fallback.h" // IWYU pragma: keep
|
2016-04-21 06:00:54 +00:00
|
|
|
#include "history.h"
|
2016-04-18 05:47:37 +00:00
|
|
|
#include "iothread.h"
|
2015-07-25 15:14:25 +00:00
|
|
|
#include "lru.h"
|
|
|
|
#include "parse_constants.h"
|
2016-04-18 05:47:37 +00:00
|
|
|
#include "parse_tree.h"
|
|
|
|
#include "path.h"
|
|
|
|
#include "reader.h"
|
|
|
|
#include "sanity.h"
|
|
|
|
#include "signal.h"
|
2016-04-21 06:00:54 +00:00
|
|
|
#include "wutil.h" // IWYU pragma: keep
|
2012-02-16 08:24:27 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Our history format is intended to be valid YAML. Here it is:
|
|
|
|
//
|
|
|
|
// - cmd: ssh blah blah blah
|
|
|
|
// when: 2348237
|
|
|
|
// paths:
|
|
|
|
// - /path/to/something
|
|
|
|
// - /path/to/something_else
|
|
|
|
//
|
|
|
|
// Newlines are replaced by \n. Backslashes are replaced by \\.
|
|
|
|
|
|
|
|
// When we rewrite the history, the number of items we keep.
|
2012-02-06 04:54:41 +00:00
|
|
|
#define HISTORY_SAVE_MAX (1024 * 256)
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Whether we print timing information.
|
2012-12-03 08:14:39 +00:00
|
|
|
#define LOG_TIMES 0
|
2012-03-01 22:56:34 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Default buffer size for flushing to the history file.
|
|
|
|
#define HISTORY_OUTPUT_BUFFER_SIZE (16 * 1024)
|
2013-04-27 22:21:14 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
namespace {
|
2016-03-18 22:14:16 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Helper class for certain output. This is basically a string that allows us to ensure we only
|
|
|
|
/// flush at record boundaries, and avoids the copying of ostringstream. Have you ever tried to
|
|
|
|
/// implement your own streambuf? Total insanity.
|
2016-04-18 05:47:37 +00:00
|
|
|
class history_output_buffer_t {
|
|
|
|
// A null-terminated C string.
|
2013-04-27 22:21:14 +00:00
|
|
|
std::vector<char> buffer;
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Offset is the offset of the null terminator.
|
2013-04-27 22:21:14 +00:00
|
|
|
size_t offset;
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t safe_strlen(const char *s) { return s ? strlen(s) : 0; }
|
2013-04-27 22:21:14 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
public:
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Add a bit more to HISTORY_OUTPUT_BUFFER_SIZE because we flush once we've exceeded that size.
|
2016-04-18 05:47:37 +00:00
|
|
|
history_output_buffer_t() : buffer(HISTORY_OUTPUT_BUFFER_SIZE + 128, '\0'), offset(0) {}
|
2013-04-27 22:21:14 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Append one or more strings.
|
2016-04-18 05:47:37 +00:00
|
|
|
void append(const char *s1, const char *s2 = NULL, const char *s3 = NULL) {
|
2013-04-27 22:21:14 +00:00
|
|
|
const char *ptrs[4] = {s1, s2, s3, NULL};
|
|
|
|
const size_t lengths[4] = {safe_strlen(s1), safe_strlen(s2), safe_strlen(s3), 0};
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Determine the additional size we'll need.
|
2013-04-27 22:21:14 +00:00
|
|
|
size_t additional_length = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (size_t i = 0; i < sizeof lengths / sizeof *lengths; i++) {
|
2013-04-27 22:21:14 +00:00
|
|
|
additional_length += lengths[i];
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Allocate that much, plus a null terminator.
|
2013-04-27 22:21:14 +00:00
|
|
|
size_t required_size = offset + additional_length + 1;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (required_size > buffer.size()) {
|
2013-04-27 22:21:14 +00:00
|
|
|
buffer.resize(required_size, '\0');
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Copy.
|
|
|
|
for (size_t i = 0; ptrs[i] != NULL; i++) {
|
2013-04-27 22:21:14 +00:00
|
|
|
memmove(&buffer.at(offset), ptrs[i], lengths[i]);
|
|
|
|
offset += lengths[i];
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Null terminator was appended by virtue of the resize() above (or in a previous
|
|
|
|
// invocation).
|
2013-04-27 22:21:14 +00:00
|
|
|
assert(buffer.at(buffer.size() - 1) == '\0');
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Output to a given fd, resetting our buffer. Returns true on success, false on error.
|
2016-04-18 05:47:37 +00:00
|
|
|
bool flush_to_fd(int fd) {
|
2013-04-27 22:21:14 +00:00
|
|
|
bool result = write_loop(fd, &buffer.at(0), offset) >= 0;
|
|
|
|
offset = 0;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Return how much data we've accumulated.
|
2016-04-18 05:47:37 +00:00
|
|
|
size_t output_size() const { return offset; }
|
2013-04-27 22:21:14 +00:00
|
|
|
};
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
class time_profiler_t {
|
2012-03-01 22:56:34 +00:00
|
|
|
const char *what;
|
|
|
|
double start;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
public:
|
|
|
|
explicit time_profiler_t(const char *w) {
|
|
|
|
if (LOG_TIMES) {
|
2012-03-01 22:56:34 +00:00
|
|
|
what = w;
|
|
|
|
start = timef();
|
|
|
|
}
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
~time_profiler_t() {
|
|
|
|
if (LOG_TIMES) {
|
2012-03-01 22:56:34 +00:00
|
|
|
double end = timef();
|
2012-12-03 08:14:09 +00:00
|
|
|
fprintf(stderr, "(LOG_TIMES %s: %02f msec)\n", what, (end - start) * 1000);
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Lock a file via fcntl; returns true on success, false on failure.
|
2016-04-18 05:47:37 +00:00
|
|
|
static bool history_file_lock(int fd, short type) {
|
2012-12-03 00:39:35 +00:00
|
|
|
assert(type == F_RDLCK || type == F_WRLCK);
|
|
|
|
struct flock flk = {};
|
|
|
|
flk.l_type = type;
|
|
|
|
flk.l_whence = SEEK_SET;
|
|
|
|
int ret = fcntl(fd, F_SETLKW, (void *)&flk);
|
|
|
|
return ret != -1;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Our LRU cache is used for restricting the amount of history we have, and limiting how long we
|
|
|
|
/// order it.
|
2016-04-18 05:47:37 +00:00
|
|
|
class history_lru_node_t : public lru_node_t {
|
|
|
|
public:
|
2012-02-06 04:54:41 +00:00
|
|
|
time_t timestamp;
|
2012-02-16 08:24:27 +00:00
|
|
|
path_list_t required_paths;
|
2016-04-18 05:47:37 +00:00
|
|
|
explicit history_lru_node_t(const history_item_t &item)
|
|
|
|
: lru_node_t(item.str()),
|
|
|
|
timestamp(item.timestamp()),
|
|
|
|
required_paths(item.get_required_paths()) {}
|
2012-02-06 04:54:41 +00:00
|
|
|
};
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
class history_lru_cache_t : public lru_cache_t<history_lru_node_t> {
|
|
|
|
protected:
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Override to delete evicted nodes.
|
2016-04-18 05:47:37 +00:00
|
|
|
virtual void node_was_evicted(history_lru_node_t *node) { delete node; }
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
public:
|
|
|
|
explicit history_lru_cache_t(size_t max) : lru_cache_t<history_lru_node_t>(max) {}
|
2012-02-06 04:54:41 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Function to add a history item.
|
2016-04-18 05:47:37 +00:00
|
|
|
void add_item(const history_item_t &item) {
|
|
|
|
// Skip empty items.
|
|
|
|
if (item.empty()) return;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// See if it's in the cache. If it is, update the timestamp. If not, we create a new node
|
|
|
|
// and add it. Note that calling get_node promotes the node to the front.
|
2012-02-06 04:54:41 +00:00
|
|
|
history_lru_node_t *node = this->get_node(item.str());
|
2016-04-18 05:47:37 +00:00
|
|
|
if (node != NULL) {
|
2012-02-06 04:54:41 +00:00
|
|
|
node->timestamp = std::max(node->timestamp, item.timestamp());
|
2016-04-18 05:47:37 +00:00
|
|
|
// What to do about paths here? Let's just ignore them.
|
|
|
|
} else {
|
2012-02-06 04:54:41 +00:00
|
|
|
node = new history_lru_node_t(item);
|
|
|
|
this->add_node(node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
2005-09-20 13:26:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
class history_collection_t {
|
2016-03-18 22:14:16 +00:00
|
|
|
pthread_mutex_t m_lock;
|
|
|
|
std::map<wcstring, history_t *> m_histories;
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
public:
|
|
|
|
history_collection_t() { VOMIT_ON_FAILURE_NO_ERRNO(pthread_mutex_init(&m_lock, NULL)); }
|
|
|
|
~history_collection_t() {
|
|
|
|
for (std::map<wcstring, history_t *>::const_iterator i = m_histories.begin();
|
|
|
|
i != m_histories.end(); ++i) {
|
2016-03-18 22:14:16 +00:00
|
|
|
delete i->second;
|
|
|
|
}
|
|
|
|
pthread_mutex_destroy(&m_lock);
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
history_t &alloc(const wcstring &name);
|
2016-03-18 22:14:16 +00:00
|
|
|
void save();
|
|
|
|
};
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
} // anonymous namespace
|
2016-03-18 22:14:16 +00:00
|
|
|
|
|
|
|
static history_collection_t histories;
|
2012-02-06 00:42:24 +00:00
|
|
|
|
|
|
|
static wcstring history_filename(const wcstring &name, const wcstring &suffix);
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Replaces newlines with a literal backslash followed by an n, and replaces backslashes with two
|
|
|
|
/// backslashes.
|
2014-07-29 21:41:21 +00:00
|
|
|
static void escape_yaml(std::string *str);
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Inverse of escape_yaml.
|
2014-07-29 21:41:21 +00:00
|
|
|
static void unescape_yaml(std::string *str);
|
2012-02-06 04:54:41 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// We can merge two items if they are the same command. We use the more recent timestamp, more
|
|
|
|
/// recent identifier, and the longer list of required paths.
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_item_t::merge(const history_item_t &item) {
|
2012-03-01 22:56:34 +00:00
|
|
|
bool result = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (this->contents == item.contents) {
|
2012-03-01 22:56:34 +00:00
|
|
|
this->creation_timestamp = std::max(this->creation_timestamp, item.creation_timestamp);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (this->required_paths.size() < item.required_paths.size()) {
|
2012-03-01 22:56:34 +00:00
|
|
|
this->required_paths = item.required_paths;
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
if (this->identifier < item.identifier) {
|
2014-03-29 06:22:03 +00:00
|
|
|
this->identifier = item.identifier;
|
|
|
|
}
|
2012-03-01 22:56:34 +00:00
|
|
|
result = true;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t::history_item_t(const wcstring &str)
|
|
|
|
: contents(str), creation_timestamp(time(NULL)), identifier(0) {}
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t::history_item_t(const wcstring &str, time_t when, history_identifier_t ident)
|
|
|
|
: contents(str), creation_timestamp(when), identifier(ident) {}
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_item_t::matches_search(const wcstring &term, enum history_search_type_t type) const {
|
|
|
|
switch (type) {
|
|
|
|
case HISTORY_SEARCH_TYPE_CONTAINS: {
|
|
|
|
// We consider equal strings to NOT match a contains search (so that you don't have to
|
|
|
|
// see history equal to what you typed). The length check ensures that.
|
2012-11-19 08:31:03 +00:00
|
|
|
return contents.size() > term.size() && contents.find(term) != wcstring::npos;
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
|
|
|
case HISTORY_SEARCH_TYPE_PREFIX: {
|
|
|
|
// We consider equal strings to match a prefix search, so that autosuggest will allow
|
|
|
|
// suggesting what you've typed.
|
2012-11-19 08:31:03 +00:00
|
|
|
return string_prefixes_string(term, contents);
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
|
|
|
default: {
|
2012-11-19 08:31:03 +00:00
|
|
|
sanity_lose();
|
|
|
|
return false;
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
2012-02-06 18:52:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Append our YAML history format to the provided vector at the given offset, updating the offset.
|
2016-04-18 05:47:37 +00:00
|
|
|
static void append_yaml_to_buffer(const wcstring &wcmd, time_t timestamp,
|
|
|
|
const path_list_t &required_paths,
|
|
|
|
history_output_buffer_t *buffer) {
|
2012-12-03 00:39:35 +00:00
|
|
|
std::string cmd = wcs2string(wcmd);
|
2014-07-29 21:41:21 +00:00
|
|
|
escape_yaml(&cmd);
|
2013-04-27 22:21:14 +00:00
|
|
|
buffer->append("- cmd: ", cmd.c_str(), "\n");
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2013-04-27 22:21:14 +00:00
|
|
|
char timestamp_str[96];
|
2016-04-18 05:47:37 +00:00
|
|
|
snprintf(timestamp_str, sizeof timestamp_str, "%ld", (long)timestamp);
|
2014-09-28 13:03:55 +00:00
|
|
|
buffer->append(" when: ", timestamp_str, "\n");
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!required_paths.empty()) {
|
2014-09-28 13:03:55 +00:00
|
|
|
buffer->append(" paths:\n");
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
for (path_list_t::const_iterator iter = required_paths.begin();
|
|
|
|
iter != required_paths.end(); ++iter) {
|
2012-02-16 08:24:27 +00:00
|
|
|
std::string path = wcs2string(*iter);
|
2014-07-29 21:41:21 +00:00
|
|
|
escape_yaml(&path);
|
2013-04-27 22:21:14 +00:00
|
|
|
buffer->append(" - ", path.c_str(), "\n");
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
|
|
|
}
|
2012-02-06 04:54:41 +00:00
|
|
|
}
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Parse a timestamp line that looks like this: spaces, "when:", spaces, timestamp, newline
|
|
|
|
/// The string is NOT null terminated; however we do know it contains a newline, so stop when we
|
|
|
|
/// reach it.
|
2016-04-18 05:47:37 +00:00
|
|
|
static bool parse_timestamp(const char *str, time_t *out_when) {
|
2012-04-16 05:49:27 +00:00
|
|
|
const char *cursor = str;
|
2016-04-18 05:47:37 +00:00
|
|
|
// Advance past spaces.
|
|
|
|
while (*cursor == ' ') cursor++;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Look for "when:".
|
2012-04-16 05:49:27 +00:00
|
|
|
size_t when_len = 5;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (strncmp(cursor, "when:", when_len) != 0) return false;
|
2012-04-16 05:49:27 +00:00
|
|
|
cursor += when_len;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Advance past spaces.
|
|
|
|
while (*cursor == ' ') cursor++;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try to parse a timestamp.
|
2012-04-16 05:49:27 +00:00
|
|
|
long timestamp = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (isdigit(*cursor) && (timestamp = strtol(cursor, NULL, 0)) > 0) {
|
2012-04-16 05:49:27 +00:00
|
|
|
*out_when = (time_t)timestamp;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Returns a pointer to the start of the next line, or NULL. The next line must itself end with a
|
|
|
|
/// newline. Note that the string is not null terminated.
|
2016-04-18 05:47:37 +00:00
|
|
|
static const char *next_line(const char *start, size_t length) {
|
|
|
|
// Handle the hopeless case.
|
|
|
|
if (length < 1) return NULL;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Get a pointer to the end, that we must not pass.
|
|
|
|
const char *const end = start + length;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip past the next newline.
|
2012-04-17 03:26:50 +00:00
|
|
|
const char *nextline = (const char *)memchr(start, '\n', length);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!nextline || nextline >= end) {
|
2012-04-17 03:26:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip past the newline character itself.
|
|
|
|
if (++nextline >= end) {
|
2012-04-17 03:26:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Make sure this new line is itself "newline terminated". If it's not, return NULL.
|
2012-04-17 03:26:50 +00:00
|
|
|
const char *next_newline = (const char *)memchr(nextline, '\n', end - nextline);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!next_newline) {
|
2012-04-17 03:26:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-04-17 03:26:50 +00:00
|
|
|
return nextline;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Support for iteratively locating the offsets of history items.
|
|
|
|
/// Pass the address and length of a mapped region.
|
|
|
|
/// Pass a pointer to a cursor size_t, initially 0.
|
|
|
|
/// If custoff_timestamp is nonzero, skip items created at or after that timestamp.
|
|
|
|
/// Returns (size_t)(-1) when done.
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t offset_of_next_item_fish_2_0(const char *begin, size_t mmap_length,
|
|
|
|
size_t *inout_cursor, time_t cutoff_timestamp) {
|
2012-04-16 05:49:27 +00:00
|
|
|
size_t cursor = *inout_cursor;
|
|
|
|
size_t result = (size_t)(-1);
|
2016-04-18 05:47:37 +00:00
|
|
|
while (cursor < mmap_length) {
|
2014-07-29 21:41:21 +00:00
|
|
|
const char *line_start = begin + cursor;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Advance the cursor to the next line.
|
2012-04-16 05:49:27 +00:00
|
|
|
const char *newline = (const char *)memchr(line_start, '\n', mmap_length - cursor);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (newline == NULL) break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Advance the cursor past this line. +1 is for the newline.
|
2014-07-29 21:41:21 +00:00
|
|
|
cursor = newline - begin + 1;
|
2012-04-16 05:49:27 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip lines with a leading space, since these are in the interior of one of our items.
|
|
|
|
if (line_start[0] == ' ') continue;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip very short lines to make one of the checks below easier.
|
|
|
|
if (newline - line_start < 3) continue;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try to be a little YAML compatible. Skip lines with leading %, ---, or ...
|
|
|
|
if (!memcmp(line_start, "%", 1) || !memcmp(line_start, "---", 3) ||
|
|
|
|
!memcmp(line_start, "...", 3))
|
2012-04-16 05:49:27 +00:00
|
|
|
continue;
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Hackish: fish 1.x rewriting a fish 2.0 history file can produce lines with lots of
|
|
|
|
// leading "- cmd: - cmd: - cmd:". Trim all but one leading "- cmd:".
|
2014-07-29 21:41:21 +00:00
|
|
|
const char *double_cmd = "- cmd: - cmd: ";
|
|
|
|
const size_t double_cmd_len = strlen(double_cmd);
|
2016-04-18 05:47:37 +00:00
|
|
|
while (newline - line_start > double_cmd_len &&
|
|
|
|
!memcmp(line_start, double_cmd, double_cmd_len)) {
|
|
|
|
// Skip over just one of the - cmd. In the end there will be just one left.
|
2014-07-29 21:41:21 +00:00
|
|
|
line_start += strlen("- cmd: ");
|
|
|
|
}
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Hackish: fish 1.x rewriting a fish 2.0 history file can produce commands like "when:
|
|
|
|
// 123456". Ignore those.
|
2014-07-29 21:41:21 +00:00
|
|
|
const char *cmd_when = "- cmd: when:";
|
|
|
|
const size_t cmd_when_len = strlen(cmd_when);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (newline - line_start >= cmd_when_len && !memcmp(line_start, cmd_when, cmd_when_len))
|
2014-07-29 21:41:21 +00:00
|
|
|
continue;
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// At this point, we know line_start is at the beginning of an item. But maybe we want to
|
|
|
|
// skip this item because of timestamps. A 0 cutoff means we don't care; if we do care, then
|
|
|
|
// try parsing out a timestamp.
|
|
|
|
if (cutoff_timestamp != 0) {
|
|
|
|
// Hackish fast way to skip items created after our timestamp. This is the mechanism by
|
|
|
|
// which we avoid "seeing" commands from other sessions that started after we started.
|
|
|
|
// We try hard to ensure that our items are sorted by their timestamps, so in theory we
|
|
|
|
// could just break, but I don't think that works well if (for example) the clock
|
|
|
|
// changes. So we'll read all subsequent items.
|
|
|
|
const char *const end = begin + mmap_length;
|
|
|
|
|
|
|
|
// Walk over lines that we think are interior. These lines are not null terminated, but
|
|
|
|
// are guaranteed to contain a newline.
|
2012-04-17 03:26:50 +00:00
|
|
|
bool has_timestamp = false;
|
2014-07-29 21:41:21 +00:00
|
|
|
time_t timestamp = 0;
|
2012-04-17 03:26:50 +00:00
|
|
|
const char *interior_line;
|
2013-11-25 15:07:17 +00:00
|
|
|
|
2012-04-17 03:26:50 +00:00
|
|
|
for (interior_line = next_line(line_start, end - line_start);
|
2016-04-18 05:47:37 +00:00
|
|
|
interior_line != NULL && !has_timestamp;
|
|
|
|
interior_line = next_line(interior_line, end - interior_line)) {
|
|
|
|
// If the first character is not a space, it's not an interior line, so we're done.
|
|
|
|
if (interior_line[0] != ' ') break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Hackish optimization: since we just stepped over some interior line, update the
|
|
|
|
// cursor so we don't have to look at these lines next time.
|
2012-04-17 03:26:50 +00:00
|
|
|
cursor = interior_line - begin;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try parsing a timestamp from this line. If we succeed, the loop will break.
|
2012-04-17 03:26:50 +00:00
|
|
|
has_timestamp = parse_timestamp(interior_line, ×tamp);
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip this item if the timestamp is past our cutoff.
|
|
|
|
if (has_timestamp && timestamp > cutoff_timestamp) {
|
2012-04-16 05:49:27 +00:00
|
|
|
continue;
|
|
|
|
}
|
2012-04-17 03:26:50 +00:00
|
|
|
}
|
2012-04-16 05:49:27 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We made it through the gauntlet.
|
2012-04-16 05:49:27 +00:00
|
|
|
result = line_start - begin;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*inout_cursor = cursor;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Same as offset_of_next_item_fish_2_0, but for fish 1.x (pre fishfish).
|
|
|
|
/// Adapted from history_populate_from_mmap in history.c
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t offset_of_next_item_fish_1_x(const char *begin, size_t mmap_length,
|
|
|
|
size_t *inout_cursor, time_t cutoff_timestamp) {
|
|
|
|
if (mmap_length == 0 || *inout_cursor >= mmap_length) return (size_t)(-1);
|
2012-06-15 23:22:37 +00:00
|
|
|
|
2012-11-19 00:30:30 +00:00
|
|
|
const char *end = begin + mmap_length;
|
|
|
|
const char *pos;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-11-19 00:30:30 +00:00
|
|
|
bool ignore_newline = false;
|
|
|
|
bool do_push = true;
|
2012-06-15 23:22:37 +00:00
|
|
|
bool all_done = false;
|
|
|
|
|
|
|
|
size_t result = *inout_cursor;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (pos = begin + *inout_cursor; pos < end && !all_done; pos++) {
|
|
|
|
if (do_push) {
|
2012-11-19 00:30:30 +00:00
|
|
|
ignore_newline = (*pos == '#');
|
|
|
|
do_push = false;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
switch (*pos) {
|
|
|
|
case '\\': {
|
2012-11-19 08:31:03 +00:00
|
|
|
pos++;
|
|
|
|
break;
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
case '\n': {
|
|
|
|
if (ignore_newline) {
|
2012-11-19 08:31:03 +00:00
|
|
|
ignore_newline = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// Note: pos will be left pointing just after this newline, because of the ++ in
|
|
|
|
// the loop.
|
2012-11-19 08:31:03 +00:00
|
|
|
all_done = true;
|
|
|
|
}
|
|
|
|
break;
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
}
|
|
|
|
}
|
2012-06-15 23:22:37 +00:00
|
|
|
*inout_cursor = (pos - begin);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Returns the offset of the next item based on the given history type, or -1.
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t offset_of_next_item(const char *begin, size_t mmap_length,
|
|
|
|
history_file_type_t mmap_type, size_t *inout_cursor,
|
|
|
|
time_t cutoff_timestamp) {
|
2012-06-15 23:22:37 +00:00
|
|
|
size_t result;
|
2016-04-18 05:47:37 +00:00
|
|
|
switch (mmap_type) {
|
|
|
|
case history_type_fish_2_0: {
|
|
|
|
result =
|
|
|
|
offset_of_next_item_fish_2_0(begin, mmap_length, inout_cursor, cutoff_timestamp);
|
2012-11-19 08:31:03 +00:00
|
|
|
break;
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
|
|
|
case history_type_fish_1_x: {
|
|
|
|
result =
|
|
|
|
offset_of_next_item_fish_1_x(begin, mmap_length, inout_cursor, cutoff_timestamp);
|
2012-11-19 08:31:03 +00:00
|
|
|
break;
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
2016-05-03 23:23:30 +00:00
|
|
|
case history_type_unknown:
|
|
|
|
default: {
|
|
|
|
// Oh well.
|
2012-11-19 08:31:03 +00:00
|
|
|
result = (size_t)(-1);
|
|
|
|
break;
|
2016-04-18 05:47:37 +00:00
|
|
|
}
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_t &history_collection_t::alloc(const wcstring &name) {
|
|
|
|
// Note that histories are currently never deleted, so we can return a reference to them without
|
|
|
|
// using something like shared_ptr.
|
2016-03-18 22:14:16 +00:00
|
|
|
scoped_lock locker(m_lock);
|
2016-04-18 05:47:37 +00:00
|
|
|
history_t *¤t = m_histories[name];
|
|
|
|
if (current == NULL) current = new history_t(name);
|
2012-02-06 00:42:24 +00:00
|
|
|
return *current;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_t &history_t::history_with_name(const wcstring &name) { return histories.alloc(name); }
|
|
|
|
|
|
|
|
history_t::history_t(const wcstring &pname)
|
|
|
|
: name(pname),
|
|
|
|
first_unwritten_new_item_index(0),
|
|
|
|
has_pending_item(false),
|
|
|
|
disable_automatic_save_counter(0),
|
|
|
|
mmap_start(NULL),
|
|
|
|
mmap_length(0),
|
|
|
|
mmap_type(history_file_type_t(-1)),
|
|
|
|
mmap_file_id(kInvalidFileID),
|
|
|
|
boundary_timestamp(time(NULL)),
|
|
|
|
countdown_to_vacuum(-1),
|
|
|
|
loaded_old(false),
|
|
|
|
chaos_mode(false) {
|
2012-02-06 00:42:24 +00:00
|
|
|
pthread_mutex_init(&lock, NULL);
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_t::~history_t() { pthread_mutex_destroy(&lock); }
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::add(const history_item_t &item, bool pending) {
|
2012-02-06 00:42:24 +00:00
|
|
|
scoped_lock locker(lock);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try merging with the last item.
|
|
|
|
if (!new_items.empty() && new_items.back().merge(item)) {
|
|
|
|
// We merged, so we don't have to add anything. Maybe this item was pending, but it just got
|
|
|
|
// merged with an item that is not pending, so pending just becomes false.
|
2015-04-20 09:04:17 +00:00
|
|
|
this->has_pending_item = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// We have to add a new item.
|
2012-03-01 22:56:34 +00:00
|
|
|
new_items.push_back(item);
|
2015-04-20 09:04:17 +00:00
|
|
|
this->has_pending_item = pending;
|
2014-03-29 06:22:03 +00:00
|
|
|
save_internal_unless_disabled();
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
2014-03-29 06:22:03 +00:00
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::save_internal_unless_disabled() {
|
|
|
|
// This must be called while locked.
|
2014-03-29 06:22:03 +00:00
|
|
|
ASSERT_IS_LOCKED(lock);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Respect disable_automatic_save_counter.
|
|
|
|
if (disable_automatic_save_counter > 0) {
|
2014-03-29 06:22:03 +00:00
|
|
|
return;
|
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We may or may not vacuum. We try to vacuum every kVacuumFrequency items, but start the
|
|
|
|
// countdown at a random number so that even if the user never runs more than 25 commands, we'll
|
|
|
|
// eventually vacuum. If countdown_to_vacuum is -1, it means we haven't yet picked a value for
|
|
|
|
// the counter.
|
2012-12-03 08:14:09 +00:00
|
|
|
const int kVacuumFrequency = 25;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (countdown_to_vacuum < 0) {
|
2012-12-03 08:14:09 +00:00
|
|
|
static unsigned int seed = (unsigned int)time(NULL);
|
2016-04-18 05:47:37 +00:00
|
|
|
// Generate a number in the range [0, kVacuumFrequency).
|
2012-12-03 08:14:09 +00:00
|
|
|
countdown_to_vacuum = rand_r(&seed) / (RAND_MAX / kVacuumFrequency + 1);
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Determine if we're going to vacuum.
|
2012-12-03 08:14:09 +00:00
|
|
|
bool vacuum = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (countdown_to_vacuum == 0) {
|
2012-12-03 08:14:09 +00:00
|
|
|
countdown_to_vacuum = kVacuumFrequency;
|
|
|
|
vacuum = true;
|
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// This might be a good candidate for moving to a background thread.
|
2012-12-03 08:14:09 +00:00
|
|
|
time_profiler_t profiler(vacuum ? "save_internal vacuum" : "save_internal no vacuum");
|
|
|
|
this->save_internal(vacuum);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Update our countdown.
|
2012-12-03 08:14:09 +00:00
|
|
|
assert(countdown_to_vacuum > 0);
|
|
|
|
countdown_to_vacuum--;
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::add(const wcstring &str, history_identifier_t ident, bool pending) {
|
2012-12-03 09:53:52 +00:00
|
|
|
time_t when = time(NULL);
|
2016-04-18 05:47:37 +00:00
|
|
|
// Big hack: do not allow timestamps equal to our boundary date. This is because we include
|
|
|
|
// items whose timestamps are equal to our boundary when reading old history, so we can catch
|
|
|
|
// "just closed" items. But this means that we may interpret our own items, that we just wrote,
|
|
|
|
// as old items, if we wrote them in the same second as our birthdate.
|
|
|
|
if (when == this->boundary_timestamp) {
|
2012-12-03 09:53:52 +00:00
|
|
|
when++;
|
2014-07-25 17:08:21 +00:00
|
|
|
}
|
2012-12-03 09:53:52 +00:00
|
|
|
|
2015-04-20 09:04:17 +00:00
|
|
|
this->add(history_item_t(str, when, ident), pending);
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::remove(const wcstring &str) {
|
|
|
|
// Add to our list of deleted items.
|
2012-06-15 23:22:37 +00:00
|
|
|
deleted_items.insert(str);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Remove from our list of new items.
|
2012-12-03 00:39:35 +00:00
|
|
|
size_t idx = new_items.size();
|
2016-04-18 05:47:37 +00:00
|
|
|
while (idx--) {
|
|
|
|
if (new_items.at(idx).str() == str) {
|
2012-12-03 00:39:35 +00:00
|
|
|
new_items.erase(new_items.begin() + idx);
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If this index is before our first_unwritten_new_item_index, then subtract one from
|
|
|
|
// that index so it stays pointing at the same item. If it is equal to or larger, then
|
|
|
|
// we have not yet writen this item, so we don't have to adjust the index.
|
|
|
|
if (idx < first_unwritten_new_item_index) {
|
2012-12-03 00:39:35 +00:00
|
|
|
first_unwritten_new_item_index--;
|
|
|
|
}
|
2012-06-05 04:24:42 +00:00
|
|
|
}
|
|
|
|
}
|
2012-12-03 00:39:35 +00:00
|
|
|
assert(first_unwritten_new_item_index <= new_items.size());
|
2012-06-05 04:24:42 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::set_valid_file_paths(const wcstring_list_t &valid_file_paths,
|
|
|
|
history_identifier_t ident) {
|
|
|
|
// 0 identifier is used to mean "not necessary".
|
|
|
|
if (ident == 0) {
|
2014-03-29 06:22:03 +00:00
|
|
|
return;
|
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2014-03-29 06:22:03 +00:00
|
|
|
scoped_lock locker(lock);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Look for an item with the given identifier. It is likely to be at the end of new_items.
|
|
|
|
for (history_item_list_t::reverse_iterator iter = new_items.rbegin(); iter != new_items.rend();
|
|
|
|
++iter) {
|
|
|
|
if (iter->identifier == ident) { // found it
|
2014-03-29 06:22:03 +00:00
|
|
|
iter->required_paths = valid_file_paths;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::get_string_representation(wcstring *result, const wcstring &separator) {
|
2012-03-19 18:52:18 +00:00
|
|
|
scoped_lock locker(lock);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-03-19 18:52:18 +00:00
|
|
|
bool first = true;
|
2013-10-26 22:27:39 +00:00
|
|
|
|
2013-09-05 20:49:18 +00:00
|
|
|
std::set<wcstring> seen;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If we have a pending item, we skip the first encountered (i.e. last) new item.
|
2015-04-20 09:04:17 +00:00
|
|
|
bool next_is_pending = this->has_pending_item;
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Append new items. Note that in principle we could use const_reverse_iterator, but we do not
|
|
|
|
// because reverse_iterator is not convertible to const_reverse_iterator. See
|
|
|
|
// http://github.com/fish-shell/fish-shell/issues/431.
|
|
|
|
for (history_item_list_t::reverse_iterator iter = new_items.rbegin(); iter < new_items.rend();
|
|
|
|
++iter) {
|
|
|
|
// Skip a pending item if we have one.
|
|
|
|
if (next_is_pending) {
|
2015-04-20 09:04:17 +00:00
|
|
|
next_is_pending = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip duplicates.
|
|
|
|
if (!seen.insert(iter->str()).second) continue;
|
2013-10-26 22:27:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!first) result->append(separator);
|
2014-07-29 21:41:21 +00:00
|
|
|
result->append(iter->str());
|
2012-03-19 18:52:18 +00:00
|
|
|
first = false;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Append old items.
|
2012-03-19 18:52:18 +00:00
|
|
|
load_old_if_needed();
|
2016-04-18 05:47:37 +00:00
|
|
|
for (std::deque<size_t>::reverse_iterator iter = old_item_offsets.rbegin();
|
|
|
|
iter != old_item_offsets.rend(); ++iter) {
|
2012-03-19 18:52:18 +00:00
|
|
|
size_t offset = *iter;
|
2016-04-18 05:47:37 +00:00
|
|
|
const history_item_t item =
|
|
|
|
history_t::decode_item(mmap_start + offset, mmap_length - offset, mmap_type);
|
2013-10-26 22:27:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip duplicates.
|
|
|
|
if (!seen.insert(item.str()).second) continue;
|
2013-10-26 22:27:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!first) result->append(separator);
|
2014-07-29 21:41:21 +00:00
|
|
|
result->append(item.str());
|
2012-03-19 18:52:18 +00:00
|
|
|
first = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t history_t::item_at_index(size_t idx) {
|
2012-02-06 00:42:24 +00:00
|
|
|
scoped_lock locker(lock);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// 0 is considered an invalid index.
|
2012-02-06 00:42:24 +00:00
|
|
|
assert(idx > 0);
|
|
|
|
idx--;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Determine how many "resolved" (non-pending) items we have. We can have at most one pending
|
|
|
|
// item, and it's always the last one.
|
2015-04-20 09:04:17 +00:00
|
|
|
size_t resolved_new_item_count = new_items.size();
|
2016-04-18 05:47:37 +00:00
|
|
|
if (this->has_pending_item && resolved_new_item_count > 0) {
|
2015-04-20 09:04:17 +00:00
|
|
|
resolved_new_item_count -= 1;
|
|
|
|
}
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// idx == 0 corresponds to the last resolved item.
|
|
|
|
if (idx < resolved_new_item_count) {
|
2015-04-20 09:04:17 +00:00
|
|
|
return new_items.at(resolved_new_item_count - idx - 1);
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Now look in our old items.
|
2015-04-20 09:04:17 +00:00
|
|
|
idx -= resolved_new_item_count;
|
2012-02-06 00:42:24 +00:00
|
|
|
load_old_if_needed();
|
|
|
|
size_t old_item_count = old_item_offsets.size();
|
2016-04-18 05:47:37 +00:00
|
|
|
if (idx < old_item_count) {
|
|
|
|
// idx == 0 corresponds to last item in old_item_offsets.
|
2012-02-06 00:42:24 +00:00
|
|
|
size_t offset = old_item_offsets.at(old_item_count - idx - 1);
|
2012-06-15 23:22:37 +00:00
|
|
|
return history_t::decode_item(mmap_start + offset, mmap_length - offset, mmap_type);
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Index past the valid range, so return an empty history item.
|
2012-02-06 00:42:24 +00:00
|
|
|
return history_item_t(wcstring(), 0);
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Read one line, stripping off any newline, and updating cursor. Note that our input string is NOT
|
|
|
|
/// null terminated; it's just a memory mapped file.
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t read_line(const char *base, size_t cursor, size_t len, std::string &result) {
|
|
|
|
// Locate the newline.
|
2012-02-16 08:24:27 +00:00
|
|
|
assert(cursor <= len);
|
|
|
|
const char *start = base + cursor;
|
|
|
|
const char *newline = (char *)memchr(start, '\n', len - cursor);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (newline != NULL) { // we found a newline
|
2012-02-16 08:24:27 +00:00
|
|
|
result.assign(start, newline - start);
|
2016-04-18 05:47:37 +00:00
|
|
|
// Return the amount to advance the cursor; skip over the newline.
|
2012-02-16 08:24:27 +00:00
|
|
|
return newline - start + 1;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// We ran off the end.
|
2012-02-16 08:24:27 +00:00
|
|
|
result.clear();
|
|
|
|
return len - cursor;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Trims leading spaces in the given string, returning how many there were.
|
2016-04-18 05:47:37 +00:00
|
|
|
static size_t trim_leading_spaces(std::string &str) {
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t i = 0, max = str.size();
|
2016-04-18 05:47:37 +00:00
|
|
|
while (i < max && str[i] == ' ') i++;
|
2012-02-16 08:24:27 +00:00
|
|
|
str.erase(0, i);
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static bool extract_prefix_and_unescape_yaml(std::string *key, std::string *value,
|
|
|
|
const std::string &line) {
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t where = line.find(":");
|
2016-04-18 05:47:37 +00:00
|
|
|
if (where != std::string::npos) {
|
2014-07-29 21:41:21 +00:00
|
|
|
key->assign(line, 0, where);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip a space after the : if necessary.
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t val_start = where + 1;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (val_start < line.size() && line.at(val_start) == ' ') val_start++;
|
2014-07-29 21:41:21 +00:00
|
|
|
value->assign(line, val_start, line.size() - val_start);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-23 18:29:00 +00:00
|
|
|
unescape_yaml(key);
|
|
|
|
unescape_yaml(value);
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
|
|
|
return where != std::string::npos;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Decode an item via the fish 2.0 format.
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t history_t::decode_item_fish_2_0(const char *base, size_t len) {
|
2012-02-16 08:24:27 +00:00
|
|
|
wcstring cmd;
|
|
|
|
time_t when = 0;
|
|
|
|
path_list_t paths;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t indent = 0, cursor = 0;
|
|
|
|
std::string key, value, line;
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Read the "- cmd:" line.
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t advance = read_line(base, cursor, len, line);
|
|
|
|
trim_leading_spaces(line);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!extract_prefix_and_unescape_yaml(&key, &value, line) || key != "- cmd") {
|
2012-02-16 08:24:27 +00:00
|
|
|
goto done;
|
2014-07-29 21:41:21 +00:00
|
|
|
}
|
2015-09-17 04:31:08 +00:00
|
|
|
|
2012-02-16 08:24:27 +00:00
|
|
|
cursor += advance;
|
2012-02-18 17:58:54 +00:00
|
|
|
cmd = str2wcstring(value);
|
2012-02-16 08:24:27 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Read the remaining lines.
|
|
|
|
for (;;) {
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t advance = read_line(base, cursor, len, line);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t this_indent = trim_leading_spaces(line);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (indent == 0) indent = this_indent;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (this_indent == 0 || indent != this_indent) break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!extract_prefix_and_unescape_yaml(&key, &value, line)) break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We are definitely going to consume this line.
|
2012-02-16 08:24:27 +00:00
|
|
|
cursor += advance;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (key == "when") {
|
|
|
|
// Parse an int from the timestamp. Should this fail, strtol returns 0; that's
|
|
|
|
// acceptable.
|
2013-04-08 17:20:56 +00:00
|
|
|
char *end = NULL;
|
|
|
|
long tmp = strtol(value.c_str(), &end, 0);
|
|
|
|
when = tmp;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else if (key == "paths") {
|
|
|
|
// Read lines starting with " - " until we can't read any more.
|
|
|
|
for (;;) {
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t advance = read_line(base, cursor, len, line);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (trim_leading_spaces(line) <= indent) break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (strncmp(line.c_str(), "- ", 2)) break;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We're going to consume this line.
|
2012-02-16 08:24:27 +00:00
|
|
|
cursor += advance;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip the leading dash-space and then store this path it.
|
2012-02-16 08:24:27 +00:00
|
|
|
line.erase(0, 2);
|
2014-07-29 21:41:21 +00:00
|
|
|
unescape_yaml(&line);
|
2012-07-25 05:31:31 +00:00
|
|
|
paths.push_back(str2wcstring(line));
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-02-16 08:24:27 +00:00
|
|
|
done:
|
2014-03-29 06:22:03 +00:00
|
|
|
history_item_t result(cmd, when);
|
|
|
|
result.required_paths.swap(paths);
|
|
|
|
return result;
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t history_t::decode_item(const char *base, size_t len, history_file_type_t type) {
|
|
|
|
switch (type) {
|
2016-05-03 23:23:30 +00:00
|
|
|
case history_type_fish_1_x: {
|
2012-11-19 08:31:03 +00:00
|
|
|
return history_t::decode_item_fish_1_x(base, len);
|
2016-05-03 23:23:30 +00:00
|
|
|
}
|
|
|
|
case history_type_fish_2_0: {
|
2012-11-19 08:31:03 +00:00
|
|
|
return history_t::decode_item_fish_2_0(base, len);
|
2016-05-03 23:23:30 +00:00
|
|
|
}
|
|
|
|
default: { return history_item_t(L""); }
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Remove backslashes from all newlines. This makes a string from the history file better formated
|
|
|
|
/// for on screen display.
|
2016-04-18 05:47:37 +00:00
|
|
|
static wcstring history_unescape_newlines_fish_1_x(const wcstring &in_str) {
|
2012-06-15 23:22:37 +00:00
|
|
|
wcstring out;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (const wchar_t *in = in_str.c_str(); *in; in++) {
|
|
|
|
if (*in == L'\\') {
|
|
|
|
if (*(in + 1) != L'\n') {
|
2012-11-19 00:30:30 +00:00
|
|
|
out.push_back(*in);
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
2012-11-19 00:30:30 +00:00
|
|
|
out.push_back(*in);
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
}
|
2012-11-19 00:30:30 +00:00
|
|
|
return out;
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Decode an item via the fish 1.x format. Adapted from fish 1.x's item_get().
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t history_t::decode_item_fish_1_x(const char *begin, size_t length) {
|
2012-06-15 23:22:37 +00:00
|
|
|
const char *end = begin + length;
|
2016-03-11 02:17:39 +00:00
|
|
|
const char *pos = begin;
|
2012-06-15 23:22:37 +00:00
|
|
|
wcstring out;
|
2016-03-11 02:17:39 +00:00
|
|
|
bool was_backslash = false;
|
2012-06-15 23:22:37 +00:00
|
|
|
bool first_char = true;
|
|
|
|
bool timestamp_mode = false;
|
|
|
|
time_t timestamp = 0;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
while (1) {
|
2012-06-15 23:22:37 +00:00
|
|
|
wchar_t c;
|
|
|
|
size_t res;
|
2016-03-11 02:17:39 +00:00
|
|
|
mbstate_t state = {};
|
2012-06-15 23:22:37 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (MB_CUR_MAX == 1) { // single-byte locale
|
2016-03-11 02:17:39 +00:00
|
|
|
c = (unsigned char)*pos;
|
|
|
|
res = 1;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
2016-03-11 02:17:39 +00:00
|
|
|
res = mbrtowc(&c, pos, end - pos, &state);
|
|
|
|
}
|
2012-06-15 23:22:37 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (res == (size_t)-1) {
|
2012-06-15 23:22:37 +00:00
|
|
|
pos++;
|
|
|
|
continue;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else if (res == (size_t)-2) {
|
2012-06-15 23:22:37 +00:00
|
|
|
break;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else if (res == (size_t)0) {
|
2012-06-15 23:22:37 +00:00
|
|
|
pos++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
pos += res;
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (c == L'\n') {
|
|
|
|
if (timestamp_mode) {
|
2012-06-15 23:22:37 +00:00
|
|
|
const wchar_t *time_string = out.c_str();
|
2016-04-18 05:47:37 +00:00
|
|
|
while (*time_string && !iswdigit(*time_string)) time_string++;
|
|
|
|
errno = 0;
|
2012-06-15 23:22:37 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (*time_string) {
|
2012-06-15 23:22:37 +00:00
|
|
|
time_t tm;
|
|
|
|
wchar_t *end;
|
|
|
|
|
|
|
|
errno = 0;
|
2012-11-19 00:30:30 +00:00
|
|
|
tm = (time_t)wcstol(time_string, &end, 10);
|
2012-06-15 23:22:37 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (tm && !errno && !*end) {
|
2012-06-15 23:22:37 +00:00
|
|
|
timestamp = tm;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out.clear();
|
|
|
|
timestamp_mode = false;
|
|
|
|
continue;
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!was_backslash) break;
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (first_char) {
|
|
|
|
if (c == L'#') timestamp_mode = true;
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
first_char = false;
|
|
|
|
|
|
|
|
out.push_back(c);
|
|
|
|
|
2012-11-19 00:30:30 +00:00
|
|
|
was_backslash = ((c == L'\\') && !was_backslash);
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-06-15 23:22:37 +00:00
|
|
|
out = history_unescape_newlines_fish_1_x(out);
|
|
|
|
return history_item_t(out, timestamp);
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Try to infer the history file type based on inspecting the data.
|
2016-04-18 05:47:37 +00:00
|
|
|
static history_file_type_t infer_file_type(const char *data, size_t len) {
|
2012-06-15 23:22:37 +00:00
|
|
|
history_file_type_t result = history_type_unknown;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (len > 0) { // old fish started with a #
|
|
|
|
if (data[0] == '#') {
|
2012-06-15 23:22:37 +00:00
|
|
|
result = history_type_fish_1_x;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else { // assume new fish
|
2012-06-15 23:22:37 +00:00
|
|
|
result = history_type_fish_2_0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::populate_from_mmap(void) {
|
2012-06-15 23:22:37 +00:00
|
|
|
mmap_type = infer_file_type(mmap_start, mmap_length);
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t cursor = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (;;) {
|
|
|
|
size_t offset =
|
|
|
|
offset_of_next_item(mmap_start, mmap_length, mmap_type, &cursor, boundary_timestamp);
|
|
|
|
// If we get back -1, we're done.
|
|
|
|
if (offset == (size_t)(-1)) break;
|
2012-03-01 22:56:34 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Remember this item.
|
2012-11-18 10:23:22 +00:00
|
|
|
old_item_offsets.push_back(offset);
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Do a private, read-only map of the entirety of a history file with the given name. Returns true
|
|
|
|
/// if successful. Returns the mapped memory region by reference.
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_t::map_file(const wcstring &name, const char **out_map_start, size_t *out_map_len,
|
|
|
|
file_id_t *file_id) {
|
2012-04-16 05:49:27 +00:00
|
|
|
bool result = false;
|
2012-02-06 00:42:24 +00:00
|
|
|
wcstring filename = history_filename(name, L"");
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!filename.empty()) {
|
2012-12-03 00:39:35 +00:00
|
|
|
int fd = wopen_cloexec(filename, O_RDONLY);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (fd >= 0) {
|
|
|
|
// Get the file ID if requested.
|
|
|
|
if (file_id != NULL) *file_id = file_id_for_fd(fd);
|
|
|
|
|
|
|
|
// Take a read lock to guard against someone else appending. This is released when the
|
|
|
|
// file is closed (below). We will read the file after releasing the lock, but that's
|
|
|
|
// not a problem, because we never modify already written data. In short, the purpose of
|
|
|
|
// this lock is to ensure we don't see the file size change mid-update.
|
|
|
|
//
|
|
|
|
// We may fail to lock (e.g. on lockless NFS - see
|
|
|
|
// https://github.com/fish-shell/fish-shell/issues/685 ). In that case, we proceed as
|
|
|
|
// if it did not fail. The risk is that we may get an incomplete history item; this
|
|
|
|
// is unlikely because we only treat an item as valid if it has a terminating
|
|
|
|
// newline.
|
|
|
|
//
|
|
|
|
// Simulate a failing lock in chaos_mode.
|
|
|
|
if (!chaos_mode) history_file_lock(fd, F_RDLCK);
|
2013-04-27 22:21:14 +00:00
|
|
|
off_t len = lseek(fd, 0, SEEK_END);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (len != (off_t)-1) {
|
2013-04-27 22:21:14 +00:00
|
|
|
size_t mmap_length = (size_t)len;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (lseek(fd, 0, SEEK_SET) == 0) {
|
2013-04-27 22:21:14 +00:00
|
|
|
char *mmap_start;
|
2016-04-18 05:47:37 +00:00
|
|
|
if ((mmap_start = (char *)mmap(0, mmap_length, PROT_READ, MAP_PRIVATE, fd,
|
|
|
|
0)) != MAP_FAILED) {
|
2013-04-27 22:21:14 +00:00
|
|
|
result = true;
|
|
|
|
*out_map_start = mmap_start;
|
|
|
|
*out_map_len = mmap_length;
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
close(fd);
|
2012-11-18 10:23:22 +00:00
|
|
|
}
|
2012-04-16 05:49:27 +00:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_t::load_old_if_needed(void) {
|
2012-04-16 05:49:27 +00:00
|
|
|
if (loaded_old) return true;
|
|
|
|
loaded_old = true;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-04-16 05:49:27 +00:00
|
|
|
// PCA not sure why signals were blocked here
|
2016-04-18 05:47:37 +00:00
|
|
|
// signal_block();
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-11-19 00:30:30 +00:00
|
|
|
bool ok = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (map_file(name, &mmap_start, &mmap_length, &mmap_file_id)) {
|
|
|
|
// Here we've mapped the file.
|
2012-04-16 05:49:27 +00:00
|
|
|
ok = true;
|
|
|
|
time_profiler_t profiler("populate_from_mmap");
|
|
|
|
this->populate_from_mmap();
|
2012-11-18 10:23:22 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// signal_unblock();
|
2012-03-26 08:21:10 +00:00
|
|
|
return ok;
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_search_t::skip_matches(const wcstring_list_t &skips) {
|
2012-02-06 19:52:24 +00:00
|
|
|
external_skips = skips;
|
|
|
|
std::sort(external_skips.begin(), external_skips.end());
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_search_t::should_skip_match(const wcstring &str) const {
|
2012-02-06 19:52:24 +00:00
|
|
|
return std::binary_search(external_skips.begin(), external_skips.end(), str);
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_search_t::go_forwards() {
|
|
|
|
// Pop the top index (if more than one) and return if we have any left.
|
|
|
|
if (prev_matches.size() > 1) {
|
2012-02-06 06:30:42 +00:00
|
|
|
prev_matches.pop_back();
|
2012-02-06 06:48:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_search_t::go_backwards() {
|
|
|
|
// Backwards means increasing our index.
|
2012-02-06 00:42:24 +00:00
|
|
|
const size_t max_idx = (size_t)(-1);
|
2012-02-06 06:30:42 +00:00
|
|
|
|
|
|
|
size_t idx = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!prev_matches.empty()) idx = prev_matches.back().first;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (idx == max_idx) return false;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2013-04-06 07:28:55 +00:00
|
|
|
const bool main_thread = is_main_thread();
|
2013-05-05 09:33:17 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
while (++idx < max_idx) {
|
|
|
|
if (main_thread ? reader_interrupted() : reader_thread_job_is_stale()) {
|
2013-04-06 07:28:55 +00:00
|
|
|
return false;
|
|
|
|
}
|
2013-05-05 09:33:17 +00:00
|
|
|
|
2012-02-06 06:30:42 +00:00
|
|
|
const history_item_t item = history->item_at_index(idx);
|
2016-04-18 05:47:37 +00:00
|
|
|
// We're done if it's empty or we cancelled.
|
|
|
|
if (item.empty()) {
|
2012-02-06 00:42:24 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Look for a term that matches and that we haven't seen before.
|
2012-02-06 19:52:24 +00:00
|
|
|
const wcstring &str = item.str();
|
2016-04-18 05:47:37 +00:00
|
|
|
if (item.matches_search(term, search_type) && !match_already_made(str) &&
|
|
|
|
!should_skip_match(str)) {
|
2012-02-16 08:24:27 +00:00
|
|
|
prev_matches.push_back(prev_match_t(idx, item));
|
2012-02-06 00:42:24 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Goes to the end (forwards).
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_search_t::go_to_end(void) { prev_matches.clear(); }
|
2012-02-06 07:22:18 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Returns if we are at the end, which is where we start.
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_search_t::is_at_end(void) const { return prev_matches.empty(); }
|
2012-02-06 07:22:18 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Goes to the beginning (backwards).
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_search_t::go_to_beginning(void) {
|
|
|
|
// Go backwards as far as we can.
|
2012-02-06 06:30:42 +00:00
|
|
|
while (go_backwards())
|
2016-04-18 05:47:37 +00:00
|
|
|
; // noop
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
2005-09-20 13:26:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
history_item_t history_search_t::current_item() const {
|
|
|
|
assert(!prev_matches.empty());
|
2012-02-06 06:30:42 +00:00
|
|
|
return prev_matches.back().second;
|
2006-10-22 01:21:02 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
wcstring history_search_t::current_string() const {
|
2012-02-16 08:24:27 +00:00
|
|
|
history_item_t item = this->current_item();
|
|
|
|
return item.str();
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_search_t::match_already_made(const wcstring &match) const {
|
|
|
|
for (std::vector<prev_match_t>::const_iterator iter = prev_matches.begin();
|
|
|
|
iter != prev_matches.end(); ++iter) {
|
|
|
|
if (iter->second.str() == match) return true;
|
2012-02-06 06:30:42 +00:00
|
|
|
}
|
|
|
|
return false;
|
2006-10-22 01:21:02 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static void replace_all(std::string *str, const char *needle, const char *replacement) {
|
2012-02-16 08:24:27 +00:00
|
|
|
size_t needle_len = strlen(needle), replacement_len = strlen(replacement);
|
2012-02-06 00:42:24 +00:00
|
|
|
size_t offset = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
while ((offset = str->find(needle, offset)) != std::string::npos) {
|
2014-07-29 21:41:21 +00:00
|
|
|
str->replace(offset, needle_len, replacement);
|
2012-02-16 08:24:27 +00:00
|
|
|
offset += replacement_len;
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static void escape_yaml(std::string *str) {
|
|
|
|
replace_all(str, "\\", "\\\\"); // replace one backslash with two
|
|
|
|
replace_all(str, "\n", "\\n"); // replace newline with backslash + literal n
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// This function is called frequently, so it ought to be fast.
|
2016-04-18 05:47:37 +00:00
|
|
|
static void unescape_yaml(std::string *str) {
|
2014-07-29 21:41:21 +00:00
|
|
|
size_t cursor = 0, size = str->size();
|
2016-04-18 05:47:37 +00:00
|
|
|
while (cursor < size) {
|
2013-04-07 21:59:48 +00:00
|
|
|
// Operate on a const version of str, to avoid needless COWs that at() does.
|
2014-07-29 21:41:21 +00:00
|
|
|
const std::string &const_str = *str;
|
2013-05-05 09:33:17 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Look for a backslash.
|
2013-04-07 21:59:48 +00:00
|
|
|
size_t backslash = const_str.find('\\', cursor);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (backslash == std::string::npos || backslash + 1 >= size) {
|
|
|
|
// Either not found, or found as the last character.
|
2013-04-07 21:59:48 +00:00
|
|
|
break;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// Backslash found. Maybe we'll do something about it. Be sure to invoke the const
|
|
|
|
// version of at().
|
2013-04-07 21:59:48 +00:00
|
|
|
char escaped_char = const_str.at(backslash + 1);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (escaped_char == '\\') {
|
2013-04-07 21:59:48 +00:00
|
|
|
// Two backslashes in a row. Delete the second one.
|
2014-07-29 21:41:21 +00:00
|
|
|
str->erase(backslash + 1, 1);
|
2013-04-07 21:59:48 +00:00
|
|
|
size--;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else if (escaped_char == 'n') {
|
2013-04-07 21:59:48 +00:00
|
|
|
// Backslash + n. Replace with a newline.
|
2014-07-29 21:41:21 +00:00
|
|
|
str->replace(backslash, 2, "\n");
|
2013-04-07 21:59:48 +00:00
|
|
|
size--;
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
// The character at index backslash has now been made whole; start at the next
|
|
|
|
// character.
|
2013-04-07 21:59:48 +00:00
|
|
|
cursor = backslash + 1;
|
2012-02-16 08:24:27 +00:00
|
|
|
}
|
|
|
|
}
|
2012-02-06 04:54:41 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static wcstring history_filename(const wcstring &name, const wcstring &suffix) {
|
2012-02-06 00:42:24 +00:00
|
|
|
wcstring path;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!path_get_data(path)) return L"";
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-06 00:42:24 +00:00
|
|
|
wcstring result = path;
|
|
|
|
result.append(L"/");
|
|
|
|
result.append(name);
|
|
|
|
result.append(L"_history");
|
|
|
|
result.append(suffix);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::clear_file_state() {
|
2014-07-25 17:08:21 +00:00
|
|
|
ASSERT_IS_LOCKED(lock);
|
2016-04-18 05:47:37 +00:00
|
|
|
// Erase everything we know about our file.
|
|
|
|
if (mmap_start != NULL && mmap_start != MAP_FAILED) {
|
2012-02-16 08:24:27 +00:00
|
|
|
munmap((void *)mmap_start, mmap_length);
|
|
|
|
}
|
2012-03-01 22:56:34 +00:00
|
|
|
mmap_start = NULL;
|
2012-02-16 08:24:27 +00:00
|
|
|
mmap_length = 0;
|
|
|
|
loaded_old = false;
|
|
|
|
old_item_offsets.clear();
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::compact_new_items() {
|
|
|
|
// Keep only the most recent items with the given contents. This algorithm could be made more
|
|
|
|
// efficient, but likely would consume more memory too.
|
2012-03-01 22:56:34 +00:00
|
|
|
std::set<wcstring> seen;
|
|
|
|
size_t idx = new_items.size();
|
2016-04-18 05:47:37 +00:00
|
|
|
while (idx--) {
|
2012-03-01 22:56:34 +00:00
|
|
|
const history_item_t &item = new_items[idx];
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!seen.insert(item.contents).second) {
|
|
|
|
// This item was not inserted because it was already in the set, so delete the item at
|
|
|
|
// this index.
|
2012-03-01 22:56:34 +00:00
|
|
|
new_items.erase(new_items.begin() + idx);
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (idx < first_unwritten_new_item_index) {
|
|
|
|
// Decrement first_unwritten_new_item_index if we are deleting a previously written
|
|
|
|
// item.
|
2012-12-03 00:39:35 +00:00
|
|
|
first_unwritten_new_item_index--;
|
|
|
|
}
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_t::save_internal_via_rewrite() {
|
|
|
|
// This must be called while locked.
|
2012-03-01 22:56:34 +00:00
|
|
|
ASSERT_IS_LOCKED(lock);
|
2013-04-27 22:21:14 +00:00
|
|
|
bool ok = false;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-12-03 09:53:52 +00:00
|
|
|
wcstring tmp_name_template = history_filename(name, L".XXXXXX");
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!tmp_name_template.empty()) {
|
|
|
|
// Make an LRU cache to save only the last N elements.
|
2012-02-23 18:49:30 +00:00
|
|
|
history_lru_cache_t lru(HISTORY_SAVE_MAX);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Insert old items in, from old to new. Merge them with our new items, inserting items with
|
|
|
|
// earlier timestamps first.
|
2014-03-29 06:22:03 +00:00
|
|
|
history_item_list_t::const_iterator new_item_iter = new_items.begin();
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Map in existing items (which may have changed out from underneath us, so don't trust our
|
|
|
|
// old mmap'd data).
|
2012-04-16 05:49:27 +00:00
|
|
|
const char *local_mmap_start = NULL;
|
|
|
|
size_t local_mmap_size = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (map_file(name, &local_mmap_start, &local_mmap_size, NULL)) {
|
|
|
|
const history_file_type_t local_mmap_type =
|
|
|
|
infer_file_type(local_mmap_start, local_mmap_size);
|
2012-04-16 05:49:27 +00:00
|
|
|
size_t cursor = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (;;) {
|
|
|
|
size_t offset = offset_of_next_item(local_mmap_start, local_mmap_size,
|
|
|
|
local_mmap_type, &cursor, 0);
|
|
|
|
// If we get back -1, we're done.
|
|
|
|
if (offset == (size_t)(-1)) break;
|
|
|
|
|
|
|
|
// Try decoding an old item.
|
|
|
|
const history_item_t old_item = history_t::decode_item(
|
|
|
|
local_mmap_start + offset, local_mmap_size - offset, local_mmap_type);
|
|
|
|
if (old_item.empty() || deleted_items.count(old_item.str()) > 0) {
|
|
|
|
// debug(0, L"Item is deleted : %s\n",
|
|
|
|
// old_item.str().c_str());
|
2012-04-16 05:49:27 +00:00
|
|
|
continue;
|
2012-06-05 04:24:42 +00:00
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
// The old item may actually be more recent than our new item, if it came from
|
|
|
|
// another session. Insert all new items at the given index with an earlier
|
|
|
|
// timestamp.
|
|
|
|
for (; new_item_iter != new_items.end(); ++new_item_iter) {
|
|
|
|
if (new_item_iter->timestamp() < old_item.timestamp()) {
|
|
|
|
// This "new item" is in fact older.
|
2012-04-16 05:49:27 +00:00
|
|
|
lru.add_item(*new_item_iter);
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// The new item is not older.
|
2012-04-16 05:49:27 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Now add this old item.
|
2012-04-16 05:49:27 +00:00
|
|
|
lru.add_item(old_item);
|
2012-03-01 22:56:34 +00:00
|
|
|
}
|
2012-04-16 05:49:27 +00:00
|
|
|
munmap((void *)local_mmap_start, local_mmap_size);
|
2012-02-23 18:49:30 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Insert any remaining new items.
|
|
|
|
for (; new_item_iter != new_items.end(); ++new_item_iter) {
|
2012-03-01 22:56:34 +00:00
|
|
|
lru.add_item(*new_item_iter);
|
2012-02-23 18:49:30 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-23 18:49:30 +00:00
|
|
|
signal_block();
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try to create a temporary file, up to 10 times. We don't use mkstemps because we want to
|
|
|
|
// open it CLO_EXEC. This should almost always succeed on the first try.
|
2012-12-03 09:53:52 +00:00
|
|
|
int out_fd = -1;
|
|
|
|
wcstring tmp_name;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (size_t attempt = 0; attempt < 10 && out_fd == -1; attempt++) {
|
2012-12-03 09:53:52 +00:00
|
|
|
char *narrow_str = wcs2str(tmp_name_template.c_str());
|
2014-05-03 22:27:58 +00:00
|
|
|
#if HAVE_MKOSTEMP
|
2014-11-02 06:57:12 +00:00
|
|
|
out_fd = mkostemp(narrow_str, O_CLOEXEC);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (out_fd >= 0) {
|
2014-05-03 22:27:58 +00:00
|
|
|
tmp_name = str2wcstring(narrow_str);
|
|
|
|
}
|
|
|
|
#else
|
2016-04-18 05:47:37 +00:00
|
|
|
if (narrow_str && mktemp(narrow_str)) {
|
|
|
|
// It was successfully templated; try opening it atomically.
|
2012-12-03 09:53:52 +00:00
|
|
|
tmp_name = str2wcstring(narrow_str);
|
2015-04-30 00:52:50 +00:00
|
|
|
out_fd = wopen_cloexec(tmp_name, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, 0600);
|
2012-12-03 09:53:52 +00:00
|
|
|
}
|
2014-05-03 22:27:58 +00:00
|
|
|
#endif
|
2012-12-03 09:53:52 +00:00
|
|
|
free(narrow_str);
|
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (out_fd >= 0) {
|
|
|
|
// Write them out.
|
2013-04-27 22:21:14 +00:00
|
|
|
bool errored = false;
|
|
|
|
history_output_buffer_t buffer;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (history_lru_cache_t::iterator iter = lru.begin(); iter != lru.end(); ++iter) {
|
2013-04-27 22:21:14 +00:00
|
|
|
const history_lru_node_t *node = *iter;
|
|
|
|
append_yaml_to_buffer(node->key, node->timestamp, node->required_paths, &buffer);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (buffer.output_size() >= HISTORY_OUTPUT_BUFFER_SIZE &&
|
|
|
|
!buffer.flush_to_fd(out_fd)) {
|
2013-04-27 22:21:14 +00:00
|
|
|
errored = true;
|
|
|
|
break;
|
2012-02-06 04:54:41 +00:00
|
|
|
}
|
2013-04-27 22:21:14 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!errored && buffer.flush_to_fd(out_fd)) {
|
2013-04-27 22:21:14 +00:00
|
|
|
ok = true;
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!ok) {
|
|
|
|
// This message does not have high enough priority to be shown by default.
|
2013-04-27 22:21:14 +00:00
|
|
|
debug(2, L"Error when writing history file");
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
2013-04-27 22:21:14 +00:00
|
|
|
wcstring new_name = history_filename(name, wcstring());
|
2015-09-26 09:19:51 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Ensure we maintain the ownership and permissions of the original (#2355). If the
|
|
|
|
// stat fails, we assume (hope) our default permissions are correct. This
|
|
|
|
// corresponds to e.g. someone running sudo -E as the very first command. If they
|
|
|
|
// did, it would be tricky to set the permissions correctly. (bash doesn't get this
|
|
|
|
// case right either).
|
2015-09-26 09:19:51 +00:00
|
|
|
struct stat sbuf;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (wstat(new_name, &sbuf) >= 0) { // success
|
|
|
|
if (fchown(out_fd, sbuf.st_uid, sbuf.st_gid) == -1) {
|
2016-03-12 20:26:01 +00:00
|
|
|
debug(2, L"Error %d when changing ownership of history file", errno);
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
if (fchmod(out_fd, sbuf.st_mode) == -1) {
|
2016-03-12 20:26:01 +00:00
|
|
|
debug(2, L"Error %d when changing mode of history file", errno);
|
2016-03-12 19:21:52 +00:00
|
|
|
}
|
2015-09-26 09:19:51 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (wrename(tmp_name, new_name) == -1) {
|
2016-03-12 20:26:01 +00:00
|
|
|
debug(2, L"Error %d when renaming history file", errno);
|
2015-07-20 09:34:57 +00:00
|
|
|
}
|
2013-04-27 22:21:14 +00:00
|
|
|
}
|
2012-12-03 00:39:35 +00:00
|
|
|
close(out_fd);
|
2013-04-27 22:21:14 +00:00
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-02-23 18:49:30 +00:00
|
|
|
signal_unblock();
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Make sure we clear all nodes, since this doesn't happen automatically.
|
2012-02-23 18:49:30 +00:00
|
|
|
lru.evict_all_nodes();
|
2012-12-03 00:39:35 +00:00
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (ok) {
|
|
|
|
// We've saved everything, so we have no more unsaved items.
|
2012-12-03 07:38:38 +00:00
|
|
|
this->first_unwritten_new_item_index = new_items.size();
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We deleted our deleted items.
|
2012-12-03 07:38:38 +00:00
|
|
|
this->deleted_items.clear();
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Our history has been written to the file, so clear our state so we can re-reference the
|
|
|
|
// file.
|
2012-12-03 07:38:38 +00:00
|
|
|
this->clear_file_state();
|
|
|
|
}
|
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
return ok;
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_t::save_internal_via_appending() {
|
|
|
|
// This must be called while locked.
|
2012-12-03 00:39:35 +00:00
|
|
|
ASSERT_IS_LOCKED(lock);
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// No deleting allowed.
|
2012-12-03 07:38:38 +00:00
|
|
|
assert(deleted_items.empty());
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
bool ok = false;
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If the file is different (someone vacuumed it) then we need to update our mmap.
|
2012-12-03 07:38:38 +00:00
|
|
|
bool file_changed = false;
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Get the path to the real history file.
|
2012-12-03 00:39:35 +00:00
|
|
|
wcstring history_path = history_filename(name, wcstring());
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
signal_block();
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Open the file.
|
2012-12-03 00:39:35 +00:00
|
|
|
int out_fd = wopen_cloexec(history_path, O_WRONLY | O_APPEND);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (out_fd >= 0) {
|
|
|
|
// Check to see if the file changed.
|
|
|
|
if (file_id_for_fd(out_fd) != mmap_file_id) file_changed = true;
|
|
|
|
|
|
|
|
// Exclusive lock on the entire file. This is released when we close the file (below). This
|
|
|
|
// may fail on (e.g.) lockless NFS. If so, proceed as if it did not fail; the risk is that
|
|
|
|
// we may get interleaved history items, which is considered better than no history, or
|
|
|
|
// forcing everything through the slow copy-move mode. We try to minimize this possibility
|
|
|
|
// by writing with O_APPEND.
|
|
|
|
//
|
|
|
|
// Simulate a failing lock in chaos_mode
|
|
|
|
if (!chaos_mode) history_file_lock(out_fd, F_WRLCK);
|
|
|
|
|
|
|
|
// We (hopefully successfully) took the exclusive lock. Append to the file.
|
|
|
|
// Note that this is sketchy for a few reasons:
|
|
|
|
// - Another shell may have appended its own items with a later timestamp, so our file may
|
|
|
|
// no longer be sorted by timestamp.
|
|
|
|
// - Another shell may have appended the same items, so our file may now contain
|
|
|
|
// duplicates.
|
|
|
|
//
|
|
|
|
// We cannot modify any previous parts of our file, because other instances may be reading
|
|
|
|
// those portions. We can only append.
|
|
|
|
//
|
|
|
|
// Originally we always rewrote the file on saving, which avoided both of these problems.
|
|
|
|
// However, appending allows us to save history after every command, which is nice!
|
|
|
|
//
|
|
|
|
// Periodically we "clean up" the file by rewriting it, so that most of the time it doesn't
|
|
|
|
// have duplicates, although we don't yet sort by timestamp (the timestamp isn't really used
|
|
|
|
// for much anyways).
|
|
|
|
|
|
|
|
// So far so good. Write all items at or after first_unwritten_new_item_index. Note that we
|
|
|
|
// write even a pending item - pending items are ignored by history within the command
|
|
|
|
// itself, but should still be written to the file.
|
2013-04-27 22:21:14 +00:00
|
|
|
bool errored = false;
|
|
|
|
history_output_buffer_t buffer;
|
2016-04-18 05:47:37 +00:00
|
|
|
while (first_unwritten_new_item_index < new_items.size()) {
|
2013-04-27 22:21:14 +00:00
|
|
|
const history_item_t &item = new_items.at(first_unwritten_new_item_index);
|
|
|
|
append_yaml_to_buffer(item.str(), item.timestamp(), item.get_required_paths(), &buffer);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (buffer.output_size() >= HISTORY_OUTPUT_BUFFER_SIZE) {
|
|
|
|
errored = !buffer.flush_to_fd(out_fd);
|
2013-04-27 22:21:14 +00:00
|
|
|
if (errored) break;
|
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// We wrote this item, hooray.
|
2013-04-27 22:21:14 +00:00
|
|
|
first_unwritten_new_item_index++;
|
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!errored && buffer.flush_to_fd(out_fd)) {
|
2013-04-27 22:21:14 +00:00
|
|
|
ok = true;
|
2012-12-03 00:39:35 +00:00
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
close(out_fd);
|
2013-04-27 22:21:14 +00:00
|
|
|
}
|
2012-02-06 00:42:24 +00:00
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
signal_unblock();
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If someone has replaced the file, forget our file state.
|
|
|
|
if (file_changed) {
|
2012-12-03 07:38:38 +00:00
|
|
|
this->clear_file_state();
|
|
|
|
}
|
2012-12-03 10:25:08 +00:00
|
|
|
|
2012-12-03 00:39:35 +00:00
|
|
|
return ok;
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Save the specified mode to file; optionally also vacuums.
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::save_internal(bool vacuum) {
|
2012-12-03 00:39:35 +00:00
|
|
|
ASSERT_IS_LOCKED(lock);
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Nothing to do if there's no new items.
|
|
|
|
if (first_unwritten_new_item_index >= new_items.size() && deleted_items.empty()) return;
|
2012-12-03 00:39:35 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Compact our new items so we don't have duplicates.
|
2012-12-03 00:39:35 +00:00
|
|
|
this->compact_new_items();
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Try saving. If we have items to delete, we have to rewrite the file. If we do not, we can
|
|
|
|
// append to it.
|
2012-12-03 00:39:35 +00:00
|
|
|
bool ok = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!vacuum && deleted_items.empty()) {
|
|
|
|
// Try doing a fast append.
|
2012-12-03 07:38:38 +00:00
|
|
|
ok = save_internal_via_appending();
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!ok) {
|
|
|
|
// We did not or could not append; rewrite the file ("vacuum" it).
|
2012-12-03 07:38:38 +00:00
|
|
|
ok = this->save_internal_via_rewrite();
|
2012-11-19 00:30:30 +00:00
|
|
|
}
|
2012-02-06 00:42:24 +00:00
|
|
|
}
|
2012-02-06 04:54:41 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::save(void) {
|
2012-02-06 04:54:41 +00:00
|
|
|
scoped_lock locker(lock);
|
2012-12-03 07:38:38 +00:00
|
|
|
this->save_internal(false);
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::disable_automatic_saving() {
|
2014-03-29 06:22:03 +00:00
|
|
|
scoped_lock locker(lock);
|
|
|
|
disable_automatic_save_counter++;
|
2016-04-18 05:47:37 +00:00
|
|
|
assert(disable_automatic_save_counter != 0); // overflow!
|
2014-03-29 06:22:03 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::enable_automatic_saving() {
|
2014-03-29 06:22:03 +00:00
|
|
|
scoped_lock locker(lock);
|
2016-04-18 05:47:37 +00:00
|
|
|
assert(disable_automatic_save_counter > 0); // underflow
|
2014-03-29 06:22:03 +00:00
|
|
|
disable_automatic_save_counter--;
|
|
|
|
save_internal_unless_disabled();
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::clear(void) {
|
2012-02-16 08:24:27 +00:00
|
|
|
scoped_lock locker(lock);
|
|
|
|
new_items.clear();
|
2012-06-05 04:24:42 +00:00
|
|
|
deleted_items.clear();
|
2012-12-03 00:39:35 +00:00
|
|
|
first_unwritten_new_item_index = 0;
|
2012-02-16 08:24:27 +00:00
|
|
|
old_item_offsets.clear();
|
|
|
|
wcstring filename = history_filename(name, L"");
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!filename.empty()) wunlink(filename);
|
2012-02-16 08:24:27 +00:00
|
|
|
this->clear_file_state();
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool history_t::is_empty(void) {
|
2012-07-10 05:54:08 +00:00
|
|
|
scoped_lock locker(lock);
|
2012-12-05 21:33:07 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If we have new items, we're not empty.
|
|
|
|
if (!new_items.empty()) return false;
|
2012-12-05 00:00:35 +00:00
|
|
|
|
|
|
|
bool empty = false;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (loaded_old) {
|
|
|
|
// If we've loaded old items, see if we have any offsets.
|
2012-12-05 00:00:35 +00:00
|
|
|
empty = old_item_offsets.empty();
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// If we have not loaded old items, don't actually load them (which may be expensive); just
|
|
|
|
// stat the file and see if it exists and is nonempty.
|
2012-12-05 00:00:35 +00:00
|
|
|
const wcstring where = history_filename(name, L"");
|
|
|
|
struct stat buf = {};
|
2016-04-18 05:47:37 +00:00
|
|
|
if (wstat(where, &buf) != 0) {
|
|
|
|
// Access failed, assume missing.
|
2012-12-05 00:00:35 +00:00
|
|
|
empty = true;
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// We're empty if the file is empty.
|
2012-12-05 00:00:35 +00:00
|
|
|
empty = (buf.st_size == 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return empty;
|
2012-07-10 05:54:08 +00:00
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Populates from older location (in config path, rather than data path) This is accomplished by
|
|
|
|
/// clearing ourselves, and copying the contents of the old history file to the new history file.
|
|
|
|
/// The new contents will automatically be re-mapped later.
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::populate_from_config_path() {
|
2015-09-19 03:47:38 +00:00
|
|
|
wcstring old_file;
|
|
|
|
if (path_get_config(old_file)) {
|
|
|
|
old_file.append(L"/");
|
|
|
|
old_file.append(name);
|
|
|
|
old_file.append(L"_history");
|
|
|
|
int src_fd = wopen_cloexec(old_file, O_RDONLY, 0);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (src_fd != -1) {
|
2015-09-19 04:37:34 +00:00
|
|
|
wcstring new_file = history_filename(name, wcstring());
|
2015-09-19 03:47:38 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Clear must come after we've retrieved the new_file name, and before we open
|
|
|
|
// destination file descriptor, since it destroys the name and the file.
|
2015-09-19 03:47:38 +00:00
|
|
|
this->clear();
|
|
|
|
|
|
|
|
int dst_fd = wopen_cloexec(new_file, O_WRONLY | O_CREAT, 0644);
|
|
|
|
char buf[BUFSIZ];
|
2016-03-04 02:49:12 +00:00
|
|
|
ssize_t size;
|
2015-09-19 03:47:38 +00:00
|
|
|
while ((size = read(src_fd, buf, BUFSIZ)) > 0) {
|
2016-03-04 02:49:12 +00:00
|
|
|
ssize_t written = write(dst_fd, buf, static_cast<size_t>(size));
|
|
|
|
if (written < 0) {
|
2016-04-18 05:47:37 +00:00
|
|
|
// This message does not have high enough priority to be shown by default.
|
2015-09-19 03:47:38 +00:00
|
|
|
debug(2, L"Error when writing history file");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
close(src_fd);
|
|
|
|
close(dst_fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Indicate whether we ought to import the bash history file into fish.
|
2016-04-18 05:47:37 +00:00
|
|
|
static bool should_import_bash_history_line(const std::string &line) {
|
|
|
|
if (line.empty()) return false;
|
2015-09-19 03:47:38 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Very naive tests! Skip export; probably should skip others.
|
|
|
|
const char *const ignore_prefixes[] = {"export ", "#"};
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
for (size_t i = 0; i < sizeof ignore_prefixes / sizeof *ignore_prefixes; i++) {
|
2012-06-15 23:22:37 +00:00
|
|
|
const char *prefix = ignore_prefixes[i];
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!line.compare(0, strlen(prefix), prefix)) {
|
2012-06-15 23:22:37 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Skip lines with backticks.
|
|
|
|
if (line.find('`') != std::string::npos) return false;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2012-06-15 23:22:37 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::populate_from_bash(FILE *stream) {
|
|
|
|
// Bash's format is very simple: just lines with #s for comments. Ignore a few commands that are
|
|
|
|
// bash-specific. This list ought to be expanded.
|
2012-06-15 23:22:37 +00:00
|
|
|
std::string line;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (;;) {
|
2012-06-15 23:22:37 +00:00
|
|
|
line.clear();
|
|
|
|
bool success = false, has_newline = false;
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Loop until we've read a line.
|
|
|
|
do {
|
2012-06-15 23:22:37 +00:00
|
|
|
char buff[128];
|
2016-04-18 05:47:37 +00:00
|
|
|
success = !!fgets(buff, sizeof buff, stream);
|
|
|
|
if (success) {
|
|
|
|
// Skip the newline.
|
2012-06-15 23:22:37 +00:00
|
|
|
char *newline = strchr(buff, '\n');
|
|
|
|
if (newline) *newline = '\0';
|
|
|
|
has_newline = (newline != NULL);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Append what we've got.
|
2012-06-15 23:22:37 +00:00
|
|
|
line.append(buff);
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
} while (success && !has_newline);
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Maybe add this line.
|
|
|
|
if (should_import_bash_history_line(line)) {
|
2012-06-15 23:22:37 +00:00
|
|
|
this->add(str2wcstring(line));
|
|
|
|
}
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (line.empty()) break;
|
2012-06-15 23:22:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::incorporate_external_changes() {
|
|
|
|
// To incorporate new items, we simply update our timestamp to now, so that items from previous
|
|
|
|
// instances get added. We then clear the file state so that we remap the file. Note that this
|
|
|
|
// is somehwhat expensive because we will be going back over old items. An optimization would be
|
|
|
|
// to preserve old_item_offsets so that they don't have to be recomputed. (However, then items
|
|
|
|
// *deleted* in other instances would not show up here).
|
2014-07-25 17:08:21 +00:00
|
|
|
time_t new_timestamp = time(NULL);
|
|
|
|
scoped_lock locker(lock);
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If for some reason the clock went backwards, we don't want to start dropping items; therefore
|
|
|
|
// we only do work if time has progressed. This also makes multiple calls cheap.
|
|
|
|
if (new_timestamp > this->boundary_timestamp) {
|
2014-07-25 17:08:21 +00:00
|
|
|
this->boundary_timestamp = new_timestamp;
|
|
|
|
this->clear_file_state();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_init() {}
|
2005-09-20 13:26:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_collection_t::save() {
|
|
|
|
// Save all histories.
|
|
|
|
for (std::map<wcstring, history_t *>::iterator iter = m_histories.begin();
|
|
|
|
iter != m_histories.end(); ++iter) {
|
2016-03-18 22:14:16 +00:00
|
|
|
history_t *hist = iter->second;
|
|
|
|
hist->save();
|
2012-02-06 04:54:41 +00:00
|
|
|
}
|
2006-10-20 22:36:49 +00:00
|
|
|
}
|
2005-09-20 13:26:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_destroy() { histories.save(); }
|
2006-10-20 22:36:49 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_sanity_check() {
|
|
|
|
// No sanity checking implemented yet...
|
2005-09-20 13:26:39 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
int file_detection_context_t::perform_file_detection(bool test_all) {
|
2012-02-16 08:24:27 +00:00
|
|
|
ASSERT_IS_BACKGROUND_THREAD();
|
|
|
|
valid_paths.clear();
|
|
|
|
int result = 1;
|
2016-04-18 05:47:37 +00:00
|
|
|
for (path_list_t::const_iterator iter = potential_paths.begin(); iter != potential_paths.end();
|
|
|
|
++iter) {
|
|
|
|
if (path_is_valid(*iter, working_directory)) {
|
|
|
|
// Push the original (possibly relative) path.
|
2012-07-25 05:31:31 +00:00
|
|
|
valid_paths.push_back(*iter);
|
2016-04-18 05:47:37 +00:00
|
|
|
} else {
|
|
|
|
// Not a valid path.
|
2012-02-16 08:24:27 +00:00
|
|
|
result = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!test_all) break;
|
2012-02-15 19:33:41 +00:00
|
|
|
}
|
|
|
|
}
|
2012-02-16 08:24:27 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
bool file_detection_context_t::paths_are_valid(const path_list_t &paths) {
|
2012-02-16 08:24:27 +00:00
|
|
|
this->potential_paths = paths;
|
|
|
|
return perform_file_detection(false) > 0;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
file_detection_context_t::file_detection_context_t(history_t *hist, history_identifier_t ident)
|
|
|
|
: history(hist), working_directory(env_get_pwd_slash()), history_item_identifier(ident) {}
|
2012-02-15 19:33:41 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static int threaded_perform_file_detection(file_detection_context_t *ctx) {
|
2012-02-15 19:33:41 +00:00
|
|
|
ASSERT_IS_BACKGROUND_THREAD();
|
|
|
|
assert(ctx != NULL);
|
2012-02-16 08:24:27 +00:00
|
|
|
return ctx->perform_file_detection(true /* test all */);
|
2012-02-15 19:33:41 +00:00
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static void perform_file_detection_done(file_detection_context_t *ctx, int success) {
|
2014-03-29 06:22:03 +00:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Now that file detection is done, update the history item with the valid file paths.
|
2014-03-29 06:22:03 +00:00
|
|
|
ctx->history->set_valid_file_paths(ctx->valid_paths, ctx->history_item_identifier);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Allow saving again.
|
2014-03-29 06:22:03 +00:00
|
|
|
ctx->history->enable_automatic_saving();
|
2012-11-18 10:23:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Done with the context.
|
2012-02-15 19:33:41 +00:00
|
|
|
delete ctx;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
static bool string_could_be_path(const wcstring &potential_path) {
|
|
|
|
// Assume that things with leading dashes aren't paths.
|
|
|
|
if (potential_path.empty() || potential_path.at(0) == L'-') {
|
2012-02-15 19:33:41 +00:00
|
|
|
return false;
|
2014-03-29 06:22:03 +00:00
|
|
|
}
|
2012-02-15 19:33:41 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::add_pending_with_file_detection(const wcstring &str) {
|
2012-02-15 19:33:41 +00:00
|
|
|
ASSERT_IS_MAIN_THREAD();
|
|
|
|
path_list_t potential_paths;
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Find all arguments that look like they could be file paths.
|
2013-02-02 22:50:22 +00:00
|
|
|
bool impending_exit = false;
|
2014-03-29 06:22:03 +00:00
|
|
|
parse_node_tree_t tree;
|
|
|
|
parse_tree_from_string(str, parse_flag_none, &tree, NULL);
|
|
|
|
size_t count = tree.size();
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
for (size_t i = 0; i < count; i++) {
|
2014-03-29 06:22:03 +00:00
|
|
|
const parse_node_t &node = tree.at(i);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!node.has_source()) {
|
2014-03-29 06:22:03 +00:00
|
|
|
continue;
|
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
if (node.type == symbol_argument) {
|
2014-03-29 06:22:03 +00:00
|
|
|
wcstring potential_path = node.get_source(str);
|
|
|
|
bool unescaped = unescape_string_in_place(&potential_path, UNESCAPE_DEFAULT);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (unescaped && string_could_be_path(potential_path)) {
|
2014-03-29 06:22:03 +00:00
|
|
|
potential_paths.push_back(potential_path);
|
|
|
|
}
|
2016-04-18 05:47:37 +00:00
|
|
|
} else if (node.type == symbol_plain_statement) {
|
|
|
|
// Hack hack hack - if the command is likely to trigger an exit, then don't do
|
|
|
|
// background file detection, because we won't be able to write it to our history file
|
|
|
|
// before we exit.
|
|
|
|
if (tree.decoration_for_plain_statement(node) == parse_statement_decoration_exec) {
|
2014-03-29 06:22:03 +00:00
|
|
|
impending_exit = true;
|
|
|
|
}
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2014-03-29 06:22:03 +00:00
|
|
|
wcstring command;
|
|
|
|
tree.command_for_plain_statement(node, str, &command);
|
|
|
|
unescape_string_in_place(&command, UNESCAPE_DEFAULT);
|
2016-04-18 05:47:37 +00:00
|
|
|
if (contains(command, L"exit", L"reboot")) {
|
2014-03-29 06:22:03 +00:00
|
|
|
impending_exit = true;
|
2012-02-15 19:33:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-02-03 19:38:22 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If we got a path, we'll perform file detection for autosuggestion hinting.
|
2014-03-29 06:22:03 +00:00
|
|
|
history_identifier_t identifier = 0;
|
2016-04-18 05:47:37 +00:00
|
|
|
if (!potential_paths.empty() && !impending_exit) {
|
|
|
|
// Grab the next identifier.
|
2014-03-29 06:22:03 +00:00
|
|
|
static history_identifier_t sLastIdentifier = 0;
|
|
|
|
identifier = ++sLastIdentifier;
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Create a new detection context.
|
2014-03-29 06:22:03 +00:00
|
|
|
file_detection_context_t *context = new file_detection_context_t(this, identifier);
|
2012-02-15 19:33:41 +00:00
|
|
|
context->potential_paths.swap(potential_paths);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Prevent saving until we're done, so we have time to get the paths.
|
2014-03-29 06:22:03 +00:00
|
|
|
this->disable_automatic_saving();
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Kick it off. Even though we haven't added the item yet, it updates the item on the main
|
|
|
|
// thread, so we can't race.
|
2012-02-15 19:33:41 +00:00
|
|
|
iothread_perform(threaded_perform_file_detection, perform_file_detection_done, context);
|
|
|
|
}
|
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// Actually add the item to the history.
|
2015-04-20 09:04:17 +00:00
|
|
|
this->add(str, identifier, true /* pending */);
|
2014-03-31 17:01:39 +00:00
|
|
|
|
2016-04-18 05:47:37 +00:00
|
|
|
// If we think we're about to exit, save immediately, regardless of any disabling. This may
|
|
|
|
// cause us to lose file hinting for some commands, but it beats losing history items.
|
|
|
|
if (impending_exit) {
|
2014-03-29 06:22:03 +00:00
|
|
|
this->save();
|
|
|
|
}
|
|
|
|
}
|
2015-04-20 09:04:17 +00:00
|
|
|
|
2016-04-20 01:17:39 +00:00
|
|
|
/// Very simple, just mark that we have no more pending items.
|
2016-04-18 05:47:37 +00:00
|
|
|
void history_t::resolve_pending() {
|
2015-04-20 09:04:17 +00:00
|
|
|
scoped_lock locker(lock);
|
|
|
|
this->has_pending_item = false;
|
|
|
|
}
|