Merge branch '4717_open_syntax_file_segfault'

* 4717_open_syntax_file_segfault:
  (edit_load_syntax_file): create user syntax directory if it doesn't exist.
  Fix i18n of copy/move/delete progress window title.
  (check_file_access): return FALSE immediately in case of error message
  Ticket #4717: mcedit: fix segfault at open Syntax file.

Author: aborodin

src/editor/edit.c

@@ -308,7 +308,7 @@ check_file_access (WEdit *edit, const vfs_path_t *filename_vpath, struct stat *s
         if (file < 0)
         {
             file_error_message (_ ("Cannot open\n%s"), vfs_path_as_str (filename_vpath));
-            goto cleanup;
+            return FALSE;
         }
 
         // New file, delete it if it's not modified or saved
@@ -319,7 +319,7 @@ check_file_access (WEdit *edit, const vfs_path_t *filename_vpath, struct stat *s
     if (mc_fstat (file, st) < 0)
     {
         file_error_message (_ ("Cannot stat\n%s"), vfs_path_as_str (filename_vpath));
-        goto cleanup;
+        return FALSE;
     }
 
     // We want to open regular files only

src/editor/editcmd.c

@@ -50,7 +50,7 @@
 #include "lib/strutil.h"  // utf string functions
 #include "lib/fileloc.h"
 #include "lib/lock.h"
-#include "lib/util.h"  // tilde_expand()
+#include "lib/util.h"  // tilde_expand(), x_basename()
 #include "lib/vfs/vfs.h"
 #include "lib/widget.h"
 #include "lib/event.h"  // mc_event_raise()
@@ -763,6 +763,49 @@ editcmd_dialog_raw_key_query_cb (Widget *w, Widget *sender, widget_msg_t msg, in
     }
 }
 
+/* --------------------------------------------------------------------------------------------- */
+
+static gboolean
+editcmd_check_and_create_user_syntax_directory (const vfs_path_t *user_syntax_file_vpath)
+{
+    gboolean ret;
+    struct stat st;
+
+    ret = mc_stat (user_syntax_file_vpath, &st) == 0;
+    if (!ret)
+    {
+        // file doesn't exist -- check why
+        const char *user_syntax_file_path = vfs_path_as_str (user_syntax_file_vpath);
+
+        // check directory
+        const char *user_syntax_file_basename = x_basename (user_syntax_file_path);
+        char *user_syntax_dir;
+        vfs_path_t *user_syntax_vpath;
+
+        user_syntax_dir =
+            g_strndup (user_syntax_file_path, user_syntax_file_basename - user_syntax_file_path);
+        user_syntax_vpath = vfs_path_from_str (user_syntax_dir);
+
+        ret = mc_stat (user_syntax_vpath, &st) == 0;
+        if (!ret)
+            ret = mc_mkdir (user_syntax_vpath, 0700) == 0;
+        else if (!S_ISDIR (st.st_mode))
+        {
+            ret = FALSE;
+            // set for file_error_message()
+            errno = EEXIST;
+        }
+
+        if (!ret)
+            file_error_message (_ ("Cannot create directory\n%s"), user_syntax_dir);
+
+        vfs_path_free (user_syntax_vpath, TRUE);
+        g_free (user_syntax_dir);
+    }
+
+    return ret;
+}
+
 /* --------------------------------------------------------------------------------------------- */
 /*** public functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
@@ -1146,9 +1189,14 @@ edit_load_syntax_file (WDialog *h)
         vfs_path_t *user_syntax_file_vpath;
 
         user_syntax_file_vpath = mc_config_get_full_vpath (EDIT_SYNTAX_FILE);
-        check_for_default (extdir_vpath, user_syntax_file_vpath);
-        edit_arg_init (&arg, user_syntax_file_vpath, 0);
-        ret = edit_load_file_from_filename (h, &arg);
+
+        if (editcmd_check_and_create_user_syntax_directory (user_syntax_file_vpath))
+        {
+            check_for_default (extdir_vpath, user_syntax_file_vpath);
+            edit_arg_init (&arg, user_syntax_file_vpath, 0);
+            ret = edit_load_file_from_filename (h, &arg);
+        }
+
         vfs_path_free (user_syntax_file_vpath, TRUE);
     }
     else if (dir == 1)

src/filemanager/file.c

@@ -3506,14 +3506,6 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl
 
     gboolean do_bg = FALSE;  // do background operation?
 
-    static gboolean i18n_flag = FALSE;
-    if (!i18n_flag)
-    {
-        for (i = G_N_ELEMENTS (op_names); i-- != 0;)
-            op_names[i] = Q_ (op_names[i]);
-        i18n_flag = TRUE;
-    }
-
     linklist = free_linklist (linklist);
     dest_dirs = free_linklist (dest_dirs);
 
@@ -3731,7 +3723,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl
 FileProgressStatus
 file_error (file_op_context_t *ctx, gboolean allow_retry, const char *format, const char *file)
 {
-    return files_error (ctx, allow_retry, format, file, NULL);
+    return files_error (ctx, allow_retry, format, file, "");
 }
 
 /* --------------------------------------------------------------------------------------------- */

src/filemanager/filegui.c

@@ -770,8 +770,17 @@ progress_button_callback (MC_UNUSED WButton *button, MC_UNUSED int action)
 file_op_context_t *
 file_op_context_new (const FileOperation op)
 {
+    static gboolean i18n_flag = FALSE;
+
     file_op_context_t *ctx;
 
+    if (!i18n_flag)
+    {
+        for (int i = G_N_ELEMENTS (op_names); i-- != 0;)
+            op_names[i] = Q_ (op_names[i]);
+        i18n_flag = TRUE;
+    }
+
     ctx = g_new0 (file_op_context_t, 1);
     ctx->operation = op;
     ctx->preserve = TRUE;