Release 3.0.12 version

adonais · Jul 22, 2023 · 3c9d8f4 · 3c9d8f4
1 parent 7456984
commit 3c9d8f4
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 57 deletions.
diff --git a/conf/conf.d/eu_conf.lua b/conf/conf.d/eu_conf.lua
@@ -90,7 +90,7 @@ function eu_conf.loadconf()
         "-- auto complete default setting\n" ..
         "complete = {\n" ..
         "    enable = true,\n" ..
-        "    characters = 0,\n" ..
+        "    characters = 1,\n" ..
         "    snippet = 44014\n" ..
         "}\n" ..
         "-- printer default setting\n" ..
@@ -186,6 +186,10 @@ function eu_conf.loadconf()
         m_reserved_0,
         m_reserved_1
     })
+    -- Compatible with previous versions
+    if (m_config ~= nil and m_config.eu_complete.characters == 0) then
+        m_config.eu_complete.characters = 1
+    end
     eu_conf.fill_actions(m_config)
     if (not eu_core.euapi.eu_config_ptr(m_config)) then
         do return nil end

diff --git a/locales/src/en-us.rc b/locales/src/en-us.rc
@@ -330,7 +330,7 @@ BEGIN
             MENUITEM "Traditional To Simplified",                      IDM_EDIT_BIG5_GB
         END
         MENUITEM MF_SEPARATOR
-        POPUP "Full-width/half-width conversion",                      IDM_FORMAT_PLACEHOLDE_PUNCTUATION
+        POPUP "Full-width/half-width Conversion",                      IDM_FORMAT_PLACEHOLDE_PUNCTUATION
         BEGIN
             MENUITEM "Full-width Symbol To Half-width",                IDM_FORMAT_FULL_HALF
             MENUITEM "Half-width Punctuation To Full-width",           IDM_FORMAT_HALF_FULL
@@ -352,9 +352,9 @@ BEGIN
         MENUITEM MF_SEPARATOR
         MENUITEM "Jump To Symbol Definition",                          IDM_SOURCECODE_GOTODEF
         MENUITEM MF_SEPARATOR
-        MENUITEM "Enable bracket completion",                          IDM_EDIT_AUTO_CLOSECHAR
-        MENUITEM "Enable keyword completion",                          IDM_SOURCEE_ENABLE_ACSHOW
-        MENUITEM "Input [N] Chars Complete Box Popup...",              IDM_SOURCEE_ACSHOW_CHARS
+        MENUITEM "Enable Bracket Completion",                          IDM_EDIT_AUTO_CLOSECHAR
+        MENUITEM "Enable Keyword Completion",                          IDM_SOURCEE_ENABLE_ACSHOW
+        MENUITEM "Input [N] Chars Complete Box Popup",                 IDM_SOURCEE_ACSHOW_CHARS
         MENUITEM "Enable Prototype Prompt",                            IDM_SOURCE_ENABLE_CTSHOW
         MENUITEM MF_SEPARATOR
         MENUITEM "Insert Database Automatic Header",                   IDM_DATABASE_INSERT_CONFIG

diff --git a/locales/src/zh-cn.rc b/locales/src/zh-cn.rc
@@ -354,7 +354,7 @@ BEGIN
         MENUITEM MF_SEPARATOR
         MENUITEM "启用括号补全",                                IDM_EDIT_AUTO_CLOSECHAR
         MENUITEM "启用关键字补全",                              IDM_SOURCEE_ENABLE_ACSHOW
-        MENUITEM "输入[N]个字符后弹出自动完成框...",            IDM_SOURCEE_ACSHOW_CHARS
+        MENUITEM "输入[N]个字符后弹出补全框",                   IDM_SOURCEE_ACSHOW_CHARS
         MENUITEM "启用原型提示框",                              IDM_SOURCE_ENABLE_CTSHOW
         MENUITEM MF_SEPARATOR
         MENUITEM "插入数据库自动连接配置头",                    IDM_DATABASE_INSERT_CONFIG

diff --git a/share/changelog b/share/changelog
@@ -1,3 +1,8 @@
+3.0.12      2023-07-22   adonais
+            * 修复: 超链接高亮时特殊字符的检测问题
+            * 修复: 输入N个字符弹出补全框, N不准确的问题
+            * 修复: 更新程序动态链接crt库时复制文件出错的问题
+
 3.0.11      2023-07-17   adonais
             * 新增: skylark支持安装在只读目录
             * 新增: 支持自定义配置文件目录路径

diff --git a/src/3rdparty/libcurl/include/curl/curl.h b/src/3rdparty/libcurl/include/curl/curl.h
@@ -93,7 +93,7 @@
     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
    (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
-    defined(__sun__) || defined(__serenity__)
+    defined(__sun__) || defined(__serenity__) || defined(__vxworks__)
 #include <sys/select.h>
 #endif
 
@@ -174,8 +174,9 @@ typedef enum {
 } curl_sslbackend;
 
 /* aliases for library clones and renames */
-#define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL
+#define CURLSSLBACKEND_AWSLC CURLSSLBACKEND_OPENSSL
 #define CURLSSLBACKEND_BORINGSSL CURLSSLBACKEND_OPENSSL
+#define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL
 
 /* deprecated names: */
 #define CURLSSLBACKEND_CYASSL CURLSSLBACKEND_WOLFSSL
@@ -331,7 +332,8 @@ struct curl_fileinfo {
 
   unsigned int flags;
 
-  /* used internally */
+  /* These are libcurl private struct fields. Previously used by libcurl, so
+     they must never be interfered with. */
   char *b_data;
   size_t b_size;
   size_t b_used;
@@ -778,7 +780,8 @@ typedef enum {
                            CONNECT HTTP/1.1 */
   CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT
                                HTTP/1.0  */
-  CURLPROXY_HTTPS = 2, /* added in 7.52.0 */
+  CURLPROXY_HTTPS = 2,  /* HTTPS but stick to HTTP/1 added in 7.52.0 */
+  CURLPROXY_HTTPS2 = 3, /* HTTPS and attempt HTTP/2 added in 8.2.0 */
   CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
                            in 7.10 */
   CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
@@ -2110,7 +2113,7 @@ typedef enum {
   CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289),
 
   /* allow RCPT TO command to fail for some recipients */
-  CURLOPT(CURLOPT_MAIL_RCPT_ALLLOWFAILS, CURLOPTTYPE_LONG, 290),
+  CURLOPT(CURLOPT_MAIL_RCPT_ALLOWFAILS, CURLOPTTYPE_LONG, 290),
 
   /* the private SSL-certificate as a "blob" */
   CURLOPT(CURLOPT_SSLCERT_BLOB, CURLOPTTYPE_BLOB, 291),
@@ -2204,6 +2207,9 @@ typedef enum {
   /* Can leak things, gonna exit() soon */
   CURLOPT(CURLOPT_QUICK_EXIT, CURLOPTTYPE_LONG, 322),
 
+  /* set a specific client IP for HAProxy PROXY protocol header? */
+  CURLOPT(CURLOPT_HAPROXY_CLIENT_IP, CURLOPTTYPE_STRINGPOINT, 323),
+
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;
 
@@ -2232,6 +2238,9 @@ typedef enum {
 /* */
 #define CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_SERVER_RESPONSE_TIMEOUT
 
+/* Added in 8.2.0 */
+#define CURLOPT_MAIL_RCPT_ALLLOWFAILS CURLOPT_MAIL_RCPT_ALLOWFAILS
+
 #else
 /* This is set if CURL_NO_OLDIES is defined at compile-time */
 #undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
@@ -2915,7 +2924,9 @@ typedef enum {
   CURLINFO_REFERER          = CURLINFO_STRING + 60,
   CURLINFO_CAINFO           = CURLINFO_STRING + 61,
   CURLINFO_CAPATH           = CURLINFO_STRING + 62,
-  CURLINFO_LASTONE          = 62
+  CURLINFO_XFER_ID          = CURLINFO_OFF_T + 63,
+  CURLINFO_CONN_ID          = CURLINFO_OFF_T + 64,
+  CURLINFO_LASTONE          = 64
 } CURLINFO;
 
 /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as

diff --git a/src/3rdparty/libcurl/include/curl/curlver.h b/src/3rdparty/libcurl/include/curl/curlver.h
@@ -32,13 +32,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "8.0.1"
+#define LIBCURL_VERSION "8.2.0"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 8
-#define LIBCURL_VERSION_MINOR 0
-#define LIBCURL_VERSION_PATCH 1
+#define LIBCURL_VERSION_MINOR 2
+#define LIBCURL_VERSION_PATCH 0
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will
@@ -59,7 +59,7 @@
    CURL_VERSION_BITS() macro since curl's own configure script greps for it
    and needs it to contain the full number.
 */
-#define LIBCURL_VERSION_NUM 0x080001
+#define LIBCURL_VERSION_NUM 0x080200
 
 /*
  * This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
  *
  * "2007-11-23"
  */
-#define LIBCURL_TIMESTAMP "2023-03-20"
+#define LIBCURL_TIMESTAMP "2023-07-19"
 
 #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
 #define CURL_AT_LEAST_VERSION(x,y,z) \

diff --git a/src/3rdparty/libcurl/include/curl/easy.h b/src/3rdparty/libcurl/include/curl/easy.h
@@ -48,13 +48,13 @@ CURL_EXTERN void curl_easy_cleanup(CURL *curl);
  *
  * DESCRIPTION
  *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
+ * Request internal information from the curl session with this function.
+ * The third argument MUST be pointing to the specific type of the used option
+ * which is documented in each man page of the option. The data pointed to
+ * will be filled in accordingly and can be relied upon only if the function
+ * returns CURLE_OK. This function is intended to get used *AFTER* a performed
+ * transfer, all results from this function are undefined until the transfer
+ * is completed.
  */
 CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
 

diff --git a/src/3rdparty/libcurl/include/curl/system.h b/src/3rdparty/libcurl/include/curl/system.h
@@ -237,33 +237,28 @@
 #  define CURL_PULL_SYS_SOCKET_H     1
 
 #elif defined(__MVS__)
-#  if defined(__IBMC__) || defined(__IBMCPP__)
-#    if defined(_ILP32)
-#    elif defined(_LP64)
-#    endif
-#    if defined(_LONG_LONG)
-#      define CURL_TYPEOF_CURL_OFF_T     long long
-#      define CURL_FORMAT_CURL_OFF_T     "lld"
-#      define CURL_FORMAT_CURL_OFF_TU    "llu"
-#      define CURL_SUFFIX_CURL_OFF_T     LL
-#      define CURL_SUFFIX_CURL_OFF_TU    ULL
-#    elif defined(_LP64)
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    else
-#      define CURL_TYPEOF_CURL_OFF_T     long
-#      define CURL_FORMAT_CURL_OFF_T     "ld"
-#      define CURL_FORMAT_CURL_OFF_TU    "lu"
-#      define CURL_SUFFIX_CURL_OFF_T     L
-#      define CURL_SUFFIX_CURL_OFF_TU    UL
-#    endif
-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
-#    define CURL_PULL_SYS_TYPES_H      1
-#    define CURL_PULL_SYS_SOCKET_H     1
+#  if defined(_LONG_LONG)
+#    define CURL_TYPEOF_CURL_OFF_T     long long
+#    define CURL_FORMAT_CURL_OFF_T     "lld"
+#    define CURL_FORMAT_CURL_OFF_TU    "llu"
+#    define CURL_SUFFIX_CURL_OFF_T     LL
+#    define CURL_SUFFIX_CURL_OFF_TU    ULL
+#  elif defined(_LP64)
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
+#  else
+#    define CURL_TYPEOF_CURL_OFF_T     long
+#    define CURL_FORMAT_CURL_OFF_T     "ld"
+#    define CURL_FORMAT_CURL_OFF_TU    "lu"
+#    define CURL_SUFFIX_CURL_OFF_T     L
+#    define CURL_SUFFIX_CURL_OFF_TU    UL
 #  endif
+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
+#  define CURL_PULL_SYS_TYPES_H      1
+#  define CURL_PULL_SYS_SOCKET_H     1
 
 #elif defined(__370__)
 #  if defined(__IBMC__) || defined(__IBMCPP__)

diff --git a/src/3rdparty/libcurl/include/curl/typecheck-gcc.h b/src/3rdparty/libcurl/include/curl/typecheck-gcc.h
@@ -280,6 +280,7 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \
    (option) == CURLOPT_FTPPORT ||                                             \
    (option) == CURLOPT_HSTS ||                                                \
+   (option) == CURLOPT_HAPROXY_CLIENT_IP ||                                   \
    (option) == CURLOPT_INTERFACE ||                                           \
    (option) == CURLOPT_ISSUERCERT ||                                          \
    (option) == CURLOPT_KEYPASSWD ||                                           \

diff --git a/src/3rdparty/libcurl/include/curl/websockets.h b/src/3rdparty/libcurl/include/curl/websockets.h
@@ -54,7 +54,7 @@ struct curl_ws_frame {
  */
 CURL_EXTERN CURLcode curl_ws_recv(CURL *curl, void *buffer, size_t buflen,
                                   size_t *recv,
-                                  struct curl_ws_frame **metap);
+                                  const struct curl_ws_frame **metap);
 
 /* sendflags for curl_ws_send() */
 #define CURLWS_PONG       (1<<6)
@@ -75,7 +75,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer,
 /* bits for the CURLOPT_WS_OPTIONS bitmask: */
 #define CURLWS_RAW_MODE (1<<0)
 
-CURL_EXTERN struct curl_ws_frame *curl_ws_meta(CURL *curl);
+CURL_EXTERN const struct curl_ws_frame *curl_ws_meta(CURL *curl);
 
 #ifdef  __cplusplus
 }

diff --git a/src/eu_code.c b/src/eu_code.c
@@ -191,14 +191,18 @@ on_code_block_expand_all(eu_tabpage *pnode)
 void
 on_code_set_complete_chars(eu_tabpage *pnode)
 {
-    TCHAR input_chars[3] = {0};
+    TCHAR input_chars[4] = {0};
     _sntprintf(input_chars, _countof(input_chars)-1, _T("%d"), eu_get_config()->eu_complete.characters);
     LOAD_I18N_RESSTR(IDC_MSG_AC_STR, ac_str);
     if (eu_input(ac_str, input_chars, _countof(input_chars)))
     {
         if (input_chars[0])
         {
             eu_get_config()->eu_complete.characters = _tstoi(input_chars);
+            if (!eu_get_config()->eu_complete.characters)
+            {
+                ++eu_get_config()->eu_complete.characters;
+            }
             on_toolbar_update_button();
         }
     }

diff --git a/src/eu_complete.c b/src/eu_complete.c
@@ -1133,7 +1133,7 @@ on_complete_doc(eu_tabpage *pnode, ptr_notify lpnotify)
                 on_complete_reset_focus(pnode);
                 on_complete_snippet(pnode);
             }
-            else if (eu_get_config()->eu_complete.enable && !RB_EMPTY_ROOT(&(pnode->doc_ptr->acshow_tree)) && end_pos - start_pos > eu_get_config()->eu_complete.characters)
+            else if (eu_get_config()->eu_complete.enable && !RB_EMPTY_ROOT(&(pnode->doc_ptr->acshow_tree)) && end_pos - start_pos >= eu_get_config()->eu_complete.characters)
             {
                 on_complete_call_autocshow(pnode, word_buffer, current_pos, start_pos);
             }

diff --git a/src/eu_hyperlink.c b/src/eu_hyperlink.c
@@ -63,6 +63,10 @@ on_hyper_strim(eu_tabpage *pnode, const sptr_t start_pos, int *plen)
         {
             char *p = NULL;
             int len = eu_int_cast(strlen(buffer));
+            if ((p = strstr(buffer, BAD_CHARACTERS)) != NULL)
+            {
+                len = eu_int_cast(p - buffer);
+            }
             while (len > 0 && (p = strchr(END_CHARACTERS, buffer[len - 1])))
             {
                 buffer[len - 1] = 0;

diff --git a/src/eu_sql.c b/src/eu_sql.c
@@ -428,7 +428,7 @@ on_sql_do_session(const char *s, sql3_callback callback, void *data)
         {   // 根据配置重建触发器
             int tri = 0;
             DO_TRIGGER(buf, n);
-            const char *sql = "select szid,szrealpath,szbakpath,szSync from skylark_session;";
+            const char *sql = "select szId,szRealPath,szBakPath,szSync from skylark_session;";
             rc = sqlite3_exec((sqlite3 *)db, "select szTrigger from skylar_ver;", on_sql_skyver_callbak, (void *)&tri, NULL);
             if (tri != n)
             {

diff --git a/src/eu_util.c b/src/eu_util.c
@@ -2582,6 +2582,11 @@ util_strim_end(char *pstr, int len)
     if (pstr && len > 0)
     {
         char *p = NULL;
+        if ((p = strstr(pstr, BAD_CHARACTERS)) != NULL)
+        {
+            len = eu_int_cast(p - pstr);
+            pstr[len] = 0;
+        }
         while (len > 0 && (p = strchr(END_CHARACTERS, pstr[len - 1])))
         {
             pstr[len - 1] = 0;

diff --git a/src/eu_util.h b/src/eu_util.h
@@ -50,6 +50,7 @@
 
 #define util_prev(p) ((p) - (psrc) > 0 ? (p[-1]) : (0))
 
+#define BAD_CHARACTERS ("</")
 #define END_CHARACTERS (" \t\r\n\"']>.*")
 
 typedef struct _HANDLE_DATA

diff --git a/src/targetver.h b/src/targetver.h
@@ -30,7 +30,7 @@
 // 定义版本信息
 #define __EU_INFO_VERSION 3
 #define __EU_INFO_VERSION_MINOR 0
-#define __EU_INFO_VERSION_PATCHLEVEL 11
+#define __EU_INFO_VERSION_PATCHLEVEL 12
 #define __ORIGINAL_NAME TEXT("skylark.exe")
 
 #if !__EU_INFO_VERSION_PATCHLEVEL

diff --git a/src/version_display.txt b/src/version_display.txt
@@ -1 +1 @@
-3.0.11
+3.0.12