Commit Graph

4518 Commits

Author SHA1 Message Date
Andrew Borodin
d27a4f86ea Ticket #2888: cleanups in master branch.
Check perl, python and ruby programs and substitute them in various files.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:39:44 +04:00
Andrew Borodin
d82757d233 Ticket #2917: Makefile.ams cleanup: remove unused AM_CPPFLAGS.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-20 15:24:30 +04:00
Andrew Borodin
be6a99f910 src/filemanager/mountlist.c: fix indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:45:39 +04:00
Andrew Borodin
7298a32e0f (get_fs_usage): avoid compile warning about mixed declarations and code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
d53dc96704 Sync with gnulib ffe10f3d20c2eb77efd56b68f2c22b2a810c289d.
fsusage: port back to Solaris

* src/filemanager/mountlist.c (get_fs_usage): Fix busted logic causing
compile-time error (fsd not declared) on Solaris 10.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
be2f25862b Sync with gnulib 2ab2617ee340ff35a9a4c713004fb302868d41b0
* src/filemanager/mountlist.c [STAT_STATVFS && (__linux__ && (__GLIBC__||__UCLIBC__))]:
Undefine STAT_STATFS2_FRSIZE to exclude code not used in this case.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
37873e6df4 Sync with gnulib b1fac377605c0eef8844fc8d3818d360f37d6fa4:
fs usage: fix block size returned on older Linux 2.6.

* src/filemanager/mountlist.c: Fall back to (struct statfs).f_frsize
which is available since Linux 2.6.
* m4.include/fsusage.m4 (STAT_STATFS2_FRSIZE): Always define
when the member is available so it can be used as a fallback.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
4db9168a93 Ticket #2906: crash on Solaris while trying to copy a file.
Sync with gnulib c25bdbae48977a527dff69150f59fb0746d31b51:
fs usage: check for GNU/Linux statvfs problem dynamically.

* src/filemanager/mountlist.c [STAT_STATVFS && __linux__ && (__GLIBC__||__UCLIBC__)]:
Define STAT_STATFS2_BSIZE too, since in this case the code now
checks dynamically whether statvfs is reliable, falling back on
Linux-style statfs otherwise.
(statvfs_works): New function, for dynamically testing statvfs.
(get_fs_usage) [STAT_STATVFS]: Use it.
* src/filemanager/filegui.c (filegui__check_attrs_on_fs): apply the same
statvfs_works function.
* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove static check for
statvfs on GNU/Linux hosts, since it's now done dynamically.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 11:52:52 +04:00
Andrew Borodin
9af54886d6 Ticket #2910: enter into symlink to commpressed patch shows empty patch.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-02 18:25:22 +04:00
Andrew Borodin
aa39bb48b2 Fix i18n of file operation dialog titles.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-27 17:17:03 +04:00
Andrew Borodin
99ef9f6cde Add info about ext.d directory to output of 'mc -F' command.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-27 17:17:03 +04:00
Ilia Maslakov
e6111f1d99 Ticket #2660 (mcedit: reset selection after paste)
mcedit reset selection after the text pasted (only in non-persistent selection mode)

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-25 13:22:26 +04:00
Ilya Molchanov
47f7c1478c Ticket #303 (don't indent blank lines)
don't indent blank lines.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-17 18:42:18 +04:00
Andrew Borodin
d38a0e345a Don't close file and pipe that were not opened.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 16:39:26 +04:00
Andrew Borodin
a77f15a1e4 Ticket #2873: diffviewer cannot open file if name contains '$'.
Escape '$' to avoid variable substitution in shell invoked in popen(3) call.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 16:39:20 +04:00
Andrew Borodin
28cd54da5a Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
...after tab character.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-11 10:14:48 +04:00
Slava Zanko
b4a10d82cc code indentation
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-10 15:15:02 +03:00
Ilia Maslakov
55c8f041da fixed doxygen documentation
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-10 14:29:53 +03:00
Ilia Maslakov
fa7a8dcbeb removed obsolete params from edit_push_undo_action/edit_push_redo_action
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-09-10 14:29:53 +03:00
Yury V. Zaytsev
fbc013421c Ticket #2861: additional error handling in edit_save_block().
If edit->column_highlight is on and the disk is so full that the editor
is unable even to write the magic (r <= 0), then subsequent if (len)
check might fail, since the value of len is undefined.

The solution is to initialize len with a non-zero value, so that the
function properly returns an error value in all cases (adding an
explicit return 0; is also possible, but then one must take care of
closing file descriptors, which is less convenient).

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
2012-09-10 14:29:53 +03:00
Andrew Borodin
8b382756bf Use g_strndup() instead of g_strdup()
...to ret rid of extra calculation of string length.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Adam Young
5e1ae44eca (get_absolute_name): missing finish NULL in vfs_path_append_vpath_new() call.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin
45a4197fa6 (edit_do_undo): cleanup of labeled statement usage.
(edit_do_redo): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin
ce0e129891 Fix mouse event handling in menu that overlaps buttonbar.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:53 +03:00
Andrew Borodin
d7482275c3 mcdiffview: code cleanup and cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-10 14:29:52 +03:00
Andrew Borodin
6c249ec0f2 Refactoring of many conditions.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin
5bf69875dc (edit_do_search): refactoring of search loop condition.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin
37054596f6 Avoid double checks of bookmarks in editor.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Ilia Maslakov
1b1071cdac Ticket #2876: code cleanup before 4.8.6 release.
mcedit: better support of --disable-charset.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:19:19 +04:00
Andrew Borodin
513d30e5a1 Allow create directory with name '~' (tilda).
Use escaping for that (as in shell): \~.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:30:28 +04:00
Andrew Borodin
85ed2bd331 Reimplement support of use ~ as home directory in hotlist.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 10:30:28 +04:00
Slava Zanko
e2fb1c8dd3 Ticket #2832: Fixed mcedit: unable to save changes in "Safe save" mode
If mcedit is configured to use "Safe save" I'm unable to save changes to existing file.
Same problem is for editor_option_save_mode=2 (backup mode)
Saving to new file works.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:39:58 +03:00
Roman 'gryf' Dobosz
198a10ca7d fixes following issues:
* F3/F4 on 'del' and 0-length files works, however it is impossible to change 'del'
   files (cached content can be confusing)
 * Koala files and other with non-ASCII characters are supported (implemented directory
   reading routine in pure python - for now only D64 format is supported)
 * Added workaround for filenames with space at the beginning (however, as it was stressed
   before, it is more generic issue than this script. Maybe it is good idea to use pcre
   instead of iterating and splitting?)
 * minor bugfixes and code cleanup

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:29:53 +03:00
Slava Zanko
43e4938a09 Ticket #2864: New implementation of uc1541 VFS
Due to date formatting, uc1541 extfs plugin is unusable, even tough the date formatting,
which is the one cause of the problem is coherent with the attached documentation (MM-DD-YYYY hh:mm).

Another problem with uc1541 script is connected rather with legal characters used in filename
rather than with script itself - in PET ASCII it is perfectly fine to use slash "/" character
in filenames, and as a side effect all files containing slash inside d64 image are represented
as directories on MC.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-09-05 14:29:53 +03:00
Andrew Borodin
028853b567 Adjust i18n stuff in editor menu.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-03 10:07:30 +04:00
Ilia Maslakov
7d34775231 fixed the doxygen documentation.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com
2012-08-30 17:10:05 +04:00
Slava Zanko
405007bca1 Added doxygen comments
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:02 +04:00
Slava Zanko
e2b53f7d21 Added diff_place_t enum.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:02 +04:00
Slava Zanko
872f9daa26 Added action_direction_t type
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-30 10:45:01 +04:00
Gergely Szasz
d8aa98b7d4 Ticket #2863 (mcdiff bidirectional merge enhancement)
Added feature for the mcdiff for the bidirectional merge.
    With F15 mcdiffviewer merge left panel to right panel direction.

    original patch by Gergely Szasz <szaszg@hu.inter.net>

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

added bind "MergeOther" into mc.keymap.default, mc.keymap.emacs.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-08-30 10:43:20 +04:00
Andrew Borodin
30313679b4 Fix of memory leak in TreeStore::check_name destruction.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 10:23:52 +04:00
Andrew Borodin
fa27aaf018 Ticket #2862: fix syncronization with filelist and tree panels
...in case of rename and delete directories.

Steps to reproduce the problem:
  * Choose "file listing" mode for one panel and "directory tree" mode for the other.
  * Perform all operations on the "file listing" panel.
  * Create a new directory -> tree view will update correctly.
  * Perform an operation, which changes this directory like rename/delete.
  * Deleted directory will still show up on the "directory tree" view.
Renamed directory will show up with the new name, but the old name will also stay there.

Minor cleanup: remove extra parenthesis.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-29 10:23:52 +04:00
Slava Zanko
c29a5a594d Avoid compiler errors about comparsion signed and unsigned variables
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:43 +04:00
Ilia Maslakov
1326197d1b (is_aligned_on_a_tab): return gboolean instead of int. Minor optimization.
(right_of_four_spaces): likewise.
(left_of_four_spaces): likewise.

Simplifying expression for easy code support.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:43 +04:00
Ilia Maslakov
ad0f58e51e Use off_t instead of long for all variables related to position in file:
...offset, cursor position, etc.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2012-08-27 16:27:37 +04:00
Andrew Borodin
72f50b458b Use long for line numbers and columns.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
d07af4a374 (edit_find_word_start): return gboolean instead of int.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
6040d5c17a (edit_save_cmd): return gboolean instead of int.
(edit_save_as_cmd): likewise.
(edit_save_confirm_cmd): likewise.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
7d2975a53e (edit_copy_to_X_buf_cmd): return gboolean instead of int.
(edit_cut_to_X_buf_cmd): likewise.
(edit_paste_from_X_buf_cmd): return gboolean.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-08-27 16:16:24 +04:00
Andrew Borodin
70528dc30a (edit_save_block): return gboolean instead of int.
(edit_save_block_cmd): likewise.

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