Merge commit 'origin/revert_mhl_to_glib_mc-4.6' into mc-4.6

* commit 'origin/revert_mhl_to_glib_mc-4.6':
  fixed mismerge: completion stuff
  mismerge fix: g_concat -> g_strconcat
  header guard fix
  Remove some of the SHELL_ESCAPE_STR Stuff...
  Revert "introduced new type SHELL_ESCAPED_STR for more type safety"
  Last bunch of reverts and removal of mhl/*
  fixed canonicalize_pathname() breakage: fixed str_move() function (memmove semantics) again
  Revert some functions (mhl_mem_free to g_free, etc)
  Revert "replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()"
  Revert "mhl: mhl_shell_unescape_buf(): fixed memory array OOB."
  Revert "build fix: added missing declaration of mhl_dir_plus_file (reported by andrew_b)"
  Revert "cleanup: mhl_str_dir_plus_file(): int -> size_t (suggested by Andrew Borodin)"
  Revert "fixed #240"
  Revert "Fixing a theoretical buffer overflow which was reported by Roland Illig"
  Revert "Call va_end after the iteration as we need to free the list again."
  Revert "Added enhancements from Sergei which he attached to #241."
  Revert "Resolve some issues in mhl Rollang Illig pointed us to:"

Conflicts:
	ChangeLog

ChangeLog

@@ -1,4 +1,3 @@
-
 2009-02-17 Mikhail Pobolovets  <[email protected]>
 
 	* lt.po: update by stikonas (#274)
@@ -33,6 +32,9 @@
 	* src/find.c, src/main.c, src/panelize.c, src/util.c, src/utilunix.c,
 	* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
 	  fixed shell escaping issues in commandline completion engine
+
+2009-01-31 Enrico Weigelt, metux ITS <[email protected]>
+
 	* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in mhl/string.h)
 
 2009-01-30 Enrico Weigelt, metux ITS <[email protected]>
@@ -54,6 +56,9 @@
 
 	* mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
 	  SHELL_ESCAPED_STR for more type safety
+
+2009-01-27 Enrico Weigelt, metux IT service <[email protected]>
+
 	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
 
 2009-01-27 Sergei Trofimovich  <[email protected]>

edit/edit.c

@@ -30,9 +30,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 
-#include <mhl/string.h>
+#include <stdlib.h>
 
 #include "../src/global.h"
 
@@ -2666,7 +2665,7 @@ user_menu (WEdit * edit)
     int nomark;
     struct stat status;
     long start_mark, end_mark;
-    char *block_file = mhl_str_dir_plus_file (home_dir, BLOCK_FILE);
+    char *block_file = concat_dir_and_file (home_dir, BLOCK_FILE);
     int rc = 0;
 
     nomark = eval_marks (edit, &start_mark, &end_mark);

edit/editcmd.c

@@ -28,16 +28,16 @@
 
 #include <assert.h>
 #include <ctype.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 
-#include <mhl/string.h>
+#include <stdlib.h>
 
 #include "../src/global.h"
 #include "../src/history.h"
@@ -235,7 +235,7 @@ edit_save_file (WEdit *edit, const char *filename)
 	return 0;
 
     if (*filename != PATH_SEP && edit->dir) {
-	savename = mhl_str_dir_plus_file (edit->dir, filename);
+	savename = concat_dir_and_file (edit->dir, filename);
 	filename = catstrs (savename, (char *) NULL);
 	g_free (savename);
     }
@@ -301,7 +301,7 @@ edit_save_file (WEdit *edit, const char *filename)
 	    savedir[slashpos - filename + 1] = '\0';
 	} else
 	    savedir = g_strdup (".");
-	saveprefix = mhl_str_dir_plus_file (savedir, "cooledit");
+	saveprefix = concat_dir_and_file (savedir, "cooledit");
 	g_free (savedir);
 	fd = mc_mkstemps (&savename, saveprefix, NULL);
 	g_free (saveprefix);

edit/editwidget.c

@@ -33,9 +33,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 
-#include <mhl/string.h>
+#include <stdlib.h>
 
 #include "../src/global.h"
 
@@ -175,7 +174,7 @@ edit_file (const char *_file, int line)
     WButtonBar *edit_bar;
 
     if (!made_directory) {
-	char *dir = mhl_str_dir_plus_file (home_dir, EDIT_DIR);
+	char *dir = concat_dir_and_file (home_dir, EDIT_DIR);
 	made_directory = (mkdir (dir, 0700) != -1 || errno == EEXIST);
 	g_free (dir);
     }

edit/syntax.c

@@ -30,9 +30,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <stdlib.h>
 
-#include <mhl/string.h>
+#include <stdlib.h>
 
 #include "../src/global.h"
 
@@ -1027,7 +1026,7 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file,
 
     f = fopen (syntax_file, "r");
     if (!f){
-	lib_file = mhl_str_dir_plus_file (mc_home, "syntax" PATH_SEP_STR "Syntax");
+	lib_file = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax");
 	f = fopen (lib_file, "r");
 	g_free (lib_file);
 	if (!f)
@@ -1189,7 +1188,7 @@ edit_load_syntax (WEdit *edit, char ***pnames, const char *type)
 	if (!*edit->filename && !type)
 	    return;
     }
-    f = mhl_str_dir_plus_file (home_dir, SYNTAX_FILE);
+    f = concat_dir_and_file (home_dir, SYNTAX_FILE);
     r = edit_read_syntax_file (edit, pnames, f, edit ? edit->filename : 0,
 			       get_first_editor_line (edit), type);
     if (r == -1) {

edit/usermap.c

@@ -26,12 +26,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <mhl/string.h>
-
 #include "../src/global.h"
 
 #include "edit.h"
@@ -597,7 +596,7 @@ edit_load_user_map(WEdit *edit)
     if (edit_key_emulation != EDIT_KEY_EMULATION_USER)
 	return TRUE;
 
-    file = mhl_str_dir_plus_file(home_dir, MC_USERMAP);
+    file = concat_dir_and_file(home_dir, MC_USERMAP);
 
     if (stat(file, &s) < 0) {
 	char *msg = g_strdup_printf(_("%s not found!"), file);