Commit Graph

12348 Commits

Author SHA1 Message Date
Slava Zanko
4b1f94e873 Direct commit in master: fix bug with a directory deletion
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-12 15:15:57 +03:00
Slava Zanko
92817a9b60 Merge branch '3016_extfs_segfault'
* 3016_extfs_segfault:
  Ticket #3016: Segfault while entering into extfs archive
2013-06-12 12:02:11 +03:00
Slava Zanko
56520fda0f Ticket #3016: Segfault while entering into extfs archive
Current master (4.8.8-49-g6b64835) segfaults while entering into any extfs archive (zip, rar, etc).
Bad commit is 2640b21bb9.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-12 12:01:33 +03:00
Slava Zanko
fef50bf629 Merge branch '3011_mc_gpm_and_xterm'
* 3011_mc_gpm_and_xterm:
  Ticket #3011: mc under x11 problems with mouse or hang due gpm
2013-06-11 12:10:58 +03:00
André Barros
9699d5dd69 Ticket #3011: mc under x11 problems with mouse or hang due gpm
mc may not detect the gpm mouse under X11 on many x terminals when running together with tmux or screen.

On some cases it can even hang.

It's a small patch to the gpm maintainer to improve its checking.
Seems there is a need also to a small change on mc.

Now everything is working perfectly.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-10 20:08:56 +03:00
Andrew Borodin
ffc536fb5d Merge branch '3001_subshell_prompt_fix'
* 3001_subshell_prompt_fix:
  Cleanup: remove unused 'prompt_pos' variable.
  (strip_ctrl_codes): type accuracy.
  Ticket #3001: fix read and update of subshell prompt.
2013-06-09 16:18:14 +04:00
Andrew Borodin
74ed317f35 Cleanup: remove unused 'prompt_pos' variable.
(do_subshell_chdir): remove 'reset_prompt' argument because of removed
'prompt_pos'.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:55 +04:00
Andrew Borodin
5b1982a6bb (strip_ctrl_codes): type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:55 +04:00
Andrew Borodin
f6684c638d Ticket #3001: fix read and update of subshell prompt.
The bug was introduced in e35f044ccd.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-08 18:06:54 +04:00
Andrew Borodin
61d230e494 Merge branch '3000_incorrect_filesize' 2013-06-07 13:07:21 +04:00
Andrew Borodin
d83902e7fc (size_trunc_len): minor optimization.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 13:06:51 +04:00
Andrew Borodin
ceff7c5922 size_trunc_len() generates incorrect result in some cases.
Revert "(size_trunc_len): support automatic maximum unit for specified size."
This reverts commit ef94b84eaf.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 12:12:34 +04:00
Andrew Borodin
7b5b41147d Ticket #3000: incorrect file size is reported in copy/move overwrite query dialog.
(overwrite_query_dialog): adjust file size.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-07 12:11:14 +04:00
Slava Zanko
6b64835a7e Merge branch '2990_cleanup'
* 2990_cleanup: (32 commits)
  Remove LC_ALL from info_size. INFO file generate without LC_ALL e.g. in current locale. Size must be computed with same locale, otherwise INFO file will be chopped of
  mceditor: last_bracket: make member of WEdit.
  Use "'" instead of "`" for messages and comments quoting.
  Search callbacks should return mc_search_cbret_t not int.
  Fix filename for msppt in ext.d/doc.sh: use $MC_EXT_FILENAME not %f.
  Fix info for ogg files in sound.sh
  Minor otimization of syntax highlightimg engine:
  (compare_word_to_right): use correct upper boundary of scanned text.
  option_whole_chars_search: unsed variable. Remove it and related code.
  (edit_update_screen): fix of editor frame drawing.
  src/editor/editcmd.c: remove unneeded include layout.h.
  Fix documentation: use actual menu item names.
  (edit_about): update year.
  (vfs_get_encoding): optimization and enhancement:
  (button_set_text): update value of WButton::hotpos.
  Use tty_draw_box instead of draw_box() to draw frames.
  (smbfs_fake_share_stat): don't access to free'd memory.
  Remove vfs_path_to_str() function for avoid often memory allocations.
  Use G_N_ELEMENTS macro to calculate of array size.
  WEdit::labels is unused. Remove.
  ...
2013-06-03 14:21:31 +03:00
Boris Savelev
426f114a93 Remove LC_ALL from info_size.
INFO file generate without LC_ALL e.g. in current locale. Size must be computed with same locale, otherwise INFO file will be chopped of
2013-06-03 14:21:03 +03:00
Andrew Borodin
6b0ee515ad mceditor: last_bracket: make member of WEdit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:03 +03:00
Andrew Borodin
e7dc599e42 Use "'" instead of "`" for messages and comments quoting.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:03 +03:00
Andrew Borodin
d0955f3793 Search callbacks should return mc_search_cbret_t not int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:03 +03:00
Gabriel VLASIU
41a168ab4c Fix filename for msppt in ext.d/doc.sh: use $MC_EXT_FILENAME not %f.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:03 +03:00
Alessio Ababilov
ed0bd98756 Fix info for ogg files in sound.sh
ogginfo should be shown for MC_EXT_FILENAME like other cases.
Using MC_EXT_SELECTED handles filenames with spaces incorrectly.

Signed-off-by: Alessio Ababilov <ilovegnulinux@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
f89d862241 Minor otimization of syntax highlightimg engine:
ret rid of extra copying of WEdit::rule.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
7b574f1dbc (compare_word_to_right): use correct upper boundary of scanned text. 2013-06-03 14:21:02 +03:00
Andrew Borodin
412095a562 option_whole_chars_search: unsed variable. Remove it and related code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
1e985bc7df (edit_update_screen): fix of editor frame drawing.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
b9c0b56928 src/editor/editcmd.c: remove unneeded include layout.h.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
7e89f48f0b Fix documentation: use actual menu item names.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
57bb2b87c2 (edit_about): update year.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
3662b84ba1 (vfs_get_encoding): optimization and enhancement:
* get rid of extra memory duplication;
  * support of recursive search of correct encoding;
  * add tests.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
6b90a1468a (button_set_text): update value of WButton::hotpos.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
6d31d85f0d Use tty_draw_box instead of draw_box() to draw frames.
* (draw_box): remove.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:02 +03:00
Andrew Borodin
a35ee6aebc (smbfs_fake_share_stat): don't access to free'd memory.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 14:21:01 +03:00
Slava Zanko
2640b21bb9 Remove vfs_path_to_str() function for avoid often memory allocations.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 14:21:01 +03:00
Andrew Borodin
31bacf56c9 Use G_N_ELEMENTS macro to calculate of array size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:14 +03:00
Andrew Borodin
9f80eda26e WEdit::labels is unused. Remove.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:14 +03:00
Slava Zanko
463d41687c Ticket #3003: man pages should contain charset
man pages should contain charset for to display properly in other encodings.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Slava Zanko
57116bca6e Update the 'release procedure' file.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Slava Zanko
1c6d859629 Reorder files in maint/ subdirectory.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Slava Zanko
80c8d58003 remove the include duplicates from source files
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Slava Zanko
88d7c9b91b Move an utility for found the include duplicates to maint/find-dup-includes subdirectory.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Slava Zanko
a2c9c0309a Remove unneded utilities from maint/ directory.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:14 +03:00
Adrian Bunk
73588a1a59 Ticket #2998: configure.ac cleanups.
Remove tests whose results are not used:
  * AC_CHECK_HEADERS of unistd.h, fcntl.h, sys/time.h, sys/types.h
  * AC_HEADER_MAJOR
  * AC_HEADER_TIME
  * AC_HEADER_DIRENT
  * AC_CHECK_FUNCS of isascii, statfs, sysconf, tcgetattr, tcsetattr, ftruncate
  * AC_FUNC_STRCOLL

AC_C_CONST is obsolete, today it is safe to assume all C compilers
support at least C89.

The INTERACTIVE UNIX that needed AC_ISC_POSIX is long dead.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:14 +03:00
Andrew Borodin
6d172837f0 (subshell_name_quote): use GString for string forming.
(do_subshell_chdir): changed related to modified subshell_name_quote().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-03 10:58:13 +03:00
Slava Zanko
ce2f642093 Add maint/sync-transifex/README.txt file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:13 +03:00
Slava Zanko
650517bba1 Add syncronization of po-files with Transifex.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:13 +03:00
Slava Zanko
97097d1667 Move all templates from maint to maint/templates
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:13 +03:00
Slava Zanko
b0876fb044 Ticket #2990: Prepare for release mc-4.8.9
Change maint/doctest utility to run under maint directory

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-06-03 10:58:13 +03:00
Slava Zanko
1df77c409e Merge branch '2988_ignore_unknown_esc_sequences'
* 2988_ignore_unknown_esc_sequences:
  When we see an unknown sequence, it is not enough to drop already received part - there can be more of it coming over e.g. a serial line.
  This change prevents misinterpreting an unknown ESC sequence's tail as a garbage input. To reproduce, run "sleep 3" and hold down Down_Arrow key until sleep runs. With debugging log enabled, the following can be seen:
  Ticket #2988: When an unknown key is pressed, it is interpreted as garbage.
2013-05-23 11:42:56 +03:00
Denys Vlasenko
664e7d31b6 When we see an unknown sequence, it is not enough
to drop already received part - there can be more of it
coming over e.g. a serial line.

To prevent interpreting it as a random garbage,
eat and discard all chars that follow.
Small, but non-zero timeout is needed to reconnect
escape sequence split up by a serial line.

Before this change, Ctrl-Alt-Shift-Right_Arrow generates "1;8C"
bogus "input" in MC on my machine; after the change,
nothing is generated.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-05-23 11:42:02 +03:00
Denys Vlasenko
ecd3b62b8e This change prevents misinterpreting an unknown ESC sequence's
tail as a garbage input. To reproduce, run "sleep 3" and
hold down Down_Arrow key until sleep runs.
With debugging log enabled, the following can be seen:

entered get_key_code(no_delay:0)
 c=tty_lowlevel_getch()=27
 push_char(27) !0
 c=xgetch_second()=91
 push_char(91) !0
 2 c=tty_lowlevel_getch()=66
 push_char(66)
 seq_buffer[0]:27   <---- the saved Down Arrow sequence "ESC [ B"
 seq_buffer[1]:91
 seq_buffer[2]:66
 seq_buffer[3]:0
pending_keys!=NULL. m=-1
d=*pending_keys++=27
d=ALT(*pending_keys++)=ALT(91)=8283
^^^^^^^^^^^^^^^^^^^^^^^ we misinterpret "ESC [ B" as "ESC ["
return correct_key_code(8283)
entered get_key_code(no_delay:0)
pending_keys!=NULL. m=-1
d=*pending_keys++=66
^^^^^^^^^^^^ we think user pressed "B"
return correct_key_code(66)

With this patch, no bogus "input" is generated.

Longer unknown sequences need an additional fix, coming next.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-05-23 11:42:02 +03:00
Denys Vlasenko
77cfaf03cb Ticket #2988: When an unknown key is pressed, it is interpreted as garbage.
keyboard input: simplify code, no logic changes

This change slightly simplifies and rearranges the code
in get_key_code(), reduces indentation levels there,
adds a few comments. The logic remains the same.

This is a preparatory patch for subsequent changes.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-05-23 11:41:25 +03:00