Commit Graph

12190 Commits

Author SHA1 Message Date
Andrew Borodin
5e070286b1 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 16:22:23 +04:00
Andrew Borodin
d8f970c503 Merge branch '2888_cleanup'
* 2888_cleanup: (34 commits)
  (exec_get_export_variables_ext): use g_new0() for stable test results.
  Implement quick and easy disable of xdg-open usage.
  Sync with gnulib 40f82767840187c20051ca99385f75a42f92de99.
  Add extra checks in macro engine.
  Ticket #2935: update uc1541 extfs plug-in up to version 2.5.
  (del_widget): fix memory leak.
  (editcmd_dialog_replace_prompt_show): fix string truncations.
  Portability: rename some str_class members
  Portability: ESC_CHAR is defined in /usr/include/langinfo.h in some systems
  Cleanup code related to GLib < 2.12.
  Portability: use g_ascii_strtoll instead of strtoll, atoll and atof.
  Fix crash when user menu is called in editor with no filename.
  Keep some edit window parameters during file reloading.
  Fix editor crash in "Save as..." command.
  Ticket #2841: adjust i18n label sizes in learn key dialog.
  Disable the localized output of utilities such as - ls, git, etc..
  (add_widget_autopos): don't access to NULL widget.
  Parenthesis around some -1.
  src/filemanager/mountlist.c: use GLib functions to allocate/free memory.
  Sync with gnulib 613bcb6205cf2b64d835c19074c5a7e7c6cb99eb
  ...
2012-12-20 15:37:24 +04:00
Slava Zanko
e13437d950 (exec_get_export_variables_ext): use g_new0() for stable test results.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 15:35:40 +04:00
Sergey Y. Afonin
42f54a0a32 Implement quick and easy disable of xdg-open usage.
MC_XDG_OPEN=/bin/false can be used to disable xdg-open usage in
/usr/libexec/mc/ext.d/*.sh scripts.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:36 +04:00
Andrew Borodin
6c6ce83af7 Sync with gnulib 40f82767840187c20051ca99385f75a42f92de99.
mountlist: recognize more "dummy" file systems
* src/filenamager/mountlist.c (ME_DUMMY_0):
Add these dummy FS names to the list:
  - "debugfs" virtual filesystem for kernel debugging
  - "devpts" PTY slave filesystem
  - "devtmpfs" device filesystem on top of tmpfs/ramfs
  - "fusectl" control filesystem for FUSE
  - "mqueue" enumerates POSIX message queues
  - "rpc_pipefs" kernel <-> userspace bridge for NFS
  - "sysfs" is for exporting kernel objects
  - "devfs" device filesystem for Linux 2.4 and FreeBSD

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:36 +04:00
Slava Zanko
db2c31decc Add extra checks in macro engine.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 15:35:36 +04:00
Andrew Borodin
8a1971026d Ticket #2935: update uc1541 extfs plug-in up to version 2.5.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
30dbb79655 (del_widget): fix memory leak.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
d87a0bfe92 (editcmd_dialog_replace_prompt_show): fix string truncations.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
0e5b483974 Portability: rename some str_class members
...to avoid conflict with global names.

On HP-UX, inttypes.h includes ctype.h through other dependencies, ctype.h
defines macros for various functions and these macros clash with entries
of "struct str_class".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Mikulas Patocka
b475e31255 Portability: ESC_CHAR is defined in /usr/include/langinfo.h in some systems
...so undefine it to avoid warning.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
e9f883a3cf Cleanup code related to GLib < 2.12.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
17cadc50ec Portability: use g_ascii_strtoll instead of strtoll, atoll and atof.
Set minimal version of GLib up to 2.12 because of g_ascii_strtoll.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
e574972d58 Fix crash when user menu is called in editor with no filename.
(mc_search): immediately return FALSE if str is NULL.
(mc_search_run): immediately return FALSE if user_data is NULL.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
2eeb950439 Keep some edit window parameters during file reloading.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
d50d1d748d Fix editor crash in "Save as..." command.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
368e250102 Ticket #2841: adjust i18n label sizes in learn key dialog.
Learn keys dialogue shows "smaller buttons" when localized key names
include special chars (as the "á" in "Avanzar página" for es_ES locale).
"%Ns" formats for g_snprintf are not reliable for multibyte encodings.
For larger buttons (> 16 characters), padding size must be zero.

Thanks David Martin for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Ilia Maslakov
f25feaab1f Disable the localized output of utilities such as - ls, git, etc..
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 15:35:35 +04:00
Andrew Borodin
3fc490ea12 (add_widget_autopos): don't access to NULL widget.
(del_widget): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
82b1d7bff3 Parenthesis around some -1.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
24f0533432 src/filemanager/mountlist.c: use GLib functions to allocate/free memory.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
eba12456eb Sync with gnulib 613bcb6205cf2b64d835c19074c5a7e7c6cb99eb
...and ab7a2b67b48deb4c253b3b6bd983690d71515265.

* src/filemanager/mountlist: do not classify a bind-mounted dir entry
as "dummy".

(ME_DUMMY_0): Rename from ME_DUMMY, but omit the "none"-testing clause.
(ME_DUMMY) [MOUNTED_GETMNTENT1]: New macro to encapsulate the exception
for bind-mounted directories.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
9903480096 FileOpContext::preserve: make gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:35 +04:00
Andrew Borodin
a5efdb67ce FileOpContext::dive_into_subdirs: make gboolean.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:34 +04:00
Andrew Borodin
3762269434 Don't create copy/move progress dialog for background operations.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:34 +04:00
Pavel Vasilyev
d4f50f0be5 src/vfs/tar/tar.c: types accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
03fd500c2e src/vfs/cpio/cpio.c: types accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
f84bbd8583 vfs_s_subclass::linear_read: return ssize_t instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
fafd75c807 lib/vfs/direntry.c: types accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Andrew Borodin
848318f95f lib/vfs/vfs.h: indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Pavel Vasilyev
8d71220350 (mcview_search_update_cmd_callback): add type cast for correct condition check.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:18 +04:00
Andrew Borodin
06e1d21322 (mcview_find): type accuracy.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:35:13 +04:00
Andrew Borodin
1f1be9ac93 lib/tty/color.c: use unsigned type for conversion between integer and pointer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Andrew Borodin
04942e5f2b (str_iscombiningmark): return gboolean instead of int
...and related changes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Andrew Borodin
25689a32bb (edit_find_word_start): type accuracy for word start.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Andrew Borodin
b10fc3ce59 Ticket #2888: code cleanup before 4.8.7 release.
(editcmd_find): remove incorrect type cast.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-20 15:18:06 +04:00
Slava Zanko
448475d102 Merge branch '319_edit_flow_column_insertion'
* 319_edit_flow_column_insertion:
  place cursor after inserted chars by 'block move' command
  place cursor after inserted chars by 'block copy' command
  added option "Cursor after inserted block" in the options dialog of editor
  Ticket #319: place cursor after inserted chars
2012-12-20 14:11:49 +03:00
Ilia Maslakov
77c599be70 place cursor after inserted chars by 'block move' command
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
7a5458fd9b place cursor after inserted chars by 'block copy' command
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
d6a1de5898 added option "Cursor after inserted block" in the options dialog of editor
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 14:08:55 +03:00
Ilia Maslakov
027cc24f28 Ticket #319: place cursor after inserted chars
* Added 'editor_cursor_after_inserted_block' config option (default value is: FALSE)
* Cursor placed at end of inserted chars when extern file is inserted under cursor

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-12-20 14:08:36 +03:00
Slava Zanko
a1dd199723 Fixes in exec_get_export_variables_ext test
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 13:48:26 +03:00
Slava Zanko
5624861a9d Merge branch '2883_portable_tests'
* 2883_portable_tests:
  Increase version of Check utility to 0.9.8
  Fixed exec_get_export_variables_ext test
  Ticket #2883: non-portable test
2012-12-20 13:16:13 +03:00
Slava Zanko
bc8658b9de Increase version of Check utility to 0.9.8
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 13:13:40 +03:00
Slava Zanko
076e53550d Fixed exec_get_export_variables_ext test
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 13:13:40 +03:00
Slava Zanko
5e633c7ca1 Ticket #2883: non-portable test
Test has been rewritten for support actuality.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-12-20 12:48:42 +03:00
Andrew Borodin
177f1dc5ba Merge branch '2926_screen_lib_flags'
* 2926_screen_lib_flags:
  Clarify usage of AM_CPPFLAGS.
  PCRE_CFLAGS are CPPFLAGS, actually.
  m4.include/mc-with-screen-slang.m4: clarify usage of CPPFLAGS, CFLAGS and LDFLAGS
  Ticket #2926: fail to check ncurses library
2012-12-18 16:29:07 +04:00
Andrew Borodin
60727b9b79 Clarify usage of AM_CPPFLAGS.
Use AM_CPPFLAGS not AM_CFLAGS for includes. GLIB_CFLAGS are CPPFLAGS, actually.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:27:49 +04:00
Andrew Borodin
7b184ddea4 PCRE_CFLAGS are CPPFLAGS, actually.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:27:49 +04:00
Andrew Borodin
f7bc3e5c21 m4.include/mc-with-screen-slang.m4: clarify usage of CPPFLAGS, CFLAGS and LDFLAGS
...in s-lang library checking.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:27:49 +04:00