Commit Graph

12369 Commits

Author SHA1 Message Date
Andrew Borodin
47b122d9a5 Merge branch '3025_race_cond_reate_tmp_dir'
* 3025_race_cond_reate_tmp_dir:
  Ticket #3025: race condition when creating temporary directory.
2013-07-05 21:01:54 +04:00
Amadeusz Sławiński
33c47b5734 Ticket #3025: race condition when creating temporary directory.
When there's no mc-tmpdir and a user tries to start two mc sessions
simultaneously, sometimes (in one out of ten attempts on my machine) one
mc session emits the following error message:

Cannot create temporary directory /tmp/mc-lars: File exists (17)
Temporary files will be created in /tmp
Press any key to continue...

Steps to reproduce:

# rm /tmp/mc-$(whoami) -rf
# uxterm -e mc & uxterm -e mc

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 20:58:41 +04:00
Slava Zanko
ff211e5fd3 Merge branch '2006_more_info_about_iso'
* 2006_more_info_about_iso:
  Ticket #2006: Display additional info while viewing (F3) *.iso files
2013-07-05 15:22:17 +03:00
Slava Zanko
cb57614b7a Ticket #2006: Display additional info while viewing (F3) *.iso files
Viewing (F3) on ISO image produce more information about image.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-07-05 15:21:59 +03:00
Andrew Borodin
c6844e1918 (edit_buffer_read_file): fix comparision between signed and unsigned integers.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 13:28:21 +04:00
Andrew Borodin
2b0c66bc1f Merge branch '1743_mcedit_file_size'
* 1743_mcedit_file_size: (25 commits)
  Refresh po/*.po files.
  Indentation.
  Add threshold for file size.
  Drop limit of edited file size.
  Add functions to transform string to unsigned integer:
  Refactoring of functions that operate with editor buffer.
  Refactoring: rename functions of getting BOL and EOFL:
  Refactoring: move members from WEdit to edit_buffer_t and rename related functions:
  (get_paragraph): refactoring.
  A lot of type accuracies.
  (edit_indent_width, edit_insert_indent): move to wordproc.c and make static.
  Rename edit_buffer_t members.
  Use GPtrArray to store editor buffers.
  (edit_cursor_move): refactoring using editor buffer API.
  New editor buffer API to delete character at cursor position.
  New editor buffer API to insert character at cursor position.
  (edit_buffer_write_file): refactoring: return number of written bytes.
  (edit_buffer_write_file): new editor buffer API.
  (edit_buffer_read_file): refactoring: return number of read bytes.
  (edit_buffer_read_file): new editor buffer API.
  ...
2013-07-05 09:20:58 +04:00
Andrew Borodin
6fff56c2f6 Refresh po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:20:40 +04:00
Andrew Borodin
c5924af3c4 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:20:40 +04:00
Andrew Borodin
dcf78f5382 Add threshold for file size.
Add "editor_filesize_threshold" ini option to ask open file if it size
is larger than specified threshold. Supported string value formats are:
"640000000", "64000K", "64M". Default value is 64M.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:20:40 +04:00
Andrew Borodin
c6d6aaedd5 Drop limit of edited file size.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
ccf82ada12 Add functions to transform string to unsigned integer:
* (xstrtoumax): from gnulib.
 * (parse_integer): from coreutils (dd.c).

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
25924c77d9 Refactoring of functions that operate with editor buffer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
506b3d4eee Refactoring: rename functions of getting BOL and EOFL:
edit_bol() -> edit_buffer_get_bol()
edit_eol() -> edit_buffer_get_eol()

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
32ffd98e87 Refactoring: move members from WEdit to edit_buffer_t and rename related functions:
WEdit::last_byte -> edit_buffer_t::size
WEdit::total_lines -> edit_buffer_t::lines
WEdit::curs_line -> edit_buffer_t::curs_line

edit_count_lines() -> edit_buffer_count_lines()

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
253d27b1a3 (get_paragraph): refactoring.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:03 +04:00
Andrew Borodin
c5d35ac93b A lot of type accuracies.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
c466b18f67 (edit_indent_width, edit_insert_indent): move to wordproc.c and make static.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
ca26181f5d Rename edit_buffer_t members.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
7facc1da05 Use GPtrArray to store editor buffers.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
60fe43d932 (edit_cursor_move): refactoring using editor buffer API.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
ed8c80f48d New editor buffer API to delete character at cursor position.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
e335bba08c New editor buffer API to insert character at cursor position.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
706257a47d (edit_buffer_write_file): refactoring: return number of written bytes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
64760b56c5 (edit_buffer_write_file): new editor buffer API.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
e6ff98d239 (edit_buffer_read_file): refactoring: return number of read bytes.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
fc8044e178 (edit_buffer_read_file): new editor buffer API.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
cd9a56109d Refactoring editor buffer API of bytes/symbols get.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:09:02 +04:00
Andrew Borodin
e056726606 Refactoring of init/clean editor buffer.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:07:16 +04:00
Andrew Borodin
f56de22de5 Start of edit buffers refactoring.
Move buffers to separate class.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:07:16 +04:00
Andrew Borodin
23c2df198c (edit_move_updown): avoid extra search of multi-byte character start.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:07:16 +04:00
Andrew Borodin
f3dc8142e8 Ticket #1743: remove limit of file size in mcedit.
Initial commit: refactoring:
  * (edit_load_file_fast): always load whole file.
  * (edit_load_file): don't ignore result of edit_load_file_fast().

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-05 09:07:16 +04:00
Andrew Borodin
d38589cbca Merge branch '2163_rotating_dash'
* 2163_rotating_dash:
  (find_rotate_dash): invert the boolean argument
  Ticket #2163: rotating dash is not removed when mc finishes reading the directory
2013-07-02 20:59:29 +04:00
Egmont Koblinger
913a984743 (find_rotate_dash): invert the boolean argument
...to be consistent with the new rotate_dash() behavior and to be
intuitive.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-02 20:53:00 +04:00
Andrew Borodin
aeb8933543 Ticket #2163: rotating dash is not removed when mc finishes reading the directory
...or when other long aperation is finished.

(rotate_dash): add argument to show/hide dash. Move dash to the corner
of the right/top panel from corner of the screen.

Thanks Egmont Koblinger for the original patch.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-02 20:53:00 +04:00
Slava Zanko
368a303d93 Merge branch '3020_external_editor_segfault'
* 3020_external_editor_segfault:
  --with-edit: rename to --with-internal-edit.
  Fix bug with segfault when we tried to create new file in an external editor (by pressing shift-F4)
  Ticket #3020: segfault on creating new file in external editor
2013-07-02 15:32:19 +03:00
Andrew Borodin
45d8b20ad9 --with-edit: rename to --with-internal-edit.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-07-02 15:29:35 +03:00
Victor Ananjevsky
6a83ddacd3 Fix bug with segfault when we tried to create new file in an external editor (by pressing shift-F4)
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-07-02 15:29:35 +03:00
Slava Zanko
9d081bec5a Ticket #3020: segfault on creating new file in external editor
Fixes for compiling code without warnings and errors when the --disable-editor option is specified

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2013-07-02 15:29:35 +03:00
Andrew Borodin
3f4397f812 Merge branch '2706_hexview_search_continue'
* 2706_hexview_search_continue:
  Don't adjust viewer parameters twice after search in the hex mode.
  Ticket #2706: hex viewer: continue search doesn't work.
2013-06-28 14:30:26 +04:00
Andrew Borodin
1bb36fd589 Don't adjust viewer parameters twice after search in the hex mode.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 14:30:00 +04:00
Andrew Borodin
24d746ad2b Ticket #2706: hex viewer: continue search doesn't work.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 14:30:00 +04:00
Andrew Borodin
fb7ee43d5b Merge branch '3026_findfile_all_charsets'
* 3026_findfile_all_charsets:
  lib/search/search.c: cosmetics.
  Ticket #3026: Find File: "All charsets" options don't work.
2013-06-28 13:20:39 +04:00
Andrew Borodin
de2a934b37 lib/search/search.c: cosmetics.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 13:20:08 +04:00
Andrew Borodin
4f16d7e8f0 Ticket #3026: Find File: "All charsets" options don't work.
(mc_search_prepare): use cp_display not cp_source to convert text to all
available charsets.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 13:20:08 +04:00
Andrew Borodin
eb917257b1 Indentation.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:33:03 +04:00
Andrew Borodin
bf1aefea02 Merge branch '2990_cleanup'
* 2990_cleanup:
  Refresh po/*.po files.
  Rename functions:
  (dlg_overlap): rename to widget_overlapped()
  (dlg_replace_widget): rename to widget_replace()
  (dlg_widget_active): rename to widget_is_active()
  (mcview_ok_to_quit): move to actions_cmd.c and make static.
  (dlg_mouse_event): minor refactoring.
  (dlg_default_callback): get rid of extra type cast.
  WTree: fix double-click handling.
  Code reorganization and fixes around the vfs_path_as_str() function
  Ticket #3022: misc/mc.menu contains russian UTF-8 "Ó" instead of English "c".
  (vfs_path_as_string): clarify return value.
  Fix draw of tree mini-status.
  Ticket #2071: a bit cleanup of getting profile name.
  Ticket #2164: clarify cursor position in mcviewer.
  Ticket# 2990: prepare to 4.8.9 release.
2013-06-28 09:22:25 +04:00
Andrew Borodin
da8ce368d9 Refresh po/*.po files.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
48abe8735f Rename functions:
init_widget -> widget_init
create_dlg -> dlg_create
init_dlg -> dlg_init
run_dlg -> dlg_run
destroy_dlg -> dlg_destroy

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
0adf569b54 (dlg_overlap): rename to widget_overlapped()
...and move to lib/widget/widget-common.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00
Andrew Borodin
c7da120588 (dlg_replace_widget): rename to widget_replace()
...and move to lib/widget/widget-common.c.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2013-06-28 09:21:17 +04:00