updated: [161dc23] lib/mc.sh.in: fixes for non-bash shells (fixing #196)

2009-02-04 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit 161dc235a618c33bda49dbd84295406d5273fb70
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 22:39:27 2009 +0100

lib/mc.sh.in: fixes for non-bash shells (fixing #196)

diff --git a/ChangeLog b/ChangeLog
index 9bdc617..74b6e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
 
+   * lib/mc.sh.in: fixes for non-bash shells (fixing #196)
+
+2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
+
* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
 
 2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
diff --git a/lib/mc.sh.in b/lib/mc.sh.in
index e3dc1fc..a829bf0 100644
--- a/lib/mc.sh.in
+++ b/lib/mc.sh.in
@@ -1 +1,3 @@
+# Don't define aliases in plain Bourne shell
+[ -n ${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION} ] || return 0
 alias mc='. @suppbindir@/mc-wrapper.sh'

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [220f4f4] manually merged mc-4.6

2009-02-04 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 220f4f4cafb2a75fe9d9472cc93825fe986edd97
Merge: 41f06e42b143cb30256ded26923d8c7cf5d5e312 
161dc235a618c33bda49dbd84295406d5273fb70
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Thu Feb 5 07:25:47 2009 +0100

manually merged mc-4.6

diff --combined ChangeLog
index 92a95df,74b6e0f..82eca35
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,21 +1,20 @@@
  2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#239, #240)
+   * lib/mc.sh.in: fixes for non-bash shells (fixing #196)
  
  2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
  
* lib/mc.lib: added patch on #219 by angel_il
 +  * edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
* vfs/extfs/u7z: patch from mandriva (#194)
  
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
@@@ -26,22 -25,13 +24,22 @@@
* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
  fixed shell escaping issues in commandline completion engine
* 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
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  odt2txt is now used
  
@@@ -62,11 -52,6 +60,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -78,10 -63,6 +76,10 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -91,12 -72,10 +89,12 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* vfs/extfs/rpm, vfs/extfs/trpm: removed obsolete rpm tags
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -104,32 -83,17 +102,32 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * configure.ac:
 +  * lib/mc.ext.in:
 +  * vfs/extfs/Makefile.am:
 +  * vfs/extfs/extfs.ini: 
 +  * vfs/extfs/uace.in:
 +  * vfs/extfs/uarc.in:
 +  * vfs/extfs/uc1541.in: added support for historic archive formats
 +(patch provided by jpelletier)
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
* src/main.c: Removed unused function

updated: [03ec5ef] backported #199 branch

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit 03ec5ef5747da4f4b2913313fe6527491db330f2
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 00:29:28 2009 +0100

backported #199 branch

diff --git a/ChangeLog b/ChangeLog
index ed3c7f6..074fc58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 
+   * acinclude.m4: removed MC_SLANG_PRIVATE macro
+   * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
+ replaced SLang_getkey2(), SLang_input_pending2()
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
diff --git a/acinclude.m4 b/acinclude.m4
index f4c0e3b..aa2c6fa 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -299,44 +299,6 @@ AC_DEFUN([MC_USE_TERMCAP], [
 
 
 dnl
-dnl Check if private functions are available for linking
-dnl
-AC_DEFUN([MC_SLANG_PRIVATE], [
-AC_CACHE_CHECK([if S-Lang exports private functions],
-  [mc_cv_slang_private], [
-   ac_save_LIBS=$LIBS
-   LIBS=$LIBS -lslang
-   AC_TRY_LINK([
-#ifdef HAVE_SLANG_SLANG_H
-#include slang/slang.h
-#else
-#include slang.h
-#endif
-#if SLANG_VERSION = 1
-extern unsigned int SLsys_getkey (void);
-#else
-extern unsigned int _SLsys_getkey (void);
-#endif
-   ], [
-#if SLANG_VERSION = 1
-_SLsys_getkey ();
-#else
-SLsys_getkey ();
-#endif
-   ],
-   [mc_cv_slang_private=yes],
-   [mc_cv_slang_private=no])
-   LIBS=$ac_save_LIBS
-])
-
-if test x$mc_cv_slang_private = xyes; then
-   AC_DEFINE(HAVE_SLANG_PRIVATE, 1,
- [Define if private S-Lang functions are available])
-fi
-])
-
-
-dnl
 dnl Check if the installed S-Lang library uses termcap
 dnl
 AC_DEFUN([MC_SLANG_TERMCAP], [
@@ -411,7 +373,6 @@ it's not fully supported yet])
 if test x$with_screen = xslang; then
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
  [Define to use S-Lang library installed on the system])
-   MC_SLANG_PRIVATE
screen_type=slang
screen_msg=S-Lang library (installed on the system)
 else
diff --git a/src/slint.c b/src/slint.c
index c30fac1..cf87322 100644
--- a/src/slint.c
+++ b/src/slint.c
@@ -77,66 +77,6 @@ static int no_slang_delay;
 /* Forward declarations */
 static void load_terminfo_keys (void);
 
-#ifndef HAVE_SLANG_PRIVATE
-/* Private interfaces have been stripped, so we cannot use them */
-#define SLang_getkey2() SLang_getkey()
-#define SLang_input_pending2(s) SLang_input_pending(s)
-#else
-/* Copied from ../slang/slgetkey.c, removed the DEC_8Bit_HACK. */
-extern unsigned char SLang_Input_Buffer [];
-#if SLANG_VERSION = 1
-extern unsigned int _SLsys_getkey (void);
-extern int _SLsys_input_pending (int);
-#else
-extern unsigned int SLsys_getkey (void);
-extern int SLsys_input_pending (int);
-#endif
-
-static unsigned int SLang_getkey2 (void)
-{
-   unsigned int imax;
-   unsigned int ch;
-   
-   if (SLang_Input_Buffer_Len)
- {
-   ch = (unsigned int) *SLang_Input_Buffer;
-   SLang_Input_Buffer_Len--;
-   imax = SLang_Input_Buffer_Len;
-   
-   memmove ((char *) SLang_Input_Buffer, 
-   (char *) (SLang_Input_Buffer + 1), imax);
-   return(ch);
- }
-#if SLANG_VERSION = 1
-   else return(_SLsys_getkey ());
-#else
-   else return(SLsys_getkey());
-#endif
-}
-
-static int SLang_input_pending2 (int tsecs)
-{
-   int n, i;
-   unsigned char c;
-
-   if (SLang_Input_Buffer_Len) return (int) SLang_Input_Buffer_Len;
-#if SLANG_VERSION = 1  
-   n = _SLsys_input_pending (tsecs);
-#else
-   n = SLsys_input_pending (tsecs);
-#endif
-   if (n = 0) return 0;
-   
-   i = SLang_getkey2 ();
-   if (i == SLANG_GETKEY_ERROR)
-   return 0;  /* don't put crippled error codes into the input buffer */
-   c = (unsigned char)i;
-   SLang_ungetkey_string (c, 1);
-   
-   return n;
-}
-#endif /* HAVE_SLANG_PRIVATE */
-
 /* Only done the first time */
 void
 slang_init (void)
@@ -465,10 +405,10 @@ getch (void)
 {
 int c;
 if (no_slang_delay)
-   if (SLang_input_pending2 (0) == 0)
+   if (SLang_input_pending (0) == 0)
return -1;
 
-c = SLang_getkey2 ();
+c = SLang_getkey ();
 if (c == SLANG_GETKEY_ERROR) {
fprintf (stderr,
 SLang_getkey returned SLANG_GETKEY_ERROR\n

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [be98250] Merge commit 'origin/mc-4.6'

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit be982505ccc12065ee2ffe041c88107cd6b3041c
Merge: 9b9cab58749217101ab16504a77efb301812cfbf 
03ec5ef5747da4f4b2913313fe6527491db330f2
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 00:30:57 2009 +0100

Merge commit 'origin/mc-4.6'

diff --combined ChangeLog
index 832520c,074fc58..1bf1589
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,12 @@@
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
+   * acinclude.m4: removed MC_SLANG_PRIVATE macro
+   * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
+ replaced SLang_getkey2(), SLang_input_pending2()
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
@@@ -12,23 -14,17 +15,23 @@@
* 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 weig...@metux.de
 -
* 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
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  odt2txt is now used
  
@@@ -42,6 -38,9 +45,6 @@@
  
* 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 weig...@metux.de
 -
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  sly...@inbox.ru
@@@ -49,11 -48,6 +52,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -65,11 -59,7 +68,11 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 -2009-01-25 Enrico Weigelt weig...@metux.de
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
 +2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -78,11 -68,9 +81,11 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -90,21 -78,17 +93,21 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
* src/main.c: Removed unused function do_mc_filename_rename
* src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-16

updated: [d4927f9] Merge commit 'origin/201_historic_compressors'

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit d4927f99efd0f073edbcebcc2e4aa8ab4426f5d9
Merge: be982505ccc12065ee2ffe041c88107cd6b3041c 
173ca89fca88f65e9b459a520685b02d1bfafed0
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 00:41:30 2009 +0100

Merge commit 'origin/201_historic_compressors'

diff --combined ChangeLog
index 1bf1589,9106f7b..1842bf9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,98 -1,15 +1,109 @@@
 +2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * acinclude.m4: removed MC_SLANG_PRIVATE macro
 +  * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
 +replaced SLang_getkey2(), SLang_input_pending2()
 +  * src/util.c: fixed name_trunc() on NULL or empty parameters
 +  * src/achown.c: fixed unitialized var in init_chown_advanced()
 +(patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
 +
 +2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
 +  * src/boxes.c, src/command.c, src/complete.c, src/complete.h, 
src/file.c,
 +  * 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
 +  * 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
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
 +(out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
 +
 +2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
 +odt2txt is now used
 +
 +2009-01-29 Patrick Winnertz win...@debian.org  Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * src/file.c: Added trailing dir separator for default path in 
copy/move dialogs.
 +This solves strange rename cases, when copying/moving is performed 
into
 +deleted directory.
 +
 +2009-01-27 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
 +SHELL_ESCAPED_STR for more type safety
 +  * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
 +
 +2009-01-27 Sergei Trofimovich  sly...@inbox.ru
 +
 +  * syntax/python.syntax: Added syntax highlighting for
 +  pytnoh-2.6+ keywords (patch sent by NNemec)
 +
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
 +2009-01-25 Ilia Maslakov il.sm...@gmail.com
 +
 +  * src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
 +  * src/main.c, src/panel.h, src/screen.c, src/setup.c:
 +- Add support for showing executables at first in the panel view
 +
 +2009-01-25 Patrick Winnertz win...@debian.org  Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
 +so that symlinks and files which special characters works now
 +
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
 +2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
 +  * src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
 +  * src/view.c, vfs/ftpfs.c, vfs/utilvfs.c:
 +- Made history section names statically instead of dynamic
 +translated strings. This breaks now once every history file
 +but afterwards this will be stable
 +
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
 +
 +2009-01-24 Patrick Winnertz win...@debian.org
 +
 +  * edit/editcmd.c: Fix some issues about regex:
 +- prevent . to match a newline (\n)
 +- match from start of line and not from cursor position
  
+ 2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
+ 
+   * configure.ac:
+   * lib/mc.ext.in:
+   * vfs/extfs/Makefile.am:
+   * vfs/extfs/extfs.ini: 
+   * vfs

updated: [f2a745a] merged #242

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit f2a745a47d9152703e35d6dbf09d3bef49873802
Merge: e5cad3802b8080432230ba7d1d66e068a6f703a2 
463a18623d550c62035ae82895fbe41bebb7bf31
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 00:47:29 2009 +0100

merged #242

diff --combined ChangeLog
index 3d9b8e8,0cc786f..bde2924
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,9 +1,13 @@@
  2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * lib/mc.lib: added patch on #219 by angel_il
+   * edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
  
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * acinclude.m4: removed MC_SLANG_PRIVATE macro
 +  * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
 +replaced SLang_getkey2(), SLang_input_pending2()
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
@@@ -97,17 -94,6 +98,17 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * configure.ac:
 +  * lib/mc.ext.in:
 +  * vfs/extfs/Makefile.am:
 +  * vfs/extfs/extfs.ini: 
 +  * vfs/extfs/uace.in:
 +  * vfs/extfs/uarc.in:
 +  * vfs/extfs/uc1541.in: added support for historic archive formats
 +(patch provided by jpelletier)
 +
  2009-01-19 Patrick Winnertz win...@debian.org
  
* edit/edit.h: Add two more ints
diff --combined configure.ac
index 8bc7a16,1dad2ee..791a4d8
--- a/configure.ac
+++ b/configure.ac
@@@ -176,7 -176,7 +176,7 @@@ AC_CHECK_FUNCS([
cfgetospeed \
getegid geteuid getgid getsid getuid \
initgroups isascii \
-   memcpy memmove memset \
+   memcpy memset \
putenv \
setreuid setuid statfs strerror strftime sysconf \
tcgetattr tcsetattr truncate \
@@@ -605,12 -605,9 +605,12 @@@ vfs/extfs/lsl
  vfs/extfs/mailfs
  vfs/extfs/patchfs
  vfs/extfs/rpms
 +vfs/extfs/uace
  vfs/extfs/ualz
  vfs/extfs/uar
 +vfs/extfs/uarc
  vfs/extfs/uarj
 +vfs/extfs/uc1541
  vfs/extfs/uha
  vfs/extfs/ulha 
  vfs/extfs/urar

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [5d4d91c] fixed #239

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 5d4d91cd361959edbef71bbdbfe3ba2077c50426
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Tue Feb 3 17:58:47 2009 +0100

fixed #239

diff --git a/ChangeLog b/ChangeLog
index 026d3ce..4826718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 
* lib/mc.lib: added patch on #219 by angel_il
* edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
+   * mhl/escape.h: including stdbool.h for the bool type (fixing #239)
+   * mhl/types.h: removed redundant bool type (fixing #239)
 
 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [0c97636] fixed #240

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 0c976362125a42ead215d11251fe0ebbd8ddf8ef
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Tue Feb 3 18:21:16 2009 +0100

fixed #240

diff --git a/ChangeLog b/ChangeLog
index 4826718..47749be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
* mhl/escape.h: including stdbool.h for the bool type (fixing #239)
* mhl/types.h: removed redundant bool type (fixing #239)
+   * replaced bool type in mhl/types.h by stdbool.h (fixing #240)
 
 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 
diff --git a/edit/usermap.c b/edit/usermap.c
index b25cad9..7914d75 100644
--- a/edit/usermap.c
+++ b/edit/usermap.c
@@ -29,8 +29,8 @@
 #include sys/types.h
 #include sys/stat.h
 #include unistd.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/edit/usermap.h b/edit/usermap.h
index bf06d12..29097c4 100644
--- a/edit/usermap.h
+++ b/edit/usermap.h
@@ -1,7 +1,7 @@
 #ifndef MC_USERMAP_H
 #define MC_USERMAP_H
 
-#include mhl/types.h
+#include stdbool.h
 
 #define MC_USERMAP .mc/cedit/cooledit.bindings
 
diff --git a/src/ecs-test.c b/src/ecs-test.c
index 963a63b..2493be9 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -28,8 +28,7 @@
 #include assert.h
 #include locale.h
 #include stdio.h
-
-#include mhl/types.h
+#include stdbool.h
 
 #include global.h
 #include ecs.h
diff --git a/src/ecs.c b/src/ecs.c
index a38c54e..cd8da0c 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -26,8 +26,8 @@
 
 #include assert.h
 #include ctype.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/string.h
 
 #include global.h
diff --git a/src/ecs.h b/src/ecs.h
index 98e9a9a..1a53c6f 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -44,7 +44,7 @@ typedef char ecs_char;
 #  define ECS_STR(s)   (s)
 #endif
 
-#include mhl/types.h
+#include stdbool.h
 
 /*
  * String conversion functions between the wide character encoding and
diff --git a/src/file.c b/src/file.c
index 1a367ea..ebd414e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -48,8 +48,8 @@
 #include sys/types.h
 #include sys/stat.h
 #include unistd.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/escape.h
 #include mhl/string.h
diff --git a/src/find.c b/src/find.c
index bf95b7f..564ed86 100644
--- a/src/find.c
+++ b/src/find.c
@@ -26,8 +26,8 @@
 #include stdlib.h
 #include string.h
 #include sys/stat.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/key.c b/src/key.c
index 1434fa7..3bf66de 100644
--- a/src/key.c
+++ b/src/key.c
@@ -31,8 +31,8 @@
 #include string.h
 #include sys/types.h
 #include unistd.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/logging.c b/src/logging.c
index a48dcfb..60db3e6 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -25,9 +25,9 @@
 
 #include stdarg.h
 #include stdio.h
+#include stdbool.h
 
 #include mhl/memory.h
-#include mhl/types.h
 
 #include global.h
 #include logging.h
diff --git a/src/treestore.c b/src/treestore.c
index cb08cb2..e8d81ec 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -40,8 +40,8 @@
 #include sys/types.h
 #include sys/stat.h
 #include unistd.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/tty.c b/src/tty.c
index 44b40e5..70dbfb6 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -28,6 +28,7 @@
 
 #include signal.h
 #include stdarg.h
+#include stdbool.h
 
 #include mhl/types.h
 
diff --git a/src/tty.h b/src/tty.h
index f6d520b..b7ea928 100644
--- a/src/tty.h
+++ b/src/tty.h
@@ -25,7 +25,7 @@
 #endif /* WANT_TERM_H */
 #endif /* USE_NCURSES */
 
-#include mhl/types.h
+#include stdbool.h
 
 /* {{{ Input }}} */
 
diff --git a/src/utilunix.c b/src/utilunix.c
index 4cf70dc..71f839a 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -32,7 +32,7 @@
 #include stdio.h
 #include stdlib.h
 #include string.h
-
+#include stdbool.h
 #include sys/param.h
 #include sys/types.h
 #include sys/stat.h
@@ -41,7 +41,6 @@
 #endif
 #include unistd.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/view.c b/src/view.c
index dcd3559..b00916a 100644
--- a/src/view.c
+++ b/src/view.c
@@ -42,8 +42,8 @@
 #include sys/types.h
 #include sys/stat.h
 #include unistd.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/widget.c b/src/widget.c
index 31afab6..e8f8be3 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -33,8 +33,8 @@
 #include stdio.h
 #include string.h
 #include sys/types.h
+#include stdbool.h
 
-#include mhl/types.h
 #include mhl/memory.h
 #include mhl/string.h
 
diff --git a/src/widget.h b/src/widget.h
index d7596b1..772b1b7 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,7 +1,7 @@
 #ifndef

updated: [d3d1ff4] changelog fixes

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit d3d1ff4faad9eda04663fde83666b6237727cb39
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 01:13:31 2009 +0100

changelog fixes

diff --git a/ChangeLog b/ChangeLog
index 47749be..696a1af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,11 @@
 2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
 
-   * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
+   * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#239, #240)
 
 2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
 
* lib/mc.lib: added patch on #219 by angel_il
* edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
-   * mhl/escape.h: including stdbool.h for the bool type (fixing #239)
-   * mhl/types.h: removed redundant bool type (fixing #239)
-   * replaced bool type in mhl/types.h by stdbool.h (fixing #240)
 
 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [584caa7] manually merged mc-4.6

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 584caa79497b3672624d2b5f913fa56198f4a930
Merge: d3d1ff4faad9eda04663fde83666b6237727cb39 
adbe38172de077ce943e3de81a954bd7e2fa1b5e
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 01:26:28 2009 +0100

manually merged mc-4.6

diff --combined ChangeLog
index 696a1af,2421f92..45c9f35
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,12 @@@
  2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
  
 -  * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
 +  * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#239, #240)
  
  2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
  
* lib/mc.lib: added patch on #219 by angel_il
 +  * edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
+   * vfs/extfs/u7z: patch from mandriva (#194)
  
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
@@@ -15,7 -15,6 +16,7 @@@
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
@@@ -25,22 -24,13 +26,22 @@@
* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
  fixed shell escaping issues in commandline completion engine
* 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
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  odt2txt is now used
  
@@@ -61,11 -51,6 +62,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -77,11 -62,7 +78,11 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 -2009-01-25 Enrico Weigelt weig...@metux.de
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
 +2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -90,11 -71,9 +91,11 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -102,32 -81,17 +103,32 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * configure.ac:
 +  * lib/mc.ext.in:
 +  * vfs/extfs/Makefile.am:
 +  * vfs/extfs/extfs.ini: 
 +  * vfs/extfs/uace.in:
 +  * vfs/extfs/uarc.in:
 +  * vfs/extfs/uc1541.in: added support for historic archive formats
 +(patch provided by jpelletier)
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused

updated: [1d8ef0b] fixed #240

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit 1d8ef0b089bcb6828b0dde62076493178ed185ec
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 01:08:29 2009 +0100

fixed #240

diff --git a/ChangeLog b/ChangeLog
index a529eb9..6e808b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
+
+   * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
+
 2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
 
* lib/mc.lib: added patch on #219 by angel_il
@@ -18,9 +22,6 @@
* 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 weig...@metux.de
-
* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 
 2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
@@ -42,9 +43,6 @@
 
* 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 weig...@metux.de
-
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
 
 2009-01-27 Sergei Trofimovich  sly...@inbox.ru
diff --git a/mhl/escape.h b/mhl/escape.h
index 2ec4e0d..ed25b60 100644
--- a/mhl/escape.h
+++ b/mhl/escape.h
@@ -5,8 +5,7 @@
 
 #include string.h
 #include stdlib.h
-
-#include mhl/types.h
+#include stdbool.h
 
 #define mhl_shell_escape_toesc(x)  \
 (((x)==' ')||((x)=='!')||((x)=='#')||((x)=='$')||((x)=='%')||  \
diff --git a/mhl/types.h b/mhl/types.h
index 1f84002..f88190c 100644
--- a/mhl/types.h
+++ b/mhl/types.h
@@ -7,10 +7,4 @@
 #ifndef __MHL_TYPES_H
 #define __MHL_TYPES_H
 
-typedef enum 
-{
-false  = 0,
-true   = 1
-} bool;
-
 #endif

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [adbe381] added patch from #194

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit adbe38172de077ce943e3de81a954bd7e2fa1b5e
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Tue Feb 3 03:21:32 2009 +0100

added patch from #194

diff --git a/ChangeLog b/ChangeLog
index 6e808b1..2421f92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
 
* lib/mc.lib: added patch on #219 by angel_il
+   * vfs/extfs/u7z: patch from mandriva (#194)
 
 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 
diff --git a/vfs/extfs/u7z b/vfs/extfs/u7z
index 0803574..b346d05 100644
--- a/vfs/extfs/u7z
+++ b/vfs/extfs/u7z
@@ -2,6 +2,7 @@
 #
 # extfs support for p7zip
 # Written by Pavel Roskin pro...@gnu.org
+# Some Bugfixes/workarounds by Sergiy Niskorodov s...@mail.zp.ua
 # Licensed under GNU GPL version 2 or later version.
 
 P7ZIP=7za
@@ -19,7 +20,10 @@ mcu7zip_list ()
 
 mcu7zip_copyout ()
 {
-   $P7ZIP e -so $1 $2  $3 2/dev/null
+   #first we check if we have old p7zip archive with prefix ./ in filename
+   $P7ZIP l $1 $2 | grep -q 0 files  \
+   EXFNAME=*./$2 || EXFNAME=$2
+   $P7ZIP e -so $1 $EXFNAME  $3 2/dev/null
 }
 
 mcu7zip_copyin ()
@@ -31,19 +35,27 @@ mcu7zip_mkdir ()
 {
dir=`mktemp -d ${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XX` || exit 1
mkdir -p $dir/$2
-   $P7ZIP a -w$dir $1 $2 /dev/null 21
+   $P7ZIP a -w$dir $1 $dir/$2 /dev/null 21
rm -rf $dir
 }
 
 mcu7zip_rm ()
 {
# NOTE: Version 4.20 fails to delete files in subdirectories
-   $P7ZIP d $1 $2 /dev/null 21
+   #first we check if we have old p7zip archive with prefix ./ in filename
+   $P7ZIP l $1 $2 | grep -q 0 files  \
+   EXFNAME=*./$2 || EXFNAME=$2
+   $P7ZIP d $1 $EXFNAME 21 | grep -q E_NOTIMPL  /dev/null  \
+   { echo -e Function not implemented...\n7z cannot delete from solid 
archive. 2 ; exit 1 ; }
 }
 
 mcu7zip_rmdir ()
 {
-   $P7ZIP d $1 $2/ /dev/null 21
+   #first we check if we have old p7zip archive with prefix ./ in filename
+   $P7ZIP l $1 $2 | grep -q 0 files  \
+   EXFNAME=*./$2 || EXFNAME=$2
+   $P7ZIP d $1 $EXFNAME/ 21 | grep -q E_NOTIMPL  /dev/null  \
+   { echo -e Function not implemented...\n7z cannot delete from solid 
archive. 2 ; exit 1 ; }
 }
 
 # override any locale for dates

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [648a377] merged mc-4.6

2009-02-03 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 648a377ad87cea89af81773bc2f6ddf53735fcdd
Merge: 584caa79497b3672624d2b5f913fa56198f4a930 
5f84762472cd481e25bd5c2b9a115200192abbc3
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Wed Feb 4 04:11:17 2009 +0100

merged mc-4.6

diff --combined ChangeLog
index 45c9f35,b48e121..92a95df
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,10 +1,11 @@@
  2009-02-04 Enrico Weigelt, metux ITS weig...@metux.de
  
 -  * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
 +  * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#239, #240)
  
  2009-02-03 Enrico Weigelt, metux ITS weig...@metux.de
  
* lib/mc.lib: added patch on #219 by angel_il
 +  * edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
* vfs/extfs/u7z: patch from mandriva (#194)
  
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
@@@ -16,7 -15,6 +16,7 @@@
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
@@@ -26,22 -24,13 +26,22 @@@
* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
  fixed shell escaping issues in commandline completion engine
* 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
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  odt2txt is now used
  
@@@ -62,11 -51,6 +62,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -78,10 -62,6 +78,10 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -91,11 -71,10 +91,12 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
+   * vfs/extfs/rpm, vfs/extfs/trpm: removed obsolete rpm tags
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -103,32 -82,17 +104,32 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * configure.ac:
 +  * lib/mc.ext.in:
 +  * vfs/extfs/Makefile.am:
 +  * vfs/extfs/extfs.ini: 
 +  * vfs/extfs/uace.in:
 +  * vfs/extfs/uarc.in:
 +  * vfs/extfs/uc1541.in: added support for historic archive formats
 +(patch provided by jpelletier)
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
* src/main.c

updated: [0434e3d] manually merged 235_remove_g_snprintf

2009-02-02 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 0434e3de5d20323bed8b7b2dbff74c1d00a221ec
Merge: 3410eb32290abe51e6845483ed7a3723823a768a 
e4a4f77ac28f064d0fd5611a1b48689594289408
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Mon Feb 2 20:53:03 2009 +0100

manually merged 235_remove_g_snprintf

diff --combined ChangeLog
index 2c39360,a54e8eb..3b5bab1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,7 +1,21 @@@
 +2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * src/util.c: fixed name_trunc() on NULL or empty parameters
 +  * src/achown.c: fixed unitialized var in init_chown_advanced()
 +(patch from andrew_b)
 +
 +2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
 +  * src/boxes.c, src/command.c, src/complete.c, src/complete.h, 
src/file.c,
 +  * 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 weig...@metux.de
  
* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
+   * replaced g_snprintf() by snprintf()
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
@@@ -31,11 -18,6 +32,11 @@@
  This solves strange rename cases, when copying/moving is performed 
into
  deleted directory.
  
 +2009-01-27 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * 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 weig...@metux.de
  
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
diff --combined edit/editcmd.c
index 07286b6,792322d..7dae88a
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@@ -626,7 -626,7 +626,7 @@@ edit_raw_key_query (const char *heading
NULL, heading,
DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB);
  add_widget (raw_dlg,
 -  input_new (3 - cancel, w - 5, INPUT_COLOR, 2, , 0));
 +  input_new (3 - cancel, w - 5, INPUT_COLOR, 2, , 0, 
INPUT_COMPLETE_DEFAULT));
  add_widget (raw_dlg, label_new (3 - cancel, 2, query));
  if (cancel)
add_widget (raw_dlg,
@@@ -2337,7 -2337,7 +2337,7 @@@ edit_goto_cmd (WEdit *edit
  char *error;
  char s[32];
  
- g_snprintf (s, sizeof (s), %ld, line);
+ snprintf (s, sizeof (s), %ld, line);
  f = input_dialog (_( Goto line ), _( Enter line: ), 
MC_HISTORY_EDIT_GOTO_LINE,
  line ? s : );
  if (!f)
diff --combined src/boxes.c
index 48ac3a9,23030ec..a46aeec
--- a/src/boxes.c
+++ b/src/boxes.c
@@@ -197,7 -197,7 +197,7 @@@ display_init (int radio_sel, char *init
  
  status =
input_new (10, 9, INPUT_COLOR, DISPLAY_X - 14, _status[radio_sel],
 - mini-input);
 + mini-input, INPUT_COMPLETE_DEFAULT);
  add_widget (dd, status);
  input_set_point (status, 0);
  
@@@ -207,7 -207,7 +207,7 @@@
  
  user =
input_new (7, 9, INPUT_COLOR, DISPLAY_X - 14, init_text,
 - user-fmt-input);
 + user-fmt-input, INPUT_COMPLETE_DEFAULT);
  add_widget (dd, user);
  input_set_point (user, 0);
  
@@@ -571,7 -571,7 +571,7 @@@ sel_charset_button (int action
: codepages[new_display_codepage].name;
  
  /* avoid strange bug with label repainting */
- g_snprintf (buf, sizeof (buf), %-27s, cpname);
+ snprintf (buf, sizeof (buf), %-27s, cpname);
  label_set_text (cplabel, buf);
  return 0;
  }
@@@ -772,12 -772,12 +772,12 @@@ configure_vfs (void
  ret_use_netrc = use_netrc;
  ret_ftpfs_use_passive_connections = ftpfs_use_passive_connections;
  ret_ftpfs_use_passive_connections_over_proxy = 
ftpfs_use_passive_connections_over_proxy;
- g_snprintf(buffer3, sizeof (buffer3), %i, ftpfs_directory_timeout);
+ snprintf(buffer3, sizeof (buffer3), %i, ftpfs_directory_timeout);
  confvfs_widgets[8].text = buffer3;
  confvfs_widgets[10].text = ftpfs_anonymous_passwd;
  confvfs_widgets[5].text = ftpfs_proxy_host;
  #endif
- g_snprintf (buffer2, sizeof (buffer2), %i, vfs_timeout);
+ snprintf (buffer2, sizeof (buffer2), %i, vfs_timeout);
  confvfs_widgets [3 + VFS_WIDGETBASE].text = buffer2;
  
  if (quick_dialog (confvfs_dlg) != B_CANCEL) {
@@@ -1085,17 -1085,17 +1085,17 @@@ vfs_smb_get_authinfo (const char *host
  
  g_free (title);
  
 -in_user  = input_new (5, istart, INPUT_COLOR, ilen, user, auth_name);
 +in_user  = input_new (5, istart, INPUT_COLOR, ilen, user, auth_name, 
INPUT_COMPLETE_DEFAULT);
  add_widget (auth_dlg, in_user);
  
 -in_domain

updated: [fb745c7] manually merged 193_vhdl_syntax

2009-02-02 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit fb745c77ff7636cfb2eedbac929679f06adbf28b
Merge: 0434e3de5d20323bed8b7b2dbff74c1d00a221ec 
b1641d2540b992b0b614d613f97b042794c1eaae
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Mon Feb 2 20:58:55 2009 +0100

manually merged 193_vhdl_syntax

diff --combined ChangeLog
index 3b5bab1,c9d846b..f111f15
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,6 +1,24 @@@
 -2009-01-30 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
 -  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax
 +  * src/util.c: fixed name_trunc() on NULL or empty parameters
 +  * src/achown.c: fixed unitialized var in init_chown_advanced()
 +(patch from andrew_b)
 +
 +2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
 +  * src/boxes.c, src/command.c, src/complete.c, src/complete.h, 
src/file.c,
 +  * 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 weig...@metux.de
- 
 +  * replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 +  * replaced g_snprintf() by snprintf()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
 +(out-of-tree builds)
++  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
@@@ -32,13 -12,8 +30,10 @@@
  This solves strange rename cases, when copying/moving is performed 
into
  deleted directory.
  
 -2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-27 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * 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 weig...@metux.de
- 
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  sly...@inbox.ru
@@@ -46,11 -21,6 +41,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -66,7 -36,7 +61,7 @@@
* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
  name filling. Can be configured (on|off) in 'Configure options'
  
--2009-01-25 Enrico Weigelt weig...@metux.de
++2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -75,9 -45,9 +70,11 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
--2009-01-24 Enrico Weigelt weig...@metux.de
++2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
++  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
++for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -85,11 -55,11 +82,6 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
--2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
--
--  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
--for Nemerle source files
--
  2009-01-19 Patrick Winnertz win...@debian.org
  
* edit/edit.h: Add two more ints
@@@ -104,7 -74,7 +96,7 @@@
* src/main.c: Removed unused function do_mc_filename_rename
* src/util.c: Removed unused struct whentm
  
--2009-01-16 Enrico Weigelt, metux IT service weig...@metux.de
++2009-01-16 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/subshell: setting subshell pty to close-on-exec 
  (taken from mandriva patches)
@@@ -142,9 -112,9 +134,6 @@@
* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
added syntax definition for Haskell (taken from rhclub-tree)
* syntax: added ebuild Syntax defition (taken from rhclub-tree)
--
--2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de

updated: [7015de5] Merge commit 'origin/236_replace_gboolean'

2009-02-02 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 7015de5db51b00fe6c5ea6c49556ffcb526aca13
Merge: fb745c77ff7636cfb2eedbac929679f06adbf28b 
4fcf4e9685d9b2e4b49bfa3f7d3709dbe48073b6
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Mon Feb 2 21:16:39 2009 +0100

Merge commit 'origin/236_replace_gboolean'

diff --combined ChangeLog
index f111f15,9e53731..b78cdd6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -3,6 -3,7 +3,7 @@@
* src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
+   * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
@@@ -11,14 -12,15 +12,14 @@@
* 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 weig...@metux.de
 -
* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 +  * replaced g_snprintf() by snprintf()
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
@@@ -34,6 -36,9 +35,6 @@@
  
* 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 weig...@metux.de
 -
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  sly...@inbox.ru
@@@ -61,7 -66,7 +62,7 @@@
* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
  name filling. Can be configured (on|off) in 'Configure options'
  
 -2009-01-25 Enrico Weigelt weig...@metux.de
 +2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -70,11 -75,9 +71,11 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -82,6 -85,11 +83,6 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 -2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
 -
 -  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 -for Nemerle source files
 -
  2009-01-19 Patrick Winnertz win...@debian.org
  
* edit/edit.h: Add two more ints
@@@ -96,7 -104,7 +97,7 @@@
* src/main.c: Removed unused function do_mc_filename_rename
* src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-16 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/subshell: setting subshell pty to close-on-exec 
  (taken from mandriva patches)
@@@ -134,6 -142,9 +135,6 @@@
* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
added syntax definition for Haskell (taken from rhclub-tree)
* syntax: added ebuild Syntax defition (taken from rhclub-tree)
 -
 -2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 -
* edit/editcmd.c:
* src/achown.c src/background.c src/boxes.c src/chmod.c:
* src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
diff --combined src/file.c
index 5fb0bfd,2ed0465..ffc93dd
--- a/src/file.c
+++ b/src/file.c
@@@ -50,6 -50,7 +50,7 @@@
  #include sys/stat.h
  #include unistd.h
  
+ #include mhl/types.h
  #include mhl/memory.h
  #include mhl/escape.h
  #include mhl/string.h
@@@ -1034,7 -1035,7 +1035,7 @@@ move_file_file (FileOpContext *ctx, con
  {
  struct stat src_stats, dst_stats;
  int return_status = FILE_CONT;
- gboolean copy_done = FALSE;
+ bool copy_done = FALSE;
  
  if (file_progress_show_source (ctx, s) == FILE_ABORT
|| file_progress_show_target (ctx, d) == FILE_ABORT)
@@@ -1701,10 -1702,10 +1702,10 @@@ panel_operate_generate_prompt (const WP
  
  if (single_source) {
i = fmd_xlen - strlen (format_string) - 4;
 -  g_snprintf (cmd_buf, sizeof (cmd_buf), format_string

updated: [9b9cab5] manually merged 234_remove_g_string

2009-02-02 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 9b9cab58749217101ab16504a77efb301812cfbf
Merge: 8b38cf44daee3b0f92591baa97f36d722be99280 
f235b1976ee6dd7aa2be7e75c870784c424e3de3
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Mon Feb 2 22:39:12 2009 +0100

manually merged 234_remove_g_string

diff --combined ChangeLog
index 174e3aa,abbe625..832520c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,33 -1,14 +1,34 @@@
 -2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de
 +2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * src/util.c: fixed name_trunc() on NULL or empty parameters
 +  * src/achown.c: fixed unitialized var in init_chown_advanced()
 +(patch from andrew_b)
 +  * replaced gboolean by bool (from mhl/types.h)
 +
 +2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
 +  * src/boxes.c, src/command.c, src/complete.c, src/complete.h, 
src/file.c,
 +  * 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
* 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
  
  2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
  (out-of-tree builds)
 +  * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +  * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
  odt2txt is now used
  
@@@ -37,10 -18,8 +38,10 @@@
  This solves strange rename cases, when copying/moving is performed 
into
  deleted directory.
  
 -2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-27 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
 +SHELL_ESCAPED_STR for more type safety
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  sly...@inbox.ru
@@@ -68,7 -47,7 +69,7 @@@
* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
  name filling. Can be configured (on|off) in 'Configure options'
  
 -2009-01-25 Enrico Weigelt weig...@metux.de
 +2009-01-25 Enrico Weigelt, metux ITS weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -77,11 -56,9 +78,11 @@@
  translated strings. This breaks now once every history file
  but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt weig...@metux.de
 +2009-01-24 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
  
  2009-01-24 Patrick Winnertz win...@debian.org
  
@@@ -89,6 -66,11 +90,6 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 -2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
 -
 -  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 -for Nemerle source files
 -
  2009-01-19 Patrick Winnertz win...@debian.org
  
* edit/edit.h: Add two more ints
@@@ -103,7 -85,7 +104,7 @@@
* src/main.c: Removed unused function do_mc_filename_rename
* src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service weig...@metux.de
 +2009-01-16 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/subshell: setting subshell pty to close-on-exec 
  (taken from mandriva patches)
@@@ -141,6 -123,9 +142,6 @@@
* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
added syntax definition for Haskell (taken from rhclub-tree)
* syntax: added ebuild Syntax defition (taken from rhclub-tree)
 -
 -2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 -
* edit/editcmd.c:
* src/achown.c src/background.c src/boxes.c src/chmod.c:
* src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
diff --combined edit/edit.c
index 82cca0d,1f8d851..36284df
--- a/edit/edit.c
+++ b/edit/edit.c
@@@ -22,7 -22,6 +22,7 @@@
  */
  
  #include config.h
 +
  #include stdio.h
  #include stdarg.h
  #include

updated: [c76c6e5] Merge commit 'origin/230_fix_name_trunc' into mc-4.6

2009-02-01 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit c76c6e5ffc6cbb8d62050f836debeccaeec32936
Merge: 80a68972718b68c5c5ae050999b187f1676c653b 
6b6d4a222d145cbf1a14e968b753af1c5406e980
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Sun Feb 1 22:05:17 2009 +0100

Merge commit 'origin/230_fix_name_trunc' into mc-4.6


-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [74c5601] Merge commit 'origin/mc-4.6'

2009-02-01 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 74c5601339ac49b1ca6647ffc867c384b1355a14
Merge: 9fd798845ddd37c693a3f20f037711f4a75f24bc 
c76c6e5ffc6cbb8d62050f836debeccaeec32936
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Sun Feb 1 22:07:03 2009 +0100

Merge commit 'origin/mc-4.6'

diff --combined ChangeLog
index a63a22d,2d23d15..c6733e2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,8 +1,8 @@@
+ 2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
+ 
+   * src/util.c: fixed name_trunc() on NULL or empty parameters
+ (patch from andrew_b)
+ 
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
  
* edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
@@@ -39,11 -44,6 +44,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -55,10 -55,6 +60,10 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -78,19 -74,10 +83,19 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
@@@ -128,29 -115,7 +133,29 @@@
  2009-01-11 Patrick Winnertz win...@debian.org
  
* syntax/pascal.syntax: Added syntax highlighting for 
 -  some delphi keywords
 +some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
 +  added syntax definition for Haskell (taken from rhclub-tree)
 +  * syntax: added ebuild Syntax defition (taken from rhclub-tree)
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * edit/editcmd.c:
 +  * src/achown.c src/background.c src/boxes.c src/chmod.c:
 +  * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
 +  * src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
 +  * src/learn.c src/main.c src/panelize.c src/screen.c:
 +  * src/selcodepage.c src/subshell.c src/tree.c src/user.c:
 +  * src/utilunix.c src/view.c:
 +  * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
 +  * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
 +  * vfs/utilvfs.c vfs/vfs.c:
 +  
 +  Changed message type codes on calls to message(), query_dialog(),
 +  close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
  2008-12-18  Roland Illig  roland.il...@gmx.de
  
@@@ -328,7 -293,7 +333,7 @@@
  
* doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  dmart...@excite.com
 +2006-02-18  David Martin  dmart...@excite.com
  
* doc/es/mc.1.in: Cleanup. Fix key naming.
  
diff --combined vfs/smbfs.c
index bb82bc2,e027da8..b15952c
--- a/vfs/smbfs.c
+++ b/vfs/smbfs.c
@@@ -49,6 -49,8 +49,8 @@@
  
  #include string.h
  
+ #include mhl/string.h
+ 
  #include vfs.h
  #include vfs-impl.h
  #include smbfs.h
@@@ -366,7 -368,7 +368,7 @@@ smbfs_fill_names (struct vfs_class *me
  #define GNAL_VNC(s) unix_to_dos(s,False)
  /* does same as do_get() in client.c */
  /* called from vfs.c:1080, count = buffer size */
 -static int
 +static ssize_t
  smbfs_read (void *data, char *buffer, int count)
  {
  smbfs_handle *info = (smbfs_handle *) data;
@@@ -380,7 -382,7 +382,7 @@@
return n;
  }
  
 -static int
 +static ssize_t
  smbfs_write (void *data, const char *buf, int nbyte

updated: [48a85a7] manually merged 232_fix_init_chown_advanced

2009-02-01 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit 48a85a7b97ea88f7687126471c2a724e3e444619
Merge: c76c6e5ffc6cbb8d62050f836debeccaeec32936 
6f9ef0b7befb9b5943fcbc0a91a2e00fa0f57cb2
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Sun Feb 1 22:37:57 2009 +0100

manually merged 232_fix_init_chown_advanced

diff --combined ChangeLog
index 2d23d15,5c0e973..ed3c7f6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
 +  * src/util.c: fixed name_trunc() on NULL or empty parameters
+   * src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [3410eb3] Merge commit 'origin/mc-4.6'

2009-02-01 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit 3410eb32290abe51e6845483ed7a3723823a768a
Merge: 74c5601339ac49b1ca6647ffc867c384b1355a14 
48a85a7b97ea88f7687126471c2a724e3e444619
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Sun Feb 1 22:38:48 2009 +0100

Merge commit 'origin/mc-4.6'

diff --combined ChangeLog
index c6733e2,ed3c7f6..2c39360
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
  2009-02-01 Enrico Weigelt, metux ITS weig...@metux.de
  
* src/util.c: fixed name_trunc() on NULL or empty parameters
+   * src/achown.c: fixed unitialized var in init_chown_advanced()
  (patch from andrew_b)
  
  2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de, Patrick Winnertz 
win...@debian.org, Slava Zanko slavaza...@gmail.com, Sergei Trofimovich  
sly...@inbox.ru
@@@ -44,11 -45,6 +45,11 @@@
* syntax/python.syntax: Added syntax highlighting for
pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
 +
 +  * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -60,10 -56,6 +61,10 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -83,19 -75,10 +84,19 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
@@@ -133,29 -116,7 +134,29 @@@
  2009-01-11 Patrick Winnertz win...@debian.org
  
* syntax/pascal.syntax: Added syntax highlighting for 
 -  some delphi keywords
 +some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
 +  added syntax definition for Haskell (taken from rhclub-tree)
 +  * syntax: added ebuild Syntax defition (taken from rhclub-tree)
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * edit/editcmd.c:
 +  * src/achown.c src/background.c src/boxes.c src/chmod.c:
 +  * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
 +  * src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
 +  * src/learn.c src/main.c src/panelize.c src/screen.c:
 +  * src/selcodepage.c src/subshell.c src/tree.c src/user.c:
 +  * src/utilunix.c src/view.c:
 +  * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
 +  * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
 +  * vfs/utilvfs.c vfs/vfs.c:
 +  
 +  Changed message type codes on calls to message(), query_dialog(),
 +  close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
  2008-12-18  Roland Illig  roland.il...@gmx.de
  
@@@ -333,7 -294,7 +334,7 @@@
  
* doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  dmart...@excite.com
 +2006-02-18  David Martin  dmart...@excite.com
  
* doc/es/mc.1.in: Cleanup. Fix key naming.
  
diff --combined src/achown.c
index 8f436fb,6277110..de2ae07
--- a/src/achown.c
+++ b/src/achown.c
@@@ -539,9 -539,9 +539,9 @@@ init_chown_advanced (void
  int i;
  enum { dlg_h = 13, dlg_w = 74, n_elem = 4 };
  #ifdef ENABLE_NLS
- static int i18n_len;
- 
- if (!i18n_len) {
+ static int i18n_len = 0;
+ 
+ if (i18n_len == 0) {
int dx, cx;
for (i = 0 ; i  n_elem ; i++) {
chown_advanced_but[i].text = _(chown_advanced_but[i].text);
@@@ -627,12 -627,12 +627,12 @@@ static void apply_advanced_chowns (stru
  fname = current_panel-dir.list[current_file].fname;
  need_update = end_chown = 1;
  if (mc_chmod (fname, get_mode ()) == -1)
 -  message (1, MSG_ERROR, _( Cannot

updated: [a1b4718] manually merged 118_port_number_in_shell_link

2009-01-31 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit a1b47185c952e9d31607d59420a0cb86e9f492ab
Merge: 5f77615b35a09d8cb1941b0d37f5cf24d4b7dbc5 
a73bd631e57d6f9ee89f3a3fc1870fa879b01fb0
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Sat Jan 31 19:29:15 2009 +0100

manually merged 118_port_number_in_shell_link

diff --combined ChangeLog
index 3d714e5,727c875..cc5b4da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,9 +1,36 @@@
 +2009-01-31 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 +
 +2009-01-30 Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
 +(out-of-tree builds)
 +
 +2009-01-29 Mikhail S. Pobolovets styx...@gmail.com
 +  * lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
 +odt2txt is now used
 +
 +2009-01-29 Patrick Winnertz win...@debian.org  Sergei Trofimovich  
sly...@inbox.ru
 +
 +  * src/file.c: Added trailing dir separator for default path in 
copy/move dialogs.
 +This solves strange rename cases, when copying/moving is performed 
into
 +deleted directory.
 +
 +2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
 +
 +2009-01-27 Sergei Trofimovich  sly...@inbox.ru
 +
 +  * syntax/python.syntax: Added syntax highlighting for
 +  pytnoh-2.6+ keywords (patch sent by NNemec)
  
+ 2009-01-26 Mikhail S. Pobolovets styx...@gmail.com
+ 
+   * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
+ 0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
+ 
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -37,10 -15,6 +42,10 @@@
* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets styx...@gmail.com
 +  * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt weig...@metux.de
  
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [2f6f6af] fixed comments to /* ... */

2009-01-27 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the mc-4.6 branch:
commit 2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Tue Jan 27 22:04:12 2009 +0100

fixed comments to /* ... */

diff --git a/ChangeLog b/ChangeLog
index 016036d..92ad454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
+
+   * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
+
 2009-01-25 Ilia Maslakov il.sm...@gmail.com
 
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
diff --git a/mhl/escape.h b/mhl/escape.h
index 2533388..8366833 100644
--- a/mhl/escape.h
+++ b/mhl/escape.h
@@ -54,12 +54,12 @@ static inline char* mhl_shell_unescape_buf(char* text)
 if (!text)
return NULL;
 
-// look for the first \ - that's quick skipover if there's nothing to 
escape
+/* look for the first \ - that's quick skipover if there's nothing to 
escape */
 char* readptr = text;
 while ((*readptr)  ((*readptr)!='\\'))   readptr++;
 if (!(*readptr)) return text;
 
-// if we're here, we're standing on the first '\'
+/* if we're here, we're standing on the first '\' */
 char* writeptr = readptr;
 char c;
 while ((c = *readptr))
@@ -97,7 +97,7 @@ static inline char* mhl_shell_unescape_buf(char* text)
(*writeptr) = c; writeptr++; break;
}
}
-   else// got a normal character
+   else/* got a normal character */
{
(*writeptr) = *readptr;
writeptr++;
diff --git a/mhl/string.h b/mhl/string.h
index e3c7d2f..c50228d 100644
--- a/mhl/string.h
+++ b/mhl/string.h
@@ -16,30 +16,29 @@ static inline char * mhl_str_dup_range(const char * 
s_start, const char * s_boun
 
 static inline char* mhl_str_trim(char* str)
 {
-if (!str) return NULL; // NULL string ?! bail out.
+if (!str) return NULL; /* NULL string ?! bail out. */
 
-// find the first non-space
+/* find the first non-space */
 char* start; for (start=str; ((*str)  (!isspace(*str))); str++);
 
-// only spaces ?
+/* only spaces ? */
 if (!(*str)) { *str = 0; return str; }
 
-// get the size (cannot be empty - catched above)
+/* get the size (cannot be empty - catched above) */
 size_t _sz = strlen(str);
 
-// find the proper end
+/* find the proper end */
 char* end;
 for (end=(str+_sz-1); ((endstr)  (isspace(*end))); end--);
-end[1] = 0;// terminate, just to be sure
+end[1] = 0;/* terminate, just to be sure */
 
-// if we have no leading spaces, just trucate
+/* if we have no leading spaces, just trucate */
 if (start==str) { end++; *end = 0; return str; }
 
-
-// if it' only one char, dont need memmove for that
+/* if it' only one char, dont need memmove for that */
 if (start==end) { str[0]=*start; str[1]=0; return str; }
 
-// by here we have a (non-empty) region between start end end 
+/* by here we have a (non-empty) region between start end end */
 memmove(str,start,(end-start+1));
 return str;
 }
@@ -70,10 +69,9 @@ static inline char* __mhl_str_concat_hlp(const char* base, 
...)
 va_list args;
 va_start(args,base);
 char* a;
-// note: we use ((char*)(1)) as terminator - NULL is a valid argument !
+/* note: we use ((char*)(1)) as terminator - NULL is a valid argument ! */
 while ((a = va_arg(args, char*))!=(char*)1)
 {
-// printf(a=%u\n, a);
if (a)
{
arg_ptr[count] = a;
@@ -86,7 +84,7 @@ static inline char* __mhl_str_concat_hlp(const char* base, 
...)
 if (!count)
return mhl_str_dup();
 
-// now as we know how much to copy, allocate the buffer
+/* now as we know how much to copy, allocate the buffer */
 char* buffer = (char*)mhl_mem_alloc_u(totalsize+2);
 char* current = buffer;
 int x=0;
@@ -104,8 +102,8 @@ static inline char* __mhl_str_concat_hlp(const char* base, 
...)
 
 static inline char* mhl_str_reverse(char* ptr)
 {
-if (!ptr)  return NULL;// missing string
-if (!(ptr[0]  ptr[1]))   return ptr; // empty or 1-ch string
+if (!ptr)  return NULL;/* missing string */
+if (!(ptr[0]  ptr[1]))   return ptr; /* empty or 1-ch string */
 
 size_t _sz = strlen(ptr);
 char* start = ptr;

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

updated: [e34e748] Merge commit 'origin/mc-4.6'

2009-01-27 Thread Enrico Weigelt, metux IT service 
The following commit has been merged in the master branch:
commit e34e748666c0ad817013a5e8044cd1cba11f8e48
Merge: 753a663d2ddd3b91d7f7c235513dabe8016445bd 
2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date:   Tue Jan 27 22:53:12 2009 +0100

Merge commit 'origin/mc-4.6'

diff --combined ChangeLog
index d66c419,92ad454..9055511
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,7 +1,7 @@@
+ 2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
+ 
+   * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
+ 
  2009-01-25 Ilia Maslakov il.sm...@gmail.com
  
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -28,19 -32,10 +32,19 @@@
  - prevent . to match a newline (\n)
  - match from start of line and not from cursor position
  
 +2009-01-24  Enrico Weigelt, metux IT service weig...@metux.de
 +
 +  * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +for Nemerle source files
 +
 +2009-01-19 Patrick Winnertz win...@debian.org
 +
 +  * edit/edit.h: Add two more ints
 +  * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz win...@debian.org
  
 -  * edit/editdraw.c: Moved var into if clause as it's only used
 -  there
 +  * edit/editdraw.c: Moved var into if clause as it's only used there
* edit/editlock.c: Removed unnecessary arguement to if condition
* src/cmd.c: Removed unused pointer
* src/hotlist.c: Removed unused function save_group
@@@ -78,29 -73,7 +82,29 @@@
  2009-01-11 Patrick Winnertz win...@debian.org
  
* syntax/pascal.syntax: Added syntax highlighting for 
 -  some delphi keywords
 +some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
 +  added syntax definition for Haskell (taken from rhclub-tree)
 +  * syntax: added ebuild Syntax defition (taken from rhclub-tree)
 +
 +2009-01-10  Enrico Weigelt, metux ITS weig...@metux.de
 +
 +  * edit/editcmd.c:
 +  * src/achown.c src/background.c src/boxes.c src/chmod.c:
 +  * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
 +  * src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
 +  * src/learn.c src/main.c src/panelize.c src/screen.c:
 +  * src/selcodepage.c src/subshell.c src/tree.c src/user.c:
 +  * src/utilunix.c src/view.c:
 +  * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
 +  * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
 +  * vfs/utilvfs.c vfs/vfs.c:
 +  
 +  Changed message type codes on calls to message(), query_dialog(),
 +  close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
  2008-12-18  Roland Illig  roland.il...@gmx.de
  
@@@ -278,7 -251,7 +282,7 @@@
  
* doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  dmart...@excite.com
 +2006-02-18  David Martin  dmart...@excite.com
  
* doc/es/mc.1.in: Cleanup. Fix key naming.
  

-- 
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel