Merge branch '4633_cleanup'

* 4633_cleanup: (47 commits)
  Update po/*.po files.
  (tar_short_read): fix undefined behaviour.
  Fix usage of g_file_test().
  (do_link): fix typo in error message string
  diffviewer: refactoring.
  (edit_draw_this_line): use different variable for char attributes.
  tar (keyword_item_run): fix restoring extended attributes from global PAX headers.
  filemanager/chown: refactoring.
  filemanager/chattr: refactoring.
  filemanager/achown: refactoring.
  filemanager/chmod: refactoring.
  (init_learn): use button_get_width() to calculate button x-position.
  Rename variables and struct members that store return value of button_get_width().
  (button_get_width): rename from button_get_len().
  (query_dialog): refactoring.
  src/main.c: remove unused includes.
  (codepage_desc): move struct definition to c-file.
  (get_codepage_name): new function.
  Use get_codepage_id() instead of direct access to codepage_desc::id.
  lib/charsets.[ch]: cleanup.
  ...

Author: aborodin

lib/charsets.c

@@ -29,6 +29,7 @@
 
 #include <config.h>
 
+#include <limits.h>  // MB_LEN_MAX
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,15 +53,22 @@ const char *cp_source = NULL;
 
 /*** file scope macro definitions ****************************************************************/
 
-#define UNKNCHAR       '\001'
-#define NO_TRANSLATION "No translation"
+#define UNKNCHAR '\001'
 
 /*** file scope type declarations ****************************************************************/
 
+typedef struct
+{
+    char *id;
+    char *name;
+} codepage_desc;
+
 /*** forward declarations (file scope functions) *************************************************/
 
 /*** file scope variables ************************************************************************/
 
+static const char NO_TRANSLATION[] = N_ ("No translation");
+
 /* --------------------------------------------------------------------------------------------- */
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
@@ -242,6 +250,15 @@ get_codepage_id (const int n)
 
 /* --------------------------------------------------------------------------------------------- */
 
+const char *
+get_codepage_name (const int n)
+{
+    return (n < 0) ? _ (NO_TRANSLATION)
+                   : ((codepage_desc *) g_ptr_array_index (codepages, n))->name;
+}
+
+/* --------------------------------------------------------------------------------------------- */
+
 int
 get_codepage_index (const char *id)
 {
@@ -250,7 +267,7 @@ get_codepage_index (const char *id)
     if (strcmp (id, NO_TRANSLATION) == 0)
         return -1;
     for (guint i = 0; i < codepages->len; i++)
-        if (strcmp (id, ((codepage_desc *) g_ptr_array_index (codepages, i))->id) == 0)
+        if (strcmp (id, get_codepage_id (i)) == 0)
             return (int) i;
     return -1;
 }
@@ -303,10 +320,11 @@ init_translation_table (int cpsource, int cpdisplay)
         conv_displ[i] = i;
         conv_input[i] = i;
     }
-    cp_source = ((codepage_desc *) g_ptr_array_index (codepages, cpsource))->id;
-    cp_display = ((codepage_desc *) g_ptr_array_index (codepages, cpdisplay))->id;
 
-    // display <- inpit table
+    cp_source = get_codepage_id (cpsource);
+    cp_display = get_codepage_id (cpdisplay);
+
+    // display <- input table
 
     cd = g_iconv_open (cp_display, cp_source);
     if (cd == INVALID_CONV)
@@ -317,7 +335,7 @@ init_translation_table (int cpsource, int cpdisplay)
 
     g_iconv_close (cd);
 
-    // inpit <- display table
+    // input <- display table
 
     cd = g_iconv_open (cp_source, cp_display);
     if (cd == INVALID_CONV)
@@ -337,16 +355,6 @@ init_translation_table (int cpsource, int cpdisplay)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
-convert_to_display (char *str)
-{
-    if (str != NULL)
-        for (; *str != '\0'; str++)
-            *str = conv_displ[(unsigned char) *str];
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
 GString *
 str_nconvert_to_display (const char *str, int len)
 {
@@ -371,16 +379,6 @@ str_nconvert_to_display (const char *str, int len)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
-convert_from_input (char *str)
-{
-    if (str != NULL)
-        for (; *str != '\0'; str++)
-            *str = conv_input[(unsigned char) *str];
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
 GString *
 str_nconvert_to_input (const char *str, int len)
 {
@@ -408,7 +406,7 @@ str_nconvert_to_input (const char *str, int len)
 unsigned char
 convert_from_utf_to_current (const char *str)
 {
-    unsigned char buf_ch[UTF8_CHAR_LEN + 1];
+    unsigned char buf_ch[MB_LEN_MAX + 1];
     unsigned char ch = '.';
     GIConv conv;
     const char *cp_to;
@@ -444,8 +442,8 @@ convert_from_utf_to_current (const char *str)
 unsigned char
 convert_from_utf_to_current_c (int input_char, GIConv conv)
 {
-    unsigned char str[UTF8_CHAR_LEN + 1];
-    unsigned char buf_ch[UTF8_CHAR_LEN + 1];
+    unsigned char str[MB_LEN_MAX + 1];
+    unsigned char buf_ch[MB_LEN_MAX + 1];
     unsigned char ch = '.';
     int res;
 
@@ -477,7 +475,7 @@ int
 convert_from_8bit_to_utf_c (char input_char, GIConv conv)
 {
     unsigned char str[2];
-    unsigned char buf_ch[UTF8_CHAR_LEN + 1];
+    unsigned char buf_ch[MB_LEN_MAX + 1];
     int ch;
 
     str[0] = (unsigned char) input_char;

lib/charsets.h

@@ -11,12 +11,6 @@
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-typedef struct
-{
-    char *id;
-    char *name;
-} codepage_desc;
-
 /*** global variables defined in .c file *********************************************************/
 
 extern unsigned char conv_displ[256];
@@ -29,14 +23,12 @@ extern GPtrArray *codepages;
 /*** declarations of public functions ************************************************************/
 
 const char *get_codepage_id (const int n);
+const char *get_codepage_name (const int n);
 int get_codepage_index (const char *id);
 void load_codepages_list (void);
 void free_codepages_list (void);
 gboolean is_supported_encoding (const char *encoding);
 char *init_translation_table (int cpsource, int cpdisplay);
-void convert_to_display (char *str);
-void convert_from_input (char *str);
-void convert_string (unsigned char *str);
 
 /*
  * Converter from utf to selected codepage

lib/global.h

@@ -73,18 +73,16 @@
 #endif
 
 /* Just for keeping Your's brains from invention a proper size of the buffer :-) */
-#define BUF_10K       10240L
-#define BUF_8K        8192L
-#define BUF_4K        4096L
-#define BUF_2K        2048L
-#define BUF_1K        1024L
-
-#define BUF_LARGE     BUF_1K
-#define BUF_MEDIUM    512
-#define BUF_SMALL     128
-#define BUF_TINY      64
-
-#define UTF8_CHAR_LEN 6
+#define BUF_10K    10240L
+#define BUF_8K     8192L
+#define BUF_4K     4096L
+#define BUF_2K     2048L
+#define BUF_1K     1024L
+
+#define BUF_LARGE  BUF_1K
+#define BUF_MEDIUM 512
+#define BUF_SMALL  128
+#define BUF_TINY   64
 
 /* Used to distinguish between a normal MC termination and */
 /* one caused by typing 'exit' or 'logout' in the subshell */

lib/mcconfig/paths.c

@@ -107,8 +107,9 @@ mc_config_mkdir (const char *directory_name, GError **mcerror)
 {
     mc_return_if_error (mcerror);
 
-    if ((!g_file_test (directory_name, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))
-        && (g_mkdir_with_parents (directory_name, 0700) != 0))
+    if (!(g_file_test (directory_name, G_FILE_TEST_EXISTS)
+          && g_file_test (directory_name, G_FILE_TEST_IS_DIR))
+        && g_mkdir_with_parents (directory_name, 0700) != 0)
         mc_propagate_error (mcerror, 0, _ ("Cannot create %s directory"), directory_name);
 }
 

lib/search/search.c

@@ -203,9 +203,8 @@ mc_search_prepare (mc_search_t *lc_mc_search)
 
         for (loop1 = 0; loop1 < codepages->len; loop1++)
         {
-            const char *id;
+            const char *id = get_codepage_id (loop1);
 
-            id = ((codepage_desc *) g_ptr_array_index (codepages, loop1))->id;
             if (g_ascii_strcasecmp (id, lc_mc_search->original.charset) == 0)
                 g_ptr_array_add (ret,
                                  mc_search__cond_struct_new (lc_mc_search,

lib/strutil/replace.c

@@ -92,7 +92,7 @@ str_replace_all (const char *haystack, const char *needle, const char *replaceme
     if (*haystack != '\0')
     {
         if (return_str == NULL)
-            return strdup (haystack);
+            return g_strdup (haystack);
 
         g_string_append (return_str, haystack);
     }

lib/strutil/strescape.c

@@ -62,7 +62,7 @@ str_escape (const char *src, const ssize_t src_len, const char *escaped_chars,
         return NULL;
 
     if (*src == '\0')
-        return strdup ("");
+        return g_strdup ("");
 
     ret = g_string_new ("");
 
@@ -112,7 +112,7 @@ str_unescape (const char *src, const ssize_t src_len, const char *unescaped_char
         return NULL;
 
     if (*src == '\0')
-        return strdup ("");
+        return g_strdup ("");
 
     ret = g_string_sized_new (16);
 

lib/terminal.c

@@ -73,15 +73,19 @@
  * final-byte = [\x40-\x7e]         # one of "@A–Z[\]^_`a–z{|}~"
  */
 gboolean
-parse_csi (struct csi_command_t *out, const char **sptr, const char *end)
+parse_csi (csi_command_t *out, const char **sptr, const char *end)
 {
     gboolean ok = FALSE;
+    char c;
+    char private_mode = '\0';
+    // parameter bytes
+    size_t param_count = 0;
 
     const char *s = *sptr;
     if (s == end)
         goto invalid_sequence;
 
-    char c = *s;
+    c = *s;
 
 #define NEXT_CHAR                                                                                  \
     do                                                                                             \
@@ -90,34 +94,29 @@ parse_csi (struct csi_command_t *out, const char **sptr, const char *end)
             goto invalid_sequence;                                                                 \
         c = *s;                                                                                    \
     }                                                                                              \
-    while (0)
-
-    char private_mode = '\0';
+    while (FALSE)
 
     if (c >= '<' && c <= '?')  // "<=>?"
     {
         private_mode = c;
         NEXT_CHAR;
     }
 
-    // parameter bytes
-    size_t param_count = 0;
-
     if (private_mode != '\0')
     {
         while (c >= 0x30 && c <= 0x3F)
             NEXT_CHAR;
     }
     else
     {
+        uint32_t tmp = 0;
+        size_t sub_index = 0;
+
         if (out != NULL)
             // N.B. empty parameter strings are allowed. For our current use,
             // treating them as zeroes happens to work.
             memset (out->params, 0, sizeof (out->params));
 
-        uint32_t tmp = 0;
-        size_t sub_index = 0;
-
         while (c >= 0x30 && c <= 0x3F)
         {
             if (c >= '0' && c <= '9')
@@ -207,9 +206,7 @@ strip_ctrl_codes (char *s)
                  * OSC P s ; P t ST
                  * OSC P s ; P t BEL
                  */
-                const char *new_r;
-
-                for (new_r = r; *new_r != '\0'; new_r++)
+                for (const char *new_r = r; *new_r != '\0'; new_r++)
                 {
                     switch (*new_r)
                     {
@@ -241,9 +238,8 @@ strip_ctrl_codes (char *s)
         }
         else
         {
-            const char *n;
+            const char *n = str_cget_next_char (r);
 
-            n = str_cget_next_char (r);
             if (str_isprint (r))
             {
                 memmove (w, r, n - r);

lib/terminal.h

@@ -16,18 +16,18 @@
 
 /*** structures declarations (and typedefs of structures)*****************************************/
 
-struct csi_command_t
+typedef struct
 {
     char private_mode;
     uint32_t params[16][4];
     size_t param_count;
-};
+} csi_command_t;
 
 /*** global variables defined in .c file *********************************************************/
 
 /*** declarations of public functions ************************************************************/
 
-gboolean parse_csi (struct csi_command_t *out, const char **sptr, const char *end);
+gboolean parse_csi (csi_command_t *out, const char **sptr, const char *end);
 
 char *strip_ctrl_codes (char *s);
 

lib/tty/key.c

@@ -1279,7 +1279,7 @@ lookup_keyname (const char *name, int *idx)
 /* --------------------------------------------------------------------------------------------- */
 
 static gboolean
-lookup_keycode (const long code, int *idx)
+lookup_keycode (const int code, int *idx)
 {
     if (code != 0)
     {