Commit Graph

9646 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT service
2153b3c5cd VFS: added non-vfs version of vfs_get_encoding() 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
e2e490a054 VFS: fixing symbol clash on mc_ungetlocalcopy() at non-vfs build 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
9571b0ac15 VFS: fixing symbol clash on mc_readlink() at non-vfs build 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
1ee19ccdc2 VFS: fixing symbol clash on mc_utime() at non-vfs build 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
8cade48b13 VFS: fixing symbol clash on mc_write() at non-vfs build 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
1b11c35b2b VFS: fixing symbol clash on mc_read() at non-vfs build 2009-12-30 11:06:10 +02:00
Enrico Weigelt, metux IT service
54f302e2c9 VFS: fixing symbol clash on vfs_file_is_local() at non-vfs build 2009-12-30 11:06:09 +02:00
Enrico Weigelt, metux IT service
49c83d786c VFS: fixing symbol clash on vfs_current_is_local() at non-vfs build 2009-12-30 11:06:09 +02:00
Enrico Weigelt, metux IT service
b86788822d VFS: fixing symbol clash on vfs_init() and vfs_shut() at non-vfs build 2009-12-30 11:06:09 +02:00
Enrico Weigelt, metux IT service
80b3776c20 VFS: fixed lots of missing includes to vfs/vfs.h 2009-12-30 11:06:09 +02:00
Enrico Weigelt, metux IT service
03b6d00976 Ticket #1916: non-vfs build fixups
* removed accidentially merged unfinished mvfs stuff
* added missing AM_CONDITIONAL's for non-vfs build
* fixed clashes between vfs/vfs.h and src/vfsdummy.h
* added missing functions/inlines to non-vfs build
2009-12-30 11:06:09 +02:00
Slava Zanko
f287f204be Merge branch '1914_mcserv_unused_variable'
* 1914_mcserv_unused_variable:
  Ticket: #1914: src/mcserv.c: fixed break on unused parameter
2009-12-30 11:03:42 +02:00
Enrico Weigelt, metux IT service
c4776385bc Ticket: #1914: src/mcserv.c: fixed break on unused parameter 2009-12-30 11:03:28 +02:00
Slava Zanko
f3b6436732 Merge branch '1913_unused_strfunc'
* 1913_unused_strfunc:
  Ticket: #1913: Fixed warn/break on unsed static function str_utf8_create_key_for_filename()
2009-12-30 11:01:32 +02:00
Enrico Weigelt, metux IT service
af2f1f650b Ticket: #1913: Fixed warn/break on unsed static function str_utf8_create_key_for_filename()
Unused static function causes build to break on -Werror.
Fixing this by commenting it out.
(not removing it since it might get used some day)

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-30 11:01:09 +02:00
Sergei Trofimovich
4c8dbd8f3b Merge branch '1906_crash_on_syntax'
* 1906_crash_on_syntax:
  Ticket #1906: edit: crash on file open whoen some Syntax files are absent (reported by pavlinux)
2009-12-27 10:24:12 +02:00
Sergei Trofimovich
4d9bc2923b Ticket #1906: edit: crash on file open whoen some Syntax files are absent (reported by pavlinux)
valgrind log snippet: (from here http://pavlinux.ru/vgmc.log)

> ==26750== HEAP SUMMARY:
> ==26750==     in use at exit: 0 bytes in 0 blocks
> ==26750==   ==26749== Invalid free() / delete / delete[]
> ==26749==    at 0x4A06DD8: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==26749==    by 0x48B5F9: edit_read_syntax_rules (syntax.c:766)
> ==26749==    by 0x48CDA7: edit_read_syntax_file (syntax.c:1140)
> ==26749==    by 0x48D06D: edit_load_syntax (syntax.c:1219)
> ==26749==    by 0x4762F6: edit_init (edit.c:834)
> ==26749==    by 0x4858FC: edit_file (editwidget.c:241)
> ==26749==    by 0x44D017: do_edit_at_line (cmd.c:304)
> ==26749==    by 0x44D098: do_edit (cmd.c:324)
> ==26749==    by 0x44D10E: edit_cmd (cmd.c:331)
> ==26749==    by 0x46C2E4: midnight_execute_cmd (main.c:1193)
> ==26749==    by 0x46CD41: midnight_callback (main.c:1690)
> ==26749==    by 0x4353F4: buttonbar_call (widget.c:2654)
> ==26749==  Address 0x60f8e10 is 0 bytes inside a block of size 30 free'd
> ==26749==    at 0x4A06DD8: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
> ==26749==    by 0x48B32C: open_include_file (syntax.c:705)
> ==26749==    by 0x48B6E8: edit_read_syntax_rules (syntax.c:784)
> ==26749==    by 0x48CDA7: edit_read_syntax_file (syntax.c:1140)
> ==26749==    by 0x48D06D: edit_load_syntax (syntax.c:1219)
> ==26749==    by 0x4762F6: edit_init (edit.c:834)
> ==26749==    by 0x4858FC: edit_file (editwidget.c:241)
> ==26749==    by 0x44D017: do_edit_at_line (cmd.c:304)
> ==26749==    by 0x44D098: do_edit (cmd.c:324)
> ==26749==    by 0x44D10E: edit_cmd (cmd.c:331)
> ==26749==    by 0x46C2E4: midnight_execute_cmd (main.c:1193)
> ==26749==    by 0x46CD41: midnight_callback (main.c:1690)

We see doublefree memory corruption here, introduced by spurious 'g_free(error_file_name)'
of changeset:0c17219b2ab5cb5fe2e73f8d7cc9c11c755a3ae4 (syntax.c file)

The rest of code seems to store real syntax file name there.

Making code the same as part above: don't free 'error_file_name'

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-27 10:23:50 +02:00
Sergei Trofimovich
5e9729e05b Merge remote branch 'origin/1903_fish_quote_escape'
* origin/1903_fish_quote_escape:
  Ticket: #1903: fish: mc hangs on any operation with files containing "'"(quote)
2009-12-26 23:28:48 +02:00
Enrico Weigelt, metux IT service
9f99a8aa9a Merge branch '1901_php_syntax_optimization'
* 1901_php_syntax_optimization:
  Ticket #1901 (php.syntax optimization)
2009-12-26 22:06:13 +01:00
Ilia Maslakov
83ce7410ea Ticket #1901 (php.syntax optimization)
little otpimization of php.syntax

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-26 22:06:01 +01:00
Yury V. Zaytsev
15f7c15655 Merge branch '1904_spec_bump_epoch'
* 1904_spec_bump_epoch:
  Ticket #1904: Bump epoch because of braindead versioning scheme used.
2009-12-25 22:55:23 +01:00
Yury V. Zaytsev
81324fc2ab Ticket #1904: Bump epoch because of braindead versioning scheme used.
* Bump epoch, because otherwise users wouldn't be able to upgrade
properly from older RPMs. The versioning scheme has to be revisited.

* Add changelog entry.

* Small corrections to the changelog.
2009-12-25 22:41:41 +01:00
Sergei Trofimovich
80fc7fe9ed Ticket: #1903: fish: mc hangs on any operation with files containing "'"(quote)
During last major escape transition "foo" -> properly_escaped_foo we forgot
to add "'" to list of specialcased symbols. This leads to mc hangup when you
try to do something with files/dirs, containing that symbol.

Adding it!

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-25 20:42:23 +02:00
Slava Zanko
1dae30487e update AUTHORS file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 20:35:38 +02:00
Slava Zanko
4986aaeb88 Update NEWS file for 4.7.0 release
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 20:26:51 +02:00
Slava Zanko
051bb3b571 Merge branch '1845_code_cleanup'
* 1845_code_cleanup:
  change type of some parameters from int to long.
2009-12-25 19:44:55 +02:00
Vit Rosin
280d7e88f9 change type of some parameters from int to long.
Changed functions:
 * edit_count_lines()
 * edit_move_forward()
 * edit_move_backward()

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 19:44:34 +02:00
Andrew Borodin
9c9bb27171 Fixed Russian translation
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-25 20:43:28 +03:00
Slava Zanko
a6d44494ca Update translations before release by command "make -C po update-po"
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 19:13:09 +02:00
David Martin
16b53e06c1 Final cleaup for Spanish translations
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 19:11:35 +02:00
Andrew Borodin
7b85a9292f Merge branch '1867_fish_dont_add_username'
* 1867_fish_dont_add_username:
  Ticket #1867: fish: omit '-l' parameter for userless URLs.
2009-12-25 18:57:43 +03:00
Yury V. Zaytsev
cb0d7a36ff Ticket #1867: fish: omit '-l' parameter for userless URLs.
Add the user name to the ssh command line only if it's not the same as
the local logged-in user. OpenSSH will take it as a default value
anyway, but otherwise we'll override ~/.ssh/config settings which might
be not what the user wants.

* Factored out vfs_get_local_username()
* Moved default-user detection to fish subsystem (URL_USE_ANONYMOUS)
* Slight modifications to the comments and wording
2009-12-25 18:57:27 +03:00
Sergei Trofimovich
8abe72112a vfs: ftp: fix build breakage on absent CANON_PATH_RMDBLDT
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-25 17:18:50 +02:00
Mikhail S. Pobolovets
45642c5110 Cabal syntax file introduced.
Cabal is build system used in the Haskell world.
2009-12-25 16:28:44 +02:00
Slava Zanko
f780c31e56 Merge branch '1691_debian_man_patches'
* 1691_debian_man_patches:
  Fix for ticket #1691:
2009-12-25 15:56:10 +02:00
Slava Zanko
e8b41315ac Merge branch '1828_ftpfs_improved_symlink_handling'
* 1828_ftpfs_improved_symlink_handling:
  Ticket #1828: Improved symlink handling in ftpfs
2009-12-25 15:54:43 +02:00
Slava Zanko
4f36622725 Ticket #1828: Improved symlink handling in ftpfs
Originally from: http://mail.gnome.org/archives/mc-devel/2005-April/msg00035.html

The routines `vfs_s_find_entry_linear()' and `vfs_s_find_entry_tree()'
call `canonicalize_pathname()' on entry. This routine eats `..' path
components in certain cases. In case of ftpfs this is not desired -
the path should be kept as is since the code in direntry.c doesn't have
enough knowledge of the directory structure on the remote end.

Assume that
there is a path like this on the remote server

    /path1/path2/path3

The `path2' component is a symlink to some directory and `path3' is a
symlink stored in `path2' which is relative to `path2' i.e.

path2

    path3 -> ../some/other/path

Now, the code in direntry.c will determine that `path3' is a symlink and
will try to resolve (vfs_s_resolve_symlink) it by passing the following path

    /path1/path2/../some/other/path

to `vfs_s_find_entry_linear' . As I've said above this routine calls
`canonicalize_pathname' on entry which will modify the path like this:

    /path1/some/other/path

Now this is clearly wrong since `path2' is a symlink and it should be
resolved first. In the case of ftpfs the code in direntry.c doesn't have
enough knowledge about physycal directory layout on the remote filesystem
so it shouldn't try to canonicalize the path. The path should be left as
is and passed to the remote end for processing.

Fix issue:
Changed function canonicalize_pathname (as fact, renamed to custom_canonicalize_pathname)
In this function added ability to partial canonicalize of pathname.
And some functions from vfs/direntry.c calls custom_canonicalize_pathname without
removal of '..' stuff.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 15:53:48 +02:00
Yury V. Zaytsev
714a5bcdaf Fix for ticket #1691:
Set of patches that correct minor mistakes and mistypes in the man files
from Denis Briand. Thanks!

Fixes suggested by Slava Zanko and Andrew Borodin: always use
@sysconfdir@/mc instead of hardcoded /etc/mc for configuration pathes in
mans.
2009-12-25 14:33:54 +01:00
Ilia Maslakov
00b94eec5d Merge branch '1724_missmatched_macro_hotkeys'
* 1724_missmatched_macro_hotkeys:
  Ticket #1724 (mismatched hotkeys)
2009-12-25 15:11:41 +03:00
Ilia Maslakov
b03b234085 Ticket #1724 (mismatched hotkeys)
fixed mismatched hotkeys EditBeginRecordMacro, EditEndRecordMacro

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-25 15:10:23 +03:00
Slava Zanko
dedb6a9a44 Merge branch '1663_save_panels_state'
* 1663_save_panels_state:
  Ticket #1663: Panels state saves and restores despite disabled 'Auto save setup'
2009-12-25 13:23:56 +02:00
Andrew Borodin
52ba225bc5 Merge branch '1876_sigint_signal_handling'
* 1876_sigint_signal_handling:
  Ticket #1876: use Ctrl-g key to generate SIGINT signal.
2009-12-25 12:01:35 +00:00
Andrew Borodin
a20ebb3818 Ticket #1876: use Ctrl-g key to generate SIGINT signal.
Ctrl-g instead of Ctrl-c is used now to generate SIGINT signal.
SIGINT signal generating for MC/NCurses library is enabled now.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-25 12:01:18 +00:00
Slava Zanko
4f88a84526 Ticket #1663: Panels state saves and restores despite disabled 'Auto save setup'
Added option 'auto_save_setup_panels' into [Midnight-Commander] section of ini-file.
If no specified, value of this option is equal to value of 'auto_save_setup' option.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-25 13:23:05 +02:00
Enrico Weigelt, metux IT service
8cfffc5bfa Merge remote branch 'mco/272_extfs_amazon_s3'
* mco/272_extfs_amazon_s3:
  Ticket #272: Extfs: added S3 backend by Jakob Kemi
2009-12-24 22:29:01 +01:00
Jakob Kemi
6908e6fc48 Ticket #272: Extfs: added S3 backend by Jakob Kemi 2009-12-24 22:26:14 +01:00
Andrew Borodin
48aaef13d8 Merge branch '1883_winput_handle_0xff_char'
* 1883_winput_handle_0xff_char:
  Ticket #1883: fixed handling of 0xff character in WInput widget.
2009-12-24 22:18:30 +03:00
Andrew Borodin
bce9bc5027 Ticket #1883: fixed handling of 0xff character in WInput widget.
The 0xff character is valid character in CP1251 codepage,
therefore the proper unsigned extension of char to int
is required in stuff() function to avoid the 0xff as -1
interpretation in handle_char() function.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-24 22:17:31 +03:00
Vsevolod Novikov
bd67eb857c updated python.syntax
Author: Vsevolod Novikov <nnseva@mail.ru>

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-24 14:41:00 +03:00
Slava Zanko
bc7abbecbe Merge branch '1396_with_search_engine'
* 1396_with_search_engine:
  Fixed incorrect showing name of search library in summary screen
  Ticket #1396: Fixed logic of processing '--with-search-engine' configure option.
2009-12-24 10:39:51 +02:00