Commit Graph

9432 Commits

Author SHA1 Message Date
Slava Zanko
a0930b7268 Merge branch '1796_fix_passive'
* 1796_fix_passive:
  Ticket #1796: FTPFS does not work in active mode.
2009-12-15 13:26:19 +02:00
Slava Zanko
c0ebaf5bd3 Ticket #1796: FTPFS does not work in active mode.
Fix commit for work in passive ftp-mode.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-15 13:26:03 +02:00
Enrico Weigelt, metux IT service
58b1609559 Merge remote branch 'mco/1787_remove_stdlib_h_check'
* mco/1787_remove_stdlib_h_check:
  Ticket #1787: remove obsolete checks for <stdlib.h>
2009-12-14 22:02:07 +01:00
Enrico Weigelt, metux IT service
e9b01c6400 Ticket #1787: remove obsolete checks for <stdlib.h> 2009-12-13 05:29:35 +01:00
Enrico Weigelt, metux IT service
a7deeaa8fc Merge branch '1783_remove_bzero_decl'
* 1783_remove_bzero_decl:
  Ticket #1783: remove own declaration of bzero()
2009-12-12 21:07:12 +01:00
Enrico Weigelt, metux IT service
294f58e85d Ticket #1783: remove own declaration of bzero() 2009-12-12 21:06:40 +01:00
Enrico Weigelt, metux IT service
67f33e767a Merge branch '1782_remove_ftruncate_decl'
* 1782_remove_ftruncate_decl:
  Ticket #1782: Remove own declaration of ftruncate()
2009-12-12 21:02:06 +01:00
Enrico Weigelt, metux IT service
c99db81350 Ticket #1782: Remove own declaration of ftruncate() 2009-12-12 21:01:46 +01:00
Enrico Weigelt, metux IT service
53483ba170 Merge branch '1784_remove_strdup_decl'
* 1784_remove_strdup_decl:
  Ticket #1784: remove own declaration of strdup
2009-12-12 20:59:48 +01:00
Enrico Weigelt, metux IT service
996029c3e6 Ticket #1784: remove own declaration of strdup 2009-12-12 20:59:08 +01:00
Ilia Maslakov
3d8938a468 Merge branch '1628_editor_CJK_fix'
* 1628_editor_CJK_fix:
  Merged code of two functions edit_move_up() and edit_move_down()
  Ticket #1628 (fix for drawing CJK chars)
2009-12-10 09:31:07 +03:00
Slava Zanko
7dc3b43a20 Merged code of two functions edit_move_up() and edit_move_down()
into one function with additional parameter.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-10 09:28:31 +03:00
Ilia Maslakov
6ed3909280 Ticket #1628 (fix for drawing CJK chars)
fixed: drawing CJK character as '...'.
    Sometimes the CJK character gets replaced by three inverse dots.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-10 09:26:58 +03:00
Andrew Borodin
1f900afa5b Fixed Russian translation.
Thanks to Victor Homyakov.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-09 20:20:51 +03:00
Andrew Borodin
f5bbeeda19 Merge branch '1536_utf8_sort_files'
* 1536_utf8_sort_files:
  Ticket #1536: fix of case insensitive file sorting in UTF-8 locales.
2009-12-09 20:12:32 +03:00
Andrew Borodin
bc82403d07 Ticket #1536: fix of case insensitive file sorting in UTF-8 locales.
In UTF-8 locales, with case sensitive sort files are sorted properly:

00050.jpg
001-gepard.jpg
0175ep.jpg
027.jpg
060912.jpg
win.jpg
z1.jpg

but if in case insensitive sort, they get mixed up
and files with number in their name are sorted badly:

001-gepard.jpg
027.jpg
00050.jpg
0175ep.jpg
060912.jpg
win.jpg
z1.jpg

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-09 20:12:17 +03:00
Ilia Maslakov
31a46ce325 Merge branch '1839_vertical_block_delete_fix'
* 1839_vertical_block_delete_fix:
  Ticket #1839 (troubles with vertical selection: delete, move, etc.)
2009-12-09 15:01:36 +03:00
Ilia Maslakov
dd5b7c8651 Ticket #1839 (troubles with vertical selection: delete, move, etc.)
fixed: 'eval_marks' for correct vertical block delete.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

    fixed edit_block_delete, edit_delete_column_of_text for correct delete vertical block
    fixed cursor position after delete block

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-09 14:58:02 +03:00
Ilia Maslakov
1a4455cc94 Merge branch '1809_incorrect_cursor_movement'
* 1809_incorrect_cursor_movement:
  Ticket #1809 (incorrect calculanion char width in 8-bit locales)
2009-12-09 14:50:03 +03:00
Ilia Maslakov
595eb7e3f0 Ticket #1809 (incorrect calculanion char width in 8-bit locales)
fixed: cursor placement and movements in non-ascii (cyrillic) UTF-8 files
    in 8-bit (KOI8-R) locales
    fixed incorrect width calculation in 7-bit codeset

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>

    Minor optimization of edit_move_forward3() function.
    Also fixed build with --disable-charset option.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-09 14:42:51 +03:00
Richard van der Luit
d807f95bce Updated Dutch translation file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-08 21:12:45 +02:00
Slava Zanko
e1a4559452 Merge branch '1450_fish_dir_load_fix'
* 1450_fish_dir_load_fix:
  Ticket #1450: FISH: timestamps don't show correctly
2009-12-07 17:59:56 +02:00
Slava Zanko
3a9f0024da Ticket #1450: FISH: timestamps don't show correctly
Fixed forgotten variable substitution: now substitute value of variable instread of variable name

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-07 17:59:44 +02:00
Slava Zanko
7f82f32404 Merge branch '1858_segfault_in_search'
* 1858_segfault_in_search:
  Ticket #1858: Segmentation fault when search in different encodings
2009-12-07 13:47:36 +02:00
Slava Zanko
2887d5c710 Ticket #1858: Segmentation fault when search in different encodings
Test case:
1. Make two files with same content but with different encodings (for example, in UTF-8 and KOI8-R);
2. Open UTF-8 file for editing. Press Alt+e and set 'UTF-8' encoding;
3. Search someting
4. exit from editor and open file with 'KOI8-R' encoding;
5. You must see a dots. Now press shift+F7 (continue search);
6. Segfault here

Fix issue:
Now function mc_search__recode_str() returns newly allocated string in any case

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-07 13:45:25 +02:00
Andrew Borodin
2c7f684908 Merge branch '1844_edit_user_menu_goto_refactoring'
* 1844_edit_user_menu_goto_refactoring:
  refresh screen any way
  Ticket #1844: refactoring of goto in editor user_menu() function.
2009-12-06 10:23:44 +03:00
Ilia Maslakov
2ae5412fb7 refresh screen any way
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-06 10:20:35 +03:00
Andrew Borodin
8eb860eb48 Ticket #1844: refactoring of goto in editor user_menu() function.
Refactoring of uneeded goto in user_menu() function in editor.
Thanks to Vit Rosin for originl patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-06 10:20:35 +03:00
Ivan Masár
f574b9be4e Updated Slovak (sk) translation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-04 11:38:18 +02:00
Ilia Maslakov
fa24b65893 Merge branch '1809_editor_incorrect_calc_position'
* 1809_editor_incorrect_calc_position:
  Ticket #1809 (editor: incorrect cursor positioning)
2009-12-02 18:31:46 +00:00
Ilia Maslakov
99f0e50aba Ticket #1809 (editor: incorrect cursor positioning)
fixed: cursor positioning after non-printeble char (in 8-bit encoding)
    added: char convertion for correct cursor movement

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-02 18:28:22 +00:00
Slava Zanko
553bef687e Merge branch '1796_FTPFS_fail_active_mode'
* 1796_FTPFS_fail_active_mode:
  Minor fix for mc_log_mark() macro.
  Ticket #1796: FTPFS does not work in active mode
2009-12-02 16:05:48 +02:00
Slava Zanko
9808eed46a Minor fix for mc_log_mark() macro.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-02 16:05:26 +02:00
Slava Zanko
d712d2638e Ticket #1796: FTPFS does not work in active mode
Fixed error with active mode of ftpfs.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-02 16:05:26 +02:00
Slava Zanko
09f962f5a6 Merge branch '1798_fix_detect_lzma_files'
* 1798_fix_detect_lzma_files:
  Ticket #1798: Not enough magic read before checking for lzma files
2009-12-02 16:03:36 +02:00
Slava Zanko
c9978ff155 Ticket #1798: Not enough magic read before checking for lzma files
In the function get_compression_type() in src/util.c, only 5 bytes of the
file are read into the magic array, but the test for lzma files checks the
first 6 bytes in the magic array.

Fix issue:
now reads 6 bytes for correct recognize LZMA-files.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-02 16:03:07 +02:00
Oleksandr Natalenko
9736afb521 Updated Ukrainian translation for pre4
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-02 12:01:15 +02:00
Andrew Borodin
548552ec63 Merge branch '1781_out_of_bounds'
* 1781_out_of_bounds:
  Ticket #1781: array index is out of bounds.
2009-12-02 10:01:16 +03:00
Andrew Borodin
92291381e3 Ticket #1781: array index is out of bounds.
Fixed array index in sort_key_name_conv_tab() function.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-02 10:01:01 +03:00
Slava Zanko
ca8a009126 Merge branch '1450_fish_timestamps'
* 1450_fish_timestamps:
  Fix broken filenames and timestamps on really poor busybox devices.
  Ticket #1450: FISH: timestamps don't show correctly
2009-12-01 21:49:38 +02:00
Slava Zanko
4fc08a729e Fix broken filenames and timestamps on really poor busybox devices.
This good patch for FISH'ing to devices like my D-Link-500T :)

'busybox ls -lan'  and native 'ls -lan' is different. For example

$ busybox ls -lan /dev

drwxr-xr-x    1 0  0  0     0      0 Jan  1  1970 .
drwxrwxrwx    1 0  0  0     0      68 Dec 12  2007 ..
crw-------    1 0  0  0     0 8,   0 Jan  1  1970 .devfsd
crw-------    1 0  0  0     0 5,   1 Jan  1 12:01 console
crw-rw-rw-    1 0  0  0     0 1,   7 Jan  1  1970 full
...

and
$ ls -lan /dev
drwxr-xr-x  12 0   0     4340 Ноя 20 09:33 .
drwxr-xr-x  23 0   0     4096 Июл 29  2004 ..
crw-rw----+  1 0   0  14,  12 Июл 29  2004 adsp
crw-------   1 0   0  10, 175 Июл 29  2004 agpgart
crw-rw----+  1 0   0  14,   4 Июл 29  2004 audio

output of 'busybox ls' have two additional columns, therefore
names on filesystem shows like:
/1 12:00 proc
/1 1970 dev
/12 2007 bin
/12 2007 etc
/12 2007 lib
/12 2007 sbin
...

This patch will fix it behavior.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-01 21:49:12 +02:00
Alexander Moiseenko
11928eeff0 Ticket #1450: FISH: timestamps don't show correctly
Test case:
1) Make FISH-connect to some host;
2) sort files by modification time;
3) will see older files (from previous year) as new files

For check, connect to same host and enter in command line:

ls -lt

Thanks for bugreport to Alexander Glyzov.

Fix issue:
Because first part of FISH-ls script is Perl script.
But localtime function returns dates like:
Fri Sep 18 10:40:28 2009

But in utilvfs.c is written: So both year and time is not allowed.
This commit fixed write format of date.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-01 21:49:12 +02:00
Slava Zanko
92247810e5 Merge branch '407_ctrl_w_not_delete_line'
* 407_ctrl_w_not_delete_line:
  Ticket #407: C-w does not delete whole command line
2009-12-01 16:24:59 +02:00
Stan. S. Krupoderov
c1426b90ff Ticket #407: C-w does not delete whole command line
Fix set mark on delete_region

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-01 16:24:43 +02:00
Andrew Borodin
c68dd0e7bd Fixed Russian translation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-11-30 22:07:25 +03:00
Andrew Borodin
8610caa947 Merge branch '1848_spec'
* 1848_spec:
  Ticket #1848: Rewritten and simplified static build procedure for legacy distros.
2009-11-30 21:19:28 +03:00
Yury V. Zaytsev
d8531dbbb5 Ticket #1848: Rewritten and simplified static build procedure for legacy distros.
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2009-11-29 16:19:54 +03:00
Slava Zanko
d97f55dec0 Merge branch '1659_darker_color_style'
* 1659_darker_color_style:
  Ticket #1659: Darker color style
2009-11-27 09:45:16 +02:00
Tomasz Pala
2e97cf7fb7 Ticket #1659: Darker color style
Some fixies for skin.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-11-27 09:45:01 +02:00
Sergei Trofimovich
a04bf73ab9 Syntax: added '.hh' and '.hpp' file extensions as C++ sources
'.hh' are used in projects, such as blackbox
'.hpp' are quite popular everywhere

Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
2009-11-26 12:16:13 +02:00