Commit Graph

9356 Commits

Author SHA1 Message Date
Andrew Borodin
d3e91b0711 Fixed forgotten call of va_end() in mc_log().
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-16 11:10:41 +02:00
Andrew Borodin
34e6b6c036 src/boxes.c (configure_vfs): fixed #ifdef directive.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
7670235dfc m4.include/mc-cflags.m4: added -fdiagnostics-show-option (exact warning option)
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
7fcef13e61 configure.ac: guard $CFLAGS with "" in tests
Fixes ./configure error:
../mc/configure: line 42709: test: too many arguments

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
053cd1fc52 m4.include/mc-cflags.m4: sorted CFLAGS (no flags were added or removed)
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
68417a334f cflags: enable -Wformat in maintainer mode
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
981c19b651 fix formatarg: pass ll instead of passing off_t as "%lld" parameter
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Sergei Trofimovich
4f2079fec7 clang: fixed useful warnings (-Wformat related)
../../mc/edit/editcmd.c:2519:50: error: field precision should have type 'int', but argument has type 'gsize' (aka 'unsigned long') [-Wformat]
    match_expr = g_strdup_printf ("(^|\\s+|\\b)%.*s[^\\s\\.=\\+\\[\\]\\(\\)\\,\\;\\:\\\"\\'\\-\\?\\/\\|\\\\\\{\\}\\*\\&\\^\\%%\\$#@\\!]+", word_len, bufpos);
                                                 ^                                                                                         ~~~~~~~~
../../mc/edit/editcmd.c:2700:38: error: field precision should have type 'int', but argument has type 'gsize' (aka 'unsigned long') [-Wformat]
    match_expr = g_strdup_printf ("%.*s", word_len, bufpos);
                                     ^    ~~~~~~~~
2 diagnostics generated.
make[2]: *** [editcmd.o] Error 1
make[2]: Target `all' not remade because of errors.
../../../mc/src/mcconfig/common.c:71:74: error: format string is not a string literal (potentially insecure) [-Wformat-security]
        g_propagate_error (error, g_error_new (mc_main_error_quark() ,0, strerror(errno)));
                                                                         ^~~~~~~~~~~~~~~
../../../mc/src/mcconfig/common.c:83:74: error: format string is not a string literal (potentially insecure) [-Wformat-security]
        g_propagate_error (error, g_error_new (mc_main_error_quark() ,0, strerror(errno)));
                                                                         ^~~~~~~~~~~~~~~
2 diagnostics generated.
make[3]: *** [libmcconfig_la-common.lo] Error 1
make[3]: Target `all' not remade because of errors.
../../mc/src/main.c:2165:41: error: format string is not a string literal (potentially insecure) [-Wformat-security]
        message (D_ERROR, _("Warning"), error->message);
                                        ^~~~~~~~~~~~~~
1 diagnostic generated.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Andrew Borodin
3e12139a94 Editor: some code clean up.
Removed unneeded goto, return, #ifdef.
Type accuracy.
Indentation.
Minor optimization.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-12-16 11:10:41 +02:00
Andrew Borodin
06311a3e40 Refactoring of editor initialization.
Since button bar is a part of editor dialog, its initialization
was moved from WIDGET_INIT stage to DLG_INIT one.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-16 11:10:40 +02:00
Slava Zanko
71bb255b2c Refactoring of edit_replace_cmd__conv_to_display() and edit_replace_cmd__conv_to_input() functions.
Now these functions will return newly allocated string in any case.
As third-side effect, fixed memory leak with '--disable-charset' configure option.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-16 11:10:40 +02:00
Andrew Borodin
c57bdc79ba Fixed typo.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-16 11:10:40 +02:00
Ilia Maslakov
af79d7b3ef fixed uninitialised editor buffers (detected by valgrind) thnx andrew_b
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-16 11:10:40 +02:00
Andrew Borodin
d2e096044d Some speed optimization of editor.
Functions that are called only in one place have been maken inline.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-12-16 11:10:40 +02:00
Slava Zanko
771a2958ad configure.ac: Optimization of building 'CFLAGS' variable.
Now user-defined CFLAG (from envirovement) have higest priority before
internal definitions.

Also, patch have change for respect code optimization options from user.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-16 11:10:40 +02:00
Oswald Buddenhagen
4bc224dd3c Ticket #1845: Code cleanup before 4.7.0 release.
Little optimization for src/filehighlight/get-color.c:c_fhl_is_stale_link() function.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-12-16 11:10:15 +02:00
Ilia Maslakov
a45d0ba6c2 Merge branch '1789_remove_setuid_getuid_checks'
* 1789_remove_setuid_getuid_checks:
  Ticket #1789: Removed obsolete checks for setuid(), getuid(), etc
2009-12-15 18:15:58 +03:00
Enrico Weigelt, metux IT service
d579bb7877 Ticket #1789: Removed obsolete checks for setuid(), getuid(), etc
Removed obsolete checks for setuid(), getuid(), etc

Signed-off-by: Enrico Weigelt <weigelt@metux.de>
2009-12-15 18:13:40 +03:00
Ilia Maslakov
72c30eda5f Merge branch '1788_remove_pwd_h_grp_h_check'
* 1788_remove_pwd_h_grp_h_check:
  Ticket #1788: remove obsolete checks for <pwd.h> and <grp.h>
2009-12-15 18:04:37 +03:00
Enrico Weigelt, metux IT service
551ac003a4 Ticket #1788: remove obsolete checks for <pwd.h> and <grp.h>
remove obsolete checks for <pwd.h> and <grp.h>

Signed-off-by: Enrico Weigelt, metux IT service <weigelt@metux.de>
2009-12-15 18:00:02 +03:00
Ilia Maslakov
18c5f4e315 Merge branch '1786_remove_sys_wait_h_check'
* 1786_remove_sys_wait_h_check:
  Ticket #1786: remove obsolete check for <sys/wait.h>
2009-12-15 17:21:46 +03:00
Enrico Weigelt, metux IT service
2b4f8103ce Ticket #1786: remove obsolete check for <sys/wait.h>
remove obsolete check for <sys/wait.h>
    This file is C standard, so no explicit check necessary.

Signed-off-by: Enrico Weigelt <weigelt@metux.de>
2009-12-15 17:20:36 +03:00
Ilia Maslakov
a011fcbcca Merge branch '1724_mismatched_hotkeys'
* 1724_mismatched_hotkeys:
  Ticket #1724 (mismatched hotkeys)
2009-12-15 14:57:23 +03:00
Ilia Maslakov
8c2e8c9702 Ticket #1724 (mismatched hotkeys)
fixed mismatched hotkeys EditBeginningOfText, EditEndOfText
    EditBeginPage, EditEndPage (mc.keymap.default, mc.keymap.emacs)

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2009-12-15 14:54:52 +03:00
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