thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't shallow errors.

Browse Source
This commit is contained in:
Amos Bird 2020-12-01 20:48:35 +08:00
parent 91e8b35977
commit a3d52dd6a0
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
base/common/ReplxxLineReader.cpp
View File

@ -135,7 +135,7 @@ void ReplxxLineReader::addToHistory(const String & line)
rx.print("Unlock of history file failed: %s\n", errnoToString(errno).c_str());
}
int execute(const std::string & command)
int ReplxxLineReader::execute(const std::string & command)
{
std::vector<char> argv0("sh", &("sh"[3]));
std::vector<char> argv1("-c", &("-c"[3]));
@ -146,12 +146,18 @@ int execute(const std::string & command)
static void * real_vfork = dlsym(RTLD_DEFAULT, "vfork");
if (!real_vfork)
{
rx.print("Cannot find symbol vfork in myself: %s", errnoToString(errno).c_str());
return -1;
}
pid_t pid = reinterpret_cast<pid_t (*)()>(real_vfork)();
if (-1 == pid)
{
rx.print("Cannot vfork: %s\n", errnoToString(errno).c_str());
return -1;
}
if (0 == pid)
{
@ -166,7 +172,10 @@ int execute(const std::string & command)
int status = 0;
if (-1 == waitpid(pid, &status, 0))
{
rx.print("Cannot waitpid: %s\n", errnoToString(errno).c_str());
return -1;
}
return status;
}
@ -175,7 +184,10 @@ void ReplxxLineReader::openEditor()
char filename[] = "clickhouse_replxx.XXXXXX";
int fd = ::mkstemp(filename);
if (-1 == fd)
{
rx.print("Cannot create temporary file to edit query: %s\n", errnoToString(errno).c_str());
return;
}
String editor = std::getenv("EDITOR");
if (editor.empty())
editor = "vim";
@ -183,7 +195,10 @@ void ReplxxLineReader::openEditor()
replxx::Replxx::State state(rx.get_state());
write(fd, state.text(), strlen(state.text()));
if (0 != ::close(fd))
{
rx.print("Cannot close temporary query file: %s\n", errnoToString(errno).c_str());
return;
}
int rc = execute(editor + " " + filename);
if (0 == rc)
{

1
base/common/ReplxxLineReader.h
View File

@ -22,6 +22,7 @@ public:
private:
InputStatus readOneLine(const String & prompt) override;
void addToHistory(const String & line) override;
int execute(const std::string & command);
void openEditor();
replxx::Replxx rx;