add .sql suffix

base/common/ReplxxLineReader.cpp

@@ -147,7 +147,7 @@ int ReplxxLineReader::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());
+        rx.print("Cannot find symbol vfork in myself: %s\n", errnoToString(errno).c_str());
         return -1;
     }
 
@@ -181,8 +181,8 @@ int ReplxxLineReader::execute(const std::string & command)
 
 void ReplxxLineReader::openEditor()
 {
-    char filename[] = "clickhouse_replxx.XXXXXX";
-    int fd = ::mkstemp(filename);
+    char filename[] = "clickhouse_replxx_XXXXXX.sql";
+    int fd = ::mkstemps(filename, 4);
     if (-1 == fd)
     {
         rx.print("Cannot create temporary file to edit query: %s\n", errnoToString(errno).c_str());
@@ -217,13 +217,21 @@ void ReplxxLineReader::openEditor()
 
     if (0 == execute(editor + " " + filename))
     {
-        std::ifstream t(filename);
-        std::string str;
-        t.seekg(0, std::ios::end);
-        str.reserve(t.tellg());
-        t.seekg(0, std::ios::beg);
-        str.assign((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
-        rx.set_state(replxx::Replxx::State(str.c_str(), str.size()));
+        try
+        {
+            std::ifstream t(filename);
+            std::string str;
+            t.seekg(0, std::ios::end);
+            str.reserve(t.tellg());
+            t.seekg(0, std::ios::beg);
+            str.assign((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
+            rx.set_state(replxx::Replxx::State(str.c_str(), str.size()));
+        }
+        catch (...)
+        {
+            rx.print("Cannot read from temporary query file %s: %s\n", filename, errnoToString(errno).c_str());
+            return;
+        }
     }
 
     if (bracketed_paste_enabled)

base/glibc-compatibility/musl/mkstemps.c

@@ -0,0 +1,44 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+/* This assumes that a check for the
+   template size has already been made */
+static char * __randname(char * template)
+{
+    int i;
+    struct timespec ts;
+    unsigned long r;
+
+    clock_gettime(CLOCK_REALTIME, &ts);
+    r = (ts.tv_nsec * 65537) ^ ((((intptr_t)(&ts)) / 16) + ((intptr_t)template));
+    for (i = 0; i < 6; i++, r >>= 5)
+        template[i] = 'A' + (r & 15) + (r & 16) * 2;
+
+    return template;
+}
+
+int mkstemps(char * template, int len)
+{
+    size_t l = strlen(template);
+    if (l < 6 || len > l - 6 || memcmp(template + l - len - 6, "XXXXXX", 6))
+    {
+        errno = EINVAL;
+        return -1;
+    }
+
+    int fd, retries = 100;
+    do
+    {
+        __randname(template + l - len - 6);
+        if ((fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
+            return fd;
+    } while (--retries && errno == EEXIST);
+
+    memcpy(template + l - len - 6, "XXXXXX", 6);
+    return -1;
+}