Merge branch 'mc-4.6'

* mc-4.6:
  backport: lt.po: update by stikonas (#274)
  backport: nl.po: update by mpol (#271)
  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
	edit/edit.c
	edit/editcmd.c
	edit/editwidget.c
	edit/syntax.c
	src/command.c
	src/complete.c
	src/ext.c
	src/find.c
	src/screen.c
	src/util.c
	src/widget.c
	vfs/extfs.c
	vfs/fish.c

ChangeLog

@@ -1,3 +1,12 @@
+2009-02-17 Mikhail Pobolovets  <[email protected]>
+
+	* lt.po: update by stikonas (#274)
+
+2009-02-05 Mikhail Pobolovets  <[email protected]>
+
+	* nl.po: update by mpol (#271)
+
+2009-02-04 Enrico Weigelt, metux ITS <[email protected]>
 
 2009-02-17 Mikhail Pobolovets  <[email protected]>
 
@@ -37,6 +46,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)
 	* replaced g_snprintf() by snprintf()
 	* replaced GString stuff by static buffers
@@ -67,6 +79,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]>

vfs/fish.c

@@ -926,6 +926,7 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
     if (!(crpath2 = vfs_s_get_path_mangle (me, mpath2 = g_strdup(path2), &super2, 0))) { \
 	g_free (mpath1); \
 	g_free (mpath2); \
+	return -1; \
     } \
     rpath1 = shell_escape (crpath1); \
     g_free (mpath1); \