[Pkg-mc-commits] r263 - in trunk/debian/patches: . bugs debian
Denis Briand
narcan-guest at alioth.debian.org
Fri Aug 28 19:55:44 UTC 2009
Author: narcan-guest
Date: 2009-08-28 19:55:44 +0000 (Fri, 28 Aug 2009)
New Revision: 263
Removed:
trunk/debian/patches/bugs/01_bashism.patch
trunk/debian/patches/bugs/03_don_t_escape_tilde.patch
trunk/debian/patches/bugs/1392_regression_in_tar_support.patch
trunk/debian/patches/bugs/1404_ctrl-c_kills_mc.patch
trunk/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch
trunk/debian/patches/bugs/1453_fix_crash_on_f14.patch
trunk/debian/patches/bugs/1457_find_file_broken.patch
trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch
trunk/debian/patches/bugs/1478_add_kill_work_shortcut.patch
trunk/debian/patches/bugs/1485_extfs_doesnt_handle_certain_isos.patch
trunk/debian/patches/bugs/1496_search_backwards_broken.patch
trunk/debian/patches/bugs/1499_mcview_backwards_search_broken.patch
trunk/debian/patches/bugs/1520_eventx_unintialized.patch
trunk/debian/patches/bugs/1521_ctrl-z-doesnt_work.patch
trunk/debian/patches/bugs/1527_fix_heap_corruption_on_large_filenames.patch
trunk/debian/patches/bugs/1533_german_date_cut_off.patch
trunk/debian/patches/bugs/1549_xterm-256color.patch
trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch
trunk/debian/patches/bugs/277_mc_hangs_on_konsole_256-color.patch
trunk/debian/patches/bugs/330_menu_disappeared_on_resize.patch
trunk/debian/patches/bugs/414_shell_paterns.patch
trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch
trunk/debian/patches/debian/01_correct_conffile_path_in_man.patch
trunk/debian/patches/man/
trunk/debian/patches/syntax/
Log:
remove all merged patches with new upstream version
Deleted: trunk/debian/patches/bugs/01_bashism.patch
===================================================================
--- trunk/debian/patches/bugs/01_bashism.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/01_bashism.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,27 +0,0 @@
-Fix bashism
-Index: mc-4.6.2~git20090529/vfs/extfs/u7z
-===================================================================
---- mc-4.6.2~git20090529.orig/vfs/extfs/u7z 2009-05-29 21:32:48.000000000 +0200
-+++ mc-4.6.2~git20090529/vfs/extfs/u7z 2009-05-29 22:20:23.000000000 +0200
-@@ -45,8 +45,8 @@
- #first we check if we have old p7zip archive with prefix ./ in filename
- $P7ZIP l "$1" "$2" | grep -q "0 files" && \
- EXFNAME=*./"$2" || EXFNAME="$2"
-- $P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL &> /dev/null && \
-- { echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
-+ $P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
-+ { printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
- }
-
- mcu7zip_rmdir ()
-@@ -54,8 +54,8 @@
- #first we check if we have old p7zip archive with prefix ./ in filename
- $P7ZIP l "$1" "$2" | grep -q "0 files" && \
- EXFNAME=*./"$2" || EXFNAME="$2"
-- $P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL &> /dev/null && \
-- { echo -e "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
-+ $P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
-+ { printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
- }
-
- # override any locale for dates
Deleted: trunk/debian/patches/bugs/03_don_t_escape_tilde.patch
===================================================================
--- trunk/debian/patches/bugs/03_don_t_escape_tilde.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/03_don_t_escape_tilde.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,15 +0,0 @@
-diff --git a/src/strescape.c b/src/strescape.c
-index d23010d..bd4c0e6 100644
---- a/src/strescape.c
-+++ b/src/strescape.c
-@@ -37,8 +37,8 @@
-
- /*** file scope variables ************************************************************************/
-
--static const char ESCAPE_SHELL_CHARS[] = " !#$%()&~{}[]`?|<>;*\\\"";
--static const char ESCAPE_REGEX_CHARS[] = "^!#$%()&~{}[]`?|<>;*.\\";
-+static const char ESCAPE_SHELL_CHARS[] = " !#$%()&{}[]`?|<>;*\\\"";
-+static const char ESCAPE_REGEX_CHARS[] = "^!#$%()&{}[]`?|<>;*.\\";
- static const char ESCAPE_GLOB_CHARS[] = "$*\\";
-
- /*** file scope functions ************************************************************************/
Deleted: trunk/debian/patches/bugs/1392_regression_in_tar_support.patch
===================================================================
--- trunk/debian/patches/bugs/1392_regression_in_tar_support.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1392_regression_in_tar_support.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,71 +0,0 @@
-commit ac2edf225e2dfa60804bf92b107fe240fe31e390
-Author: Mikhail S. Pobolovets <styx.mp at gmail.com>
-Date: Wed Jul 15 20:31:56 2009 +0300
-
- Ticket #1392: regression in .tar support
-
- Regression was introduced in lzma support
- (a5ba27872979bc6a15418ec30d6d115e9ba92235)
-
- All the heuristics stuff has been removed, only
- LZMA utils 4.32.1 and later formats are supported.
-
- Signed-off-by: Mikhail S. Pobolovets <styx.mp at gmail.com>
-
-diff --git a/src/util.c b/src/util.c
-index 28ebf45..51f579e 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -882,28 +882,21 @@ get_compression_type (int fd)
- }
- }
-
-- /* LZMA files; both LZMA_Alone and LZMA utils formats. The LZMA_Alone
-- * format is used by the LZMA_Alone tool from LZMA SDK. The LZMA utils
-- * format is the default format of LZMA utils 4.32.1 and later. */
-- if (magic[0] < 0xE1 || (magic[0] == 0xFF && magic[1] == 'L' &&
-- magic[2] == 'Z' && magic[3] == 'M')) {
-- if (mc_read (fd, (char *) magic + 4, 9) == 9) {
-- /* LZMA utils format */
-- if (magic[0] == 0xFF && magic[4] == 'A' && magic[5] == 0x00)
-- return COMPRESSION_LZMA;
-- /* The LZMA_Alone format has no magic bytes, thus we
-- * need to play a wizard. This can give false positives,
-- * thus the detection below should be removed when
-- * the newer LZMA utils format has got popular. */
-- if (magic[0] < 0xE1 && magic[4] < 0x20 &&
-- ((magic[10] == 0x00 && magic[11] == 0x00 &&
-- magic[12] == 0x00) ||
-- (magic[5] == 0xFF && magic[6] == 0xFF &&
-- magic[7] == 0xFF && magic[8] == 0xFF &&
-- magic[9] == 0xFF && magic[10] == 0xFF &&
-- magic[11] == 0xFF && magic[12] == 0xFF)))
-- return COMPRESSION_LZMA;
-- }
-+ /* Support for LZMA (only utils format with magic in header).
-+ * This is the default format of LZMA utils 4.32.1 and later. */
-+
-+ if (mc_read(fd, (char *) magic+4, 1) == 1)
-+ {
-+ /* LZMA utils format */
-+ if
-+ ( magic[0] == 0xFF
-+ && magic[1] == 'L'
-+ && magic[2] == 'Z'
-+ && magic[3] == 'M'
-+ && magic[4] == 'A'
-+ && magic[5] == 0x00
-+ )
-+ return COMPRESSION_LZMA;
- }
-
- /* XZ compression magic */
-@@ -916,7 +909,7 @@ get_compression_type (int fd)
- }
- }
-
-- return 0;
-+ return COMPRESSION_NONE;
- }
-
- const char *
Deleted: trunk/debian/patches/bugs/1404_ctrl-c_kills_mc.patch
===================================================================
--- trunk/debian/patches/bugs/1404_ctrl-c_kills_mc.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1404_ctrl-c_kills_mc.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,81 +0,0 @@
-commit c6812961cc77ec6e4099f433bd0ba248c55fcf3a
-Author: Andrew Borodin <aborodin at vmail.ru>
-Date: Wed Jul 15 22:31:52 2009 +0400
-
- Ticket #1404: Ctrl-C kills mc.
-
- If MC built with --without-subshell option is run with -d option,
- the Ctrl-C key combination closes MC. Such behaviour was introduced
- in 66332a4fb1d3b9e7304a477eaa2dc8b5f9eb0e80 commit.
-
- This commit actually restores the SIGINT signal handling which was
- before 66332a4fb1d3b9e7304a477eaa2dc8b5f9eb0e80 commit.
-
- Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
-
-diff --git a/src/main.c b/src/main.c
-index 126f04c..72f3d71 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -2306,6 +2306,9 @@ main (int argc, char *argv[])
- #ifdef HAVE_SLANG
- slang_init ();
- #endif
-+
-+ start_interrupt_key ();
-+
- /* NOTE: This call has to be after slang_init. It's the small part from
- the previous init_key which had to be moved after the call of slang_init */
- init_key_input_fd ();
-diff --git a/src/tty.c b/src/tty.c
-index ee50840..17edb88 100644
---- a/src/tty.c
-+++ b/src/tty.c
-@@ -70,15 +70,26 @@ sigintr_handler(int signo)
- /*** public functions **************************************************/
-
- extern void
-+tty_start_interrupt_key(void)
-+{
-+ struct sigaction act;
-+
-+ act.sa_handler = sigintr_handler;
-+ sigemptyset (&act.sa_mask);
-+ act.sa_flags = SA_RESTART;
-+ sigaction (SIGINT, &act, NULL);
-+}
-+
-+extern void
- tty_enable_interrupt_key(void)
- {
- struct sigaction act;
-
-- got_interrupt = 0;
- act.sa_handler = sigintr_handler;
- sigemptyset (&act.sa_mask);
- act.sa_flags = 0;
- sigaction (SIGINT, &act, NULL);
-+ got_interrupt = 0;
- }
-
- extern void
-diff --git a/src/tty.h b/src/tty.h
-index b9b198d..23ad980 100644
---- a/src/tty.h
-+++ b/src/tty.h
-@@ -40,6 +40,7 @@
-
- /* {{{ Input }}} */
-
-+extern void tty_start_interrupt_key(void);
- extern void tty_enable_interrupt_key(void);
- extern void tty_disable_interrupt_key(void);
- extern gboolean tty_got_interrupt(void);
-@@ -70,6 +71,7 @@ extern char *tty_tgetstr (const char *name);
-
- /* legacy interface */
-
-+#define start_interrupt_key() tty_start_interrupt_key()
- #define enable_interrupt_key() tty_enable_interrupt_key()
- #define disable_interrupt_key() tty_disable_interrupt_key()
- #define got_interrupt() tty_got_interrupt()
Deleted: trunk/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch
===================================================================
--- trunk/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1415_hotlist_buffer_cleanup.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,24 +0,0 @@
-commit 05b590d2251638b937d092084e533920f447248b
-Author: Mikhail S. Pobolovets <styx.mp at gmail.com>
-Date: Sat Aug 1 09:49:09 2009 +0300
-
- Ticket #1415: Directory hotlist incorrect drawing fix
-
- src/hotlist.c: buffer clean up has been added
- original author: E.L.K.
-
- Signed-off-by: Mikhail S. Pobolovets <styx.mp at gmail.com>
-
-diff --git a/src/hotlist.c b/src/hotlist.c
-index dd8dd04..9cd9774 100644
---- a/src/hotlist.c
-+++ b/src/hotlist.c
-@@ -228,6 +228,8 @@ static void fill_listbox (void)
- switch (current->type) {
- case HL_TYPE_GROUP:
- {
-+ /* buff clean up */
-+ g_string_truncate(buff, 0);
- g_string_append(buff,"->");
- g_string_append(buff,current->label);
- if (hotlist_state.moving)
Deleted: trunk/debian/patches/bugs/1453_fix_crash_on_f14.patch
===================================================================
--- trunk/debian/patches/bugs/1453_fix_crash_on_f14.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1453_fix_crash_on_f14.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,33 +0,0 @@
-commit 3b1070fb3d29569b56932aca2268874c56e0d9fc
-Author: Ilia Maslakov <il.smind at gmail.com>
-Date: Mon Aug 3 15:37:55 2009 +0000
-
- Ticket #1453 (crash mc on create new file in external editor (S-F4))
-
- fix: crash mc when path is null on create new file in external editor
-
-diff --git a/vfs/vfs.c b/vfs/vfs.c
-index d624347..d6f7bfc 100644
---- a/vfs/vfs.c
-+++ b/vfs/vfs.c
-@@ -496,7 +496,7 @@ char *
- vfs_translate_path_n (const char *path)
- {
- char *result;
--
-+
- result = vfs_translate_path (path);
- return (result != NULL) ? g_strdup (result) : NULL;
- }
-@@ -506,7 +506,10 @@ vfs_canon_and_translate (const char *path)
- {
- char *canon;
- char *result;
-- canon = vfs_canon (path);
-+ if (path == NULL)
-+ canon = g_strdup ("");
-+ else
-+ canon = vfs_canon (path);
- result = vfs_translate_path_n (canon);
- g_free (canon);
- return result;
Deleted: trunk/debian/patches/bugs/1457_find_file_broken.patch
===================================================================
--- trunk/debian/patches/bugs/1457_find_file_broken.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1457_find_file_broken.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,150 +0,0 @@
-diff --git a/src/find.c b/src/find.c
-index 451599a..68c771b 100644
---- a/src/find.c
-+++ b/src/find.c
-@@ -295,13 +295,14 @@ find_parameters (char **start_dir, char **pattern, char **content)
- buts[i] = _(buts[i]);
-
- file_case_label = _(file_case_label);
-- content_case_label = _(content_case_label);
-+ file_pattern_label = _(file_pattern_label);
- file_recurs_label = _(file_recurs_label);
- file_skip_hidden_label = _(file_skip_hidden_label);
- file_all_charsets_label = _(file_all_charsets_label);
-- content_all_charsets_label = _(content_all_charsets_label);
-+ content_case_label = _(content_case_label);
- content_regexp_label = _(content_regexp_label);
-- file_pattern_label = _(file_pattern_label);
-+ content_first_hit_label = _(content_first_hit_label);
-+ content_all_charsets_label = _(content_all_charsets_label);
- }
- #endif /* ENABLE_NLS */
-
-@@ -558,8 +559,8 @@ find_add_match (const char *dir, const char *file)
- * has_newline - is there newline ?
- */
- static char *
--get_line_at (int file_fd, char *buf, int *pos, int *n_read, int buf_size,
-- int *has_newline)
-+get_line_at (int file_fd, char *buf, int buf_size, int *pos, int *n_read,
-+ gboolean *has_newline)
- {
- char *buffer = NULL;
- int buffer_size = 0;
-@@ -575,7 +576,7 @@ get_line_at (int file_fd, char *buf, int *pos, int *n_read, int buf_size,
- }
-
- ch = buf[(*pos)++];
-- if (ch == 0) {
-+ if (ch == '\0') {
- /* skip possible leading zero(s) */
- if (i == 0)
- continue;
-@@ -593,11 +594,10 @@ get_line_at (int file_fd, char *buf, int *pos, int *n_read, int buf_size,
- buffer[i++] = ch;
- }
-
-- *has_newline = ch ? 1 : 0;
-+ *has_newline = (ch != '\0');
-
-- if (buffer) {
-- buffer[i] = 0;
-- }
-+ if (buffer != NULL)
-+ buffer[i] = '\0';
-
- return buffer;
- }
-@@ -630,20 +630,20 @@ check_find_events(Dlg_head *h)
- /*
- * search_content:
- *
-- * Search the global (FIXME) regexp compiled content_pattern string in the
-- * DIRECTORY/FILE. It will add the found entries to the find listbox.
-+ * Search the content_pattern string in the DIRECTORY/FILE.
-+ * It will add the found entries to the find listbox.
- *
-- * returns 0 if do_search should look for another file
-- * 1 if do_search should exit and proceed to the event handler
-+ * returns FALSE if do_search should look for another file
-+ * TRUE if do_search should exit and proceed to the event handler
- */
--static int
-+static gboolean
- search_content (Dlg_head *h, const char *directory, const char *filename)
- {
- struct stat s;
- char buffer [BUF_4K];
- char *fname = NULL;
- int file_fd;
-- int ret_val = 0;
-+ gboolean ret_val = FALSE;
-
- fname = concat_dir_and_file (directory, filename);
-
-@@ -670,10 +670,11 @@ search_content (Dlg_head *h, const char *directory, const char *filename)
- int line = 1;
- int pos = 0;
- int n_read = 0;
-- int has_newline;
-+ gboolean has_newline;
- char *p = NULL;
- gboolean found = FALSE;
- gsize found_len;
-+ char result [BUF_MEDIUM];
-
- if (resuming) {
- /* We've been previously suspended, start from the previous position */
-@@ -681,23 +682,24 @@ search_content (Dlg_head *h, const char *directory, const char *filename)
- line = last_line;
- pos = last_pos;
- }
-- while ((p = get_line_at (file_fd, buffer, &pos, &n_read, sizeof (buffer), &has_newline)) && (ret_val == 0)){
-- if (found == FALSE){ /* Search in binary line once */
-- if (mc_search_run (search_content_handle, (const void *) p, 0, strlen (p), &found_len))
-- {
-- char *fnd_info = g_strdup_printf ("%d:%s", line, filename);
-- find_add_match (directory, fnd_info);
-- g_free (fnd_info);
-- found = TRUE;
-- }
-+ while (!ret_val
-+ && (p = get_line_at (file_fd, buffer, sizeof (buffer),
-+ &pos, &n_read, &has_newline)) != NULL) {
-+ if (!found /* Search in binary line once */
-+ && mc_search_run (search_content_handle,
-+ (const void *) p, 0, strlen (p), &found_len)) {
-+ g_snprintf (result, sizeof (result), "%d:%s", line, filename);
-+ find_add_match (directory, result);
-+ found = TRUE;
- }
- g_free (p);
-
-+ if (found && content_first_hit_flag)
-+ break;
-+
- if (has_newline) {
-+ found = FALSE;
- line++;
--
-- if (!content_first_hit_flag)
-- found = FALSE;
- }
-
- if ((line & 0xff) == 0) {
-@@ -706,13 +708,13 @@ search_content (Dlg_head *h, const char *directory, const char *filename)
- switch (res) {
- case FIND_ABORT:
- stop_idle (h);
-- ret_val = 1;
-+ ret_val = TRUE;
- break;
- case FIND_SUSPEND:
- resuming = 1;
- last_line = line;
- last_pos = pos;
-- ret_val = 1;
-+ ret_val = TRUE;
- break;
- default:
- break;
Deleted: trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch
===================================================================
--- trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1461_line_feeds_info_panel.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,68 +0,0 @@
-commit 11cc7a700912dfc73a0c499def67282564c36ab0
-Author: Andrew Borodin <aborodin at vmail.ru>
-Date: Fri Aug 7 11:38:28 2009 +0400
-
- Ticket 1461: missing line feeds in Info panel.
-
- Thanks to Denis Briand.
-
- Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
-
-diff --git a/src/info.c b/src/info.c
-index b0f6dd5..ecae194 100644
---- a/src/info.c
-+++ b/src/info.c
-@@ -114,7 +114,7 @@ info_show_info (struct WInfo *info)
- myfs_stats.nodes);
- else
- addstr (_("No node information"));
--
-+
- case 15:
- widget_move (&info->widget, 15, 3);
- if (myfs_stats.avail > 0 || myfs_stats.total > 0){
-@@ -139,20 +139,23 @@ info_show_info (struct WInfo *info)
- str_printf (buff, _("Device: %s"),
- str_trunc (myfs_stats.device, info->widget.cols - i18n_adjust));
- addstr (str_term_form (buff->str));
-- g_string_set_size(buff,0);
-+ g_string_set_size(buff, 0);
- case 12:
- widget_move (&info->widget, 12, 3);
- str_printf (buff, _("Filesystem: %s"),
- str_trunc (myfs_stats.mpoint, info->widget.cols - i18n_adjust));
- addstr (str_term_form (buff->str));
-+ g_string_set_size(buff, 0);
- case 11:
- widget_move (&info->widget, 11, 3);
- str_printf (buff, _("Accessed: %s"), file_date (st.st_atime));
- addstr (str_term_form (buff->str));
-+ g_string_set_size(buff, 0);
- case 10:
- widget_move (&info->widget, 10, 3);
- str_printf (buff, _("Modified: %s"), file_date (st.st_mtime));
- addstr (str_term_form (buff->str));
-+ g_string_set_size(buff, 0);
- case 9:
- widget_move (&info->widget, 9, 3);
- /* TRANSLATORS: "Status changed", like in the stat(2) man page */
-@@ -177,7 +180,7 @@ info_show_info (struct WInfo *info)
- (long int) st.st_blocks);
- #endif
- }
--
-+
- case 7:
- widget_move (&info->widget, 7, 3);
- tty_printf (_("Owner: %s/%s"),
-@@ -206,8 +209,8 @@ info_show_info (struct WInfo *info)
- info->widget.cols - i18n_adjust));
- addstr (str_term_form (buff->str));
- } else
-- addstr (_("File: None"));
--
-+ addstr (_("File: None"));
-+
- case 2:
- case 1:
- case 0:
Deleted: trunk/debian/patches/bugs/1478_add_kill_work_shortcut.patch
===================================================================
--- trunk/debian/patches/bugs/1478_add_kill_work_shortcut.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1478_add_kill_work_shortcut.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,20 +0,0 @@
-commit 556089fc9ffc19f59a432d5849ae84895ddadde0
-Author: Daniel Borca <dborca at yahoo.com>
-Date: Sat Aug 8 12:36:24 2009 +0000
-
- Ticket #1478 (kill word)
-
- add: "kill word" (M-d) shortcut in editor;
-
-diff --git a/edit/editkeys.c b/edit/editkeys.c
-index e93f8fd..78942e0 100644
---- a/edit/editkeys.c
-+++ b/edit/editkeys.c
-@@ -116,6 +116,7 @@ static const edit_key_map_type common_key_map[] = {
- { ALT ('>'), CK_End_Of_Text },
- { ALT ('-'), CK_Load_Prev_File },
- { ALT ('='), CK_Load_Next_File },
-+ { ALT ('d'), CK_Delete_Word_Right },
- { ALT (KEY_BACKSPACE), CK_Delete_Word_Left },
- { ALT ('n'), CK_Toggle_Line_State },
- { ALT ('_'), CK_Toggle_Tab_TWS },
Deleted: trunk/debian/patches/bugs/1485_extfs_doesnt_handle_certain_isos.patch
===================================================================
--- trunk/debian/patches/bugs/1485_extfs_doesnt_handle_certain_isos.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1485_extfs_doesnt_handle_certain_isos.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,34 +0,0 @@
-commit 96c0dc08d88763a4c107670b96208aa483d831ce
-Author: Stan. S. Krupoderov <pashelper at gmail.com>
-Date: Sat Aug 8 18:58:05 2009 +0400
-
- Ticket #1485: iso9660 extfs does not handle certain isos
-
- extfs/iso9660.in: add suport UCS l1, and fix ageinst new isoinfo
-
- Original author: dborca
-
- Signed-off-by: Stan. S. Krupoderov <pashelper at gmail.com>
-
-diff --git a/vfs/extfs/iso9660.in b/vfs/extfs/iso9660.in
-index 7b2ba70..e035740 100644
---- a/vfs/extfs/iso9660.in
-+++ b/vfs/extfs/iso9660.in
-@@ -15,7 +15,7 @@ test_iso () {
- fi
- if test -n "$CHARSET"; then
- CHARSET=`echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/'`
-- isoinfo -j $CHARSET -i /dev/null 2>&1 | grep "Unknown charset" >/dev/null && CHARSET=
-+ isoinfo -j $CHARSET -i /dev/null 2>&1 | @AWK@ "/Iconv not yet supported|Unknown charset/" >/dev/null && CHARSET=
- fi
- if test -n "$CHARSET"; then
- JOLIET_OPT="-j $CHARSET -J"
-@@ -23,7 +23,7 @@ test_iso () {
- JOLIET_OPT="-J"
- fi
- ISOINFO="isoinfo -R"
-- isoinfo -d -i "$1" | grep "NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT"
-+ isoinfo -d -i "$1" | @AWK@ "/UCS level 1|NO Joliet/" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT"
- }
-
- mcisofs_list () {
Deleted: trunk/debian/patches/bugs/1496_search_backwards_broken.patch
===================================================================
--- trunk/debian/patches/bugs/1496_search_backwards_broken.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1496_search_backwards_broken.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,37 +0,0 @@
-diff --git a/edit/editcmd.c b/edit/editcmd.c
-index f21f0f0..a647fd5 100644
---- a/edit/editcmd.c
-+++ b/edit/editcmd.c
-@@ -1289,11 +1289,12 @@ editcmd_find (WEdit *edit, gsize *len)
- gsize search_end;
-
- if (edit->replace_backwards) {
-- search_end = edit->curs1-1;
-+ search_end = edit->last_byte;
- while ((int) search_start >= 0) {
-- if (search_end - search_start > edit->search->original_len && mc_search_is_fixed_search_str(edit->search))
-- search_end = search_start + edit->search->original_len +1;
-- if ( mc_search_run(edit->search, (void *) edit, search_start, search_end, len))
-+ if (search_end > search_start + edit->search->original_len && mc_search_is_fixed_search_str(edit->search))
-+ search_end = search_start + edit->search->original_len;
-+ if ( mc_search_run(edit->search, (void *) edit, search_start, search_end, len)
-+ && edit->search->normal_offset == search_start )
- {
- return TRUE;
- }
-diff --git a/src/search/search.h b/src/search/search.h
-index faf7efc..383f82a 100644
---- a/src/search/search.h
-+++ b/src/search/search.h
-@@ -76,9 +76,9 @@ typedef struct mc_search_struct {
- /* public output data */
-
- /* some data for normal */
-- gsize normal_offset;
-+ off_t normal_offset;
-
-- gsize start_buffer;
-+ off_t start_buffer;
- /* some data for regexp */
- int num_rezults;
- mc_search_matchinfo_t *regex_match_info;
Deleted: trunk/debian/patches/bugs/1499_mcview_backwards_search_broken.patch
===================================================================
--- trunk/debian/patches/bugs/1499_mcview_backwards_search_broken.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1499_mcview_backwards_search_broken.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,30 +0,0 @@
-commit 670d11fc73a8ce78c013aed8e9a497b8e750f3a6
-Author: Daniel Borca <dborca at yahoo.com>
-Date: Sat Aug 8 05:31:13 2009 +0000
-
- Ticket #1499 (mcview: Search backwards is broken)
-
- fix: src/view.c backward searck is broken
-
- Signed-off-by: Ilia Maslakov <il.smind at gmail.com>
-
-diff --git a/src/view.c b/src/view.c
-index 266438a..924016e 100644
---- a/src/view.c
-+++ b/src/view.c
-@@ -3146,12 +3146,13 @@ view_find (WView *view, gsize search_start, gsize *len)
- if (view->search_backwards) {
- search_end = view_get_filesize (view);
- while ((int) search_start >= 0) {
-- if (search_end - search_start > view->search->original_len && mc_search_is_fixed_search_str(view->search))
-+ if (search_end > search_start + view->search->original_len && mc_search_is_fixed_search_str(view->search))
- search_end = search_start + view->search->original_len;
-
- view_read_start (view, &view->search_onechar_info, search_start);
-
-- if ( mc_search_run(view->search, (void *) view, search_start, search_end, len))
-+ if ( mc_search_run(view->search, (void *) view, search_start, search_end, len)
-+ && view->search->normal_offset == search_start )
- return TRUE;
-
- search_start--;
Deleted: trunk/debian/patches/bugs/1520_eventx_unintialized.patch
===================================================================
--- trunk/debian/patches/bugs/1520_eventx_unintialized.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1520_eventx_unintialized.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,22 +0,0 @@
-commit 02132ecaea5999f669b03d091d595b4552e320a0
-Author: dborca <dborca at yahoo.com>
-Date: Wed Aug 12 14:53:23 2009 +0300
-
- Ticket #1520: Uninitialized event.x in find.c#check_find_events()
-
- Fixed uninitialised member of structure.
-
- Signed-off-by: Slava Zanko <slavazanko at gmail.com>
-
-diff --git a/src/find.c b/src/find.c
-index 68c771b..e212813 100644
---- a/src/find.c
-+++ b/src/find.c
-@@ -608,6 +608,7 @@ check_find_events(Dlg_head *h)
- Gpm_Event event;
- int c;
-
-+ event.x = -1;
- c = get_event (&event, h->mouse_status == MOU_REPEAT, 0);
- if (c != EV_NONE) {
- dlg_process_event (h, c, &event);
Deleted: trunk/debian/patches/bugs/1521_ctrl-z-doesnt_work.patch
===================================================================
--- trunk/debian/patches/bugs/1521_ctrl-z-doesnt_work.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1521_ctrl-z-doesnt_work.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,23 +0,0 @@
-commit 688d80cdb1ebc229a44df85be84b3f89427aec67
-Author: dborca <dborca at yahoo.com>
-Date: Wed Aug 12 14:37:22 2009 +0300
-
- Ticket #1521: ctrl-z (aka suspend) does not work
-
- Fix issue:
- execute.c is missing #include <signal.h> and therefore #ifdef SIGTSTP fails miserably.
-
- Signed-off-by: Slava Zanko <slavazanko at gmail.com>
-
-diff --git a/src/execute.c b/src/execute.c
-index 2c8bc71..e176593 100644
---- a/src/execute.c
-+++ b/src/execute.c
-@@ -21,6 +21,7 @@
-
- #include <config.h>
-
-+#include <signal.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-
Deleted: trunk/debian/patches/bugs/1527_fix_heap_corruption_on_large_filenames.patch
===================================================================
--- trunk/debian/patches/bugs/1527_fix_heap_corruption_on_large_filenames.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1527_fix_heap_corruption_on_large_filenames.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,25 +0,0 @@
-commit 5f1ad860b74a1117c612886872260ecf6e7ec36e
-Author: Sergei Trofimovich <st at anti-virus.by>
-Date: Wed Aug 12 12:37:32 2009 +0300
-
- Ticket #1527: heap corruption detected on large filenames
-
- Fix bug, introduced in 27fbf91c28f68a8fd6c8ebf358588e80e21452d3
- commit. Really allocate 'dirent + NAME_MAX + 1', instead of
- sizeof(void*) + NAME_MAX + 1.
-
- Signed-off-by: Sergei Trofimovich <st at anti-virus.by>
-
-diff --git a/vfs/vfs.c b/vfs/vfs.c
-index d6f7bfc..d42599c 100644
---- a/vfs/vfs.c
-+++ b/vfs/vfs.c
-@@ -789,7 +789,7 @@ mc_readdir (DIR *dirp)
- * structures, holding dirent size. But we don't use it in libc infrastructure.
- * TODO: to make simpler homemade dirent-alike structure.
- */
-- mc_readdir_result = (struct dirent *)malloc(sizeof(struct dirent *) + NAME_MAX + 1);
-+ mc_readdir_result = (struct dirent *)malloc(sizeof(struct dirent) + NAME_MAX + 1);
- }
-
- if (!dirp) {
Deleted: trunk/debian/patches/bugs/1533_german_date_cut_off.patch
===================================================================
--- trunk/debian/patches/bugs/1533_german_date_cut_off.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1533_german_date_cut_off.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,64 +0,0 @@
-fix the broken german date in the mc panels
-Closes: #541104
-Author: Patrick Winnertz <winnie at debian.org>
-===============================================================
-diff --git a/src/util.c b/src/util.c
-index 213a286..2649182 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -58,6 +58,12 @@
- #include "charsets.h"
- #endif
-
-+/*In order to use everywhere the same setup
-+ for the locale we use defines */
-+#define FMTYEAR _("%b %e %Y")
-+#define FMTTIME _("%b %e %H:%M")
-+
-+
- int easy_patterns = 1;
-
- extern void str_replace(char *s, char from, char to)
-@@ -623,9 +629,9 @@ i18n_checktimelength (void)
- char buf [MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
- size_t a, b;
-
-- strftime (buf, sizeof(buf) - 1, _("%b %d %H:%M"), lt);
-+ strftime (buf, sizeof(buf) - 1, FMTTIME, lt);
- a = str_term_width1 (buf);
-- strftime (buf, sizeof(buf) - 1, _("%b %d %Y"), lt);
-+ strftime (buf, sizeof(buf) - 1, FMTYEAR, lt);
- b = str_term_width1 (buf);
-
- length = max (a, b);
-@@ -644,18 +650,8 @@ file_date (time_t when)
- {
- static char timebuf [MB_LEN_MAX * MAX_I18NTIMELENGTH + 1];
- time_t current_time = time ((time_t) 0);
-- static int i18n = 0;
-- static const char *fmtyear, *fmttime;
- const char *fmt;
-
-- if (!i18n){
-- /* strftime() format string for old dates */
-- fmtyear = _("%b %e %Y");
-- /* strftime() format string for recent dates */
-- fmttime = _("%b %e %H:%M");
-- i18n = 1;
-- }
--
- if (current_time > when + 6L * 30L * 24L * 60L * 60L /* Old. */
- || current_time < when - 60L * 60L) /* In the future. */
- /* The file is fairly old or in the future.
-@@ -665,9 +661,9 @@ file_date (time_t when)
- to allow for NFS server/client clock disagreement.
- Show the year instead of the time of day. */
-
-- fmt = fmtyear;
-+ fmt = FMTYEAR;
- else
-- fmt = fmttime;
-+ fmt = FMTTIME;
-
- FMT_LOCALTIME(timebuf, sizeof (timebuf), fmt, when);
-
Deleted: trunk/debian/patches/bugs/1549_xterm-256color.patch
===================================================================
--- trunk/debian/patches/bugs/1549_xterm-256color.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/1549_xterm-256color.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,22 +0,0 @@
-commit c080a3e2a53657115cc82d14bdb906da4e30bf60
-Author: Patrick Winnertz <winnie at debian.org>
-Date: Wed Aug 19 19:38:44 2009 +0200
-
- Add a xterm-256color entry to mc.lib
-
- Signed-off-by: Patrick Winnertz <winnie at debian.org>
-
-diff --git a/misc/mc.lib b/misc/mc.lib
-index 75c8f15..511c054 100644
---- a/misc/mc.lib
-+++ b/misc/mc.lib
-@@ -111,6 +111,9 @@ copy=xterm
- [terminal:xterm-color]
- copy=xterm
-
-+[terminal:xterm-256color]
-+copy=xterm
-+
- [terminal:ibmpc3]
- f11=\\e[Y
- f12=\\e[Z
Deleted: trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch
===================================================================
--- trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/267_fix_codejump_on_functions_with_nums.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,46 +0,0 @@
-index c9007e3..474203f 100644
---- a/edit/etags.c
-+++ b/edit/etags.c
-@@ -46,7 +46,7 @@
-
- static gboolean parse_define(char *buf, char **long_name, char **short_name, long *line)
- {
-- enum {in_longname, in_shortname, in_line, finish} def_state = in_longname;
-+ enum {in_longname, in_shortname, in_shortname_first_char, in_line, finish} def_state = in_longname;
-
- static char longdef[LONG_DEF_LEN];
- static char shortdef[SHORT_DEF_LEN];
-@@ -69,7 +69,7 @@ static gboolean parse_define(char *buf, char **long_name, char **short_name, lon
- }
- }
- break;
-- case in_shortname:
-+ case in_shortname_first_char:
- if ( isdigit(c) ) {
- nshort = 0;
- buf--;
-@@ -79,11 +79,23 @@ static gboolean parse_define(char *buf, char **long_name, char **short_name, lon
- } else {
- if ( nshort < SHORT_DEF_LEN - 1 ) {
- shortdef[nshort++] = c;
-+ def_state = in_shortname;
-+ }
-+ }
-+ break;
-+ case in_shortname:
-+ if ( c == 0x01 ) {
-+ def_state = in_line;
-+ } else if ( c == '\n' ) {
-+ def_state = finish;
-+ } else {
-+ if ( nshort < SHORT_DEF_LEN - 1 ) {
-+ shortdef[nshort++] = c;
- }
- }
- break;
- case in_line:
-- if ( c == ',' ) {
-+ if ( c == ',' || c == '\n') {
- def_state = finish;
- } else if ( isdigit(c) ) {
- if ( nline < LINE_DEF_LEN - 1 ) {
Deleted: trunk/debian/patches/bugs/277_mc_hangs_on_konsole_256-color.patch
===================================================================
--- trunk/debian/patches/bugs/277_mc_hangs_on_konsole_256-color.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/277_mc_hangs_on_konsole_256-color.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,22 +0,0 @@
-commit 678e10a3ed859ed4c311a9f812a2f6f298d0e8d8
-Author: Slava Zanko <slavazanko at gmail.com>
-Date: Wed Aug 19 12:30:53 2009 +0300
-
- Ticket #277: mc hangs if mouse support enabled on konsole-256color terminal
-
- Added recognize for 'konsole' terminal into init_xterm_support() function.
-
- Signed-off-by: Slava Zanko <slavazanko at gmail.com>
-
-diff --git a/src/main.c b/src/main.c
-index 2afcd1c..f88b185 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1219,6 +1219,7 @@ init_xterm_support (void)
- }
-
- if (force_xterm || strncmp (termvalue, "xterm", 5) == 0
-+ || strncmp (termvalue, "konsole", 7) == 0
- || strncmp (termvalue, "rxvt", 4) == 0
- || strcmp (termvalue, "Eterm") == 0
- || strcmp (termvalue, "dtterm") == 0) {
Deleted: trunk/debian/patches/bugs/330_menu_disappeared_on_resize.patch
===================================================================
--- trunk/debian/patches/bugs/330_menu_disappeared_on_resize.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/330_menu_disappeared_on_resize.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,37 +0,0 @@
-commit 8a1c364ff0291beba2c2c6a1cb827ba167f8407d
-Author: Andrew Borodin <aborodin at vmail.ru>
-Date: Sun Aug 9 19:25:40 2009 +0400
-
- Ticket #330: show dropped down menu is screen has been resized.
-
- Now works for both values of "menuBar visible" option.
-
- Signed-off-by: Andrew Borodin <aborodin at vmail.ru>
-
-diff --git a/src/menu.c b/src/menu.c
-index 5903157..7e4189a 100644
---- a/src/menu.c
-+++ b/src/menu.c
-@@ -391,13 +391,17 @@ menubar_callback (Widget *w, widget_msg_t msg, int parm)
- }
-
- case WIDGET_DRAW:
-- if (menubar_visible)
-+ if (menubar_visible) {
- menubar_draw (menubar);
-- else
-- /* try show menu after screen resize */
-- send_message (w, WIDGET_FOCUS, 0);
-- return MSG_HANDLED;
-+ return MSG_HANDLED;
-+ }
-+ /* fall through */
-
-+ case WIDGET_RESIZED:
-+ /* try show menu after screen resize */
-+ send_message (w, WIDGET_FOCUS, 0);
-+ return MSG_HANDLED;
-+
- default:
- return default_proc (msg, parm);
- }
Deleted: trunk/debian/patches/bugs/414_shell_paterns.patch
===================================================================
--- trunk/debian/patches/bugs/414_shell_paterns.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/414_shell_paterns.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,65 +0,0 @@
-commit 4586834cb9d4d84b4493bbb58e36d9c32abfb409
-Author: Denys Vlasenko <vda.linux at googlemail.com>
-Date: Fri Aug 7 14:47:26 2009 +0300
-
- Ticket #414 (shell patterns in copy dialog)
-
- Handle asterisks into replace template string.
-
- Signed-off-by: Slava Zanko <slavazanko at gmail.com>
-
-diff --git a/src/search/glob.c b/src/search/glob.c
-index c35b712..08caab4 100644
---- a/src/search/glob.c
-+++ b/src/search/glob.c
-@@ -110,6 +110,33 @@ mc_search__glob_translate_to_regex (gchar * str, gsize * len)
- return buff;
- }
-
-+/* --------------------------------------------------------------------------------------------- */
-+
-+static GString *
-+mc_search__translate_replace_glob_to_regex (gchar *str)
-+{
-+ GString *buff = g_string_new ("");
-+ int cnt = '0';
-+
-+ while (*str) {
-+ char c = *str++;
-+ switch (c) {
-+ case '*':
-+ case '?':
-+ g_string_append_c (buff, '\\');
-+ c = ++cnt;
-+ break;
-+ /* breaks copying: mc uses "\0" internally, it must not be changed */
-+ /*case '\\':*/
-+ case '&':
-+ g_string_append_c (buff, '\\');
-+ break;
-+ }
-+ g_string_append_c (buff, c);
-+ }
-+ return buff;
-+}
-+
- /*** public functions ****************************************************************************/
-
- void
-@@ -141,8 +168,15 @@ mc_search__run_glob (mc_search_t * mc_search, const void *user_data,
- }
-
- /* --------------------------------------------------------------------------------------------- */
-+
-+
- GString *
- mc_search_glob_prepare_replace_str (mc_search_t * mc_search, GString * replace_str)
- {
-- return mc_search_regex_prepare_replace_str (mc_search, replace_str);
-+ GString *repl = mc_search__translate_replace_glob_to_regex(replace_str->str);
-+ GString *res = mc_search_regex_prepare_replace_str (mc_search, repl);
-+ g_string_free (repl, TRUE);
-+ return res;
- }
-+
-+/* --------------------------------------------------------------------------------------------- */
Deleted: trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch
===================================================================
--- trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/bugs/fish_no_report_on_failed_delete.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,124 +0,0 @@
-diff --git a/vfs/fish.c b/vfs/fish.c
-index 1e1ccbe..55e61bd 100644
---- a/vfs/fish.c
-+++ b/vfs/fish.c
-@@ -944,8 +944,11 @@ fish_chmod (struct vfs_class *me, const char *path, int mode)
- {
- PREFIX
- g_snprintf(buf, sizeof(buf), "#CHMOD %4.4o /%s\n"
-- "chmod %4.4o /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-+ "if chmod %4.4o /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
- mode & 07777, rpath,
- mode & 07777, rpath);
- POSTFIX(OPT_FLUSH);
-@@ -978,11 +981,17 @@ static int fish_##name (struct vfs_class *me, const char *path1, const char *pat
- }
-
- FISH_OP(rename, "#RENAME /%s /%s\n"
-- "mv /%s /%s 2>/dev/null\n"
-- "echo '### 000'" )
-+ "if mv /%s /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n")
- FISH_OP(link, "#LINK /%s /%s\n"
-- "ln /%s /%s 2>/dev/null\n"
-- "echo '### 000'" )
-+ "if ln /%s /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n")
-
- static int fish_symlink (struct vfs_class *me, const char *setto, const char *path)
- {
-@@ -991,8 +1000,11 @@ static int fish_symlink (struct vfs_class *me, const char *setto, const char *pa
- qsetto = strutils_shell_escape (setto);
- g_snprintf(buf, sizeof(buf),
- "#SYMLINK %s /%s\n"
-- "ln -s %s /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-+ "if ln -s %s /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
- qsetto, rpath, qsetto, rpath);
- g_free (qsetto);
- POSTFIX(OPT_FLUSH);
-@@ -1016,19 +1028,16 @@ fish_chown (struct vfs_class *me, const char *path, int owner, int group)
- {
- PREFIX
- g_snprintf (buf, sizeof(buf),
-- "#CHOWN %s /%s\n"
-- "chown %s /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-- sowner, rpath,
-- sowner, rpath);
-+ "#CHOWN %s:%s /%s\n"
-+ "if chown %s:%s /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
-+ sowner, sgroup, rpath,
-+ sowner, sgroup, rpath);
- fish_send_command (me, super, buf, OPT_FLUSH);
- /* FIXME: what should we report if chgrp succeeds but chown fails? */
-- g_snprintf (buf, sizeof(buf),
-- "#CHGRP /%s /%s\n"
-- "chgrp %s /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-- sgroup, rpath,
-- sgroup, rpath);
- /* fish_send_command(me, super, buf, OPT_FLUSH); */
- POSTFIX (OPT_FLUSH)
- }
-@@ -1039,8 +1048,11 @@ static int fish_unlink (struct vfs_class *me, const char *path)
- PREFIX
- g_snprintf(buf, sizeof(buf),
- "#DELE /%s\n"
-- "rm -f /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-+ "if rm -f /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
- rpath, rpath);
- POSTFIX(OPT_FLUSH);
- }
-@@ -1076,8 +1088,11 @@ static int fish_mkdir (struct vfs_class *me, const char *path, mode_t mode)
-
- g_snprintf(buf, sizeof(buf),
- "#MKD /%s\n"
-- "mkdir /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-+ "if mkdir /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
- rpath, rpath);
-
- g_free (rpath);
-@@ -1097,8 +1112,11 @@ static int fish_rmdir (struct vfs_class *me, const char *path)
- PREFIX
- g_snprintf(buf, sizeof(buf),
- "#RMD /%s\n"
-- "rmdir /%s 2>/dev/null\n"
-- "echo '### 000'\n",
-+ "if rmdir /%s 2>/dev/null; then\n"
-+ "echo '### 000'\n"
-+ "else\n"
-+ "echo '### 500'\n"
-+ "fi\n",
- rpath, rpath);
- POSTFIX(OPT_FLUSH);
- }
Deleted: trunk/debian/patches/debian/01_correct_conffile_path_in_man.patch
===================================================================
--- trunk/debian/patches/debian/01_correct_conffile_path_in_man.patch 2009-08-28 19:31:16 UTC (rev 262)
+++ trunk/debian/patches/debian/01_correct_conffile_path_in_man.patch 2009-08-28 19:55:44 UTC (rev 263)
@@ -1,272 +0,0 @@
-Fit path for Debian
-Index: mc-4.6.2~git20090529/doc/man/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/mc.1.in 2009-05-30 19:09:56.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/mc.1.in 2009-05-30 19:16:26.000000000 +0200
-@@ -1396,7 +1396,7 @@
- but only if it is owned by user or root and is not world\-writable.
- If no such file found, ~/.mc/menu is tried in the same way,
- and otherwise mc uses the default system\-wide menu
-- at prefix@/share/mc/mc.menu.
-+/etc/mc/mc.menu.
- .PP
- The format of the menu file is very simple. Lines that start with
- anything but space or tab are considered entries for the menu (in
-@@ -3251,7 +3251,7 @@
- .IP
- The help file for the program.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I /etc/mc/mc.ext
- .IP
- The default system\-wide extensions file.
- .PP
-@@ -3283,7 +3283,7 @@
- .IP
- This file contains the hints displayed by the program.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I /etc/mc/mc.menu
- .IP
- This file contains the default system\-wide applications menu.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/es/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/es/mc.1.in 2009-05-30 19:17:13.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/es/mc.1.in 2009-05-30 19:18:49.000000000 +0200
-@@ -1372,7 +1372,7 @@
- usuario o del superusuario y no es modificable por todos.
- Si no se encuentra allí el archivo, se intenta de la misma manera con ~/.mc/menu,
- y si no, mc utiliza el menú por defecto para todo el sistema
-- at prefix@/share/mc/mc.menu.
-+etc/mc/mc.menu.
- .PP
- El formato del menú de archivo es muy simple. Todas las líneas, salvo
- las que empiezan con espacio o tabulación, son consideradas entradas
-@@ -3190,7 +3190,7 @@
- Midnight Commander permite hacer ajustes a la base de datos de terminales
- del sistema sin necesidad de privilegios de superusuario. El programa
- busca definiciones de teclas en el archivo de inicialización del sistema
--.B @prefix@/share/mc/mc.lib
-+.B etc/mc/mc.lib
- o en el del usuario
- .BR ~/.mc/ini ,
- en la sección "terminal:nuestro\-terminal" y si no en "terminal:general".
-@@ -3244,7 +3244,7 @@
- .IP
- Archivo de ayuda.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I etc/mc/mc.ext
- .IP
- Archivo de extensiones por defecto del sistema.
- .PP
-@@ -3258,7 +3258,7 @@
- Archivo de configuración del sistema para Midnight Commander, sólo si
- el usuario no dispone de su propio ~/.mc/ini.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I etc/mc/mc.lib
- .IP
- Opciones globales de Midnight Commander. Se aplican siempre a todos los
- usuarios, tengan ~/.mc/ini o no. Actualmente sólo se emplea para los
-@@ -3277,7 +3277,7 @@
- Este archivo contiene los mensajes cortos de ayuda mostrados por el
- programa.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I etc/mc/mc.menu
- .IP
- Este archivo contiene el menú de aplicaciones por defecto para el sistema.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/hu/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/hu/mc.1.in 2009-05-30 19:19:54.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/hu/mc.1.in 2009-05-30 19:20:24.000000000 +0200
-@@ -1357,7 +1357,7 @@
- .I ~/.mc/menu
- keresése a következő lépés, egyébként pedig az mc az alapértelmezett
- rendszerszintű menüt használja, pl.:
--.IR @prefix@/share/mc/mc.menu ,
-+.IR etc/mc/mc.menu ,
- esetleg /etc/mc/mc.menu.
- .PP
- A menü fájl formátuma nagyon egyszerű. A sorok, amelyek bármivel
-@@ -3093,7 +3093,7 @@
- .IP
- A program súgó fájlja.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I etc/mc/mc.ext
- .IP
- Az alapértelmezett rendszerszintű kiterjesztés fájl.
- .PP
-@@ -3108,7 +3108,7 @@
- Az alapértelmezett rendszerszintű Midnight Commander beállítás, amelyet
- csak akkor használ, ha a felhasználónak nincs saját ~/.mc/ini fájlja.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I etc/mc/mc.lib
- .IP
- A Midnight Commander globális beállításai. Az ebben a fájlban elvégzett
- beállítások minden felhasználó Midnight Commander\-jére vonatkoznak, ez
-@@ -3125,7 +3125,7 @@
- Ez a fájl tartalmazza a program által megjelenített útmutattásokat
- (cookie\-kat).
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I etc/mc/mc.menu
- .IP
- Ez a fájl azonos a rendszerszintű alkalmazás menüvel.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/it/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/it/mc.1.in 2009-05-30 19:20:35.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/it/mc.1.in 2009-05-30 19:21:10.000000000 +0200
-@@ -1365,7 +1365,7 @@
- ma solo se è di proprietà dell'utente o di root e se non è scrivibile
- a tutti. Se tale file non viene trovato, mc alla stessa maniera
- prova con ~/.mc/menu altrimenti usa il menu di sistema
-- at prefix@/share/mc/mc.menu.
-+etc/mc/mc.menu.
- .PP
- Il formato del file menu è molto semplice. Le righe che cominciano
- con qualsiasi cosa che non sia uno spazio o una tabulazione sono
-@@ -3117,7 +3117,7 @@
- .IP
- Il file di aiuto per il programma.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I etc/mc/mc.ext
- .IP
- Il file delle estensioni di sistema predefinito.
- .PP
-@@ -3132,7 +3132,7 @@
- La configurazione di sistema predefinita per il Midnight Commander, usata solo
- se l'utente non possiede il proprio file ~/.mc/ini.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I etc/mc/mc.lib
- .IP
- Le impostazioni globali per il Midnight Commander. La modifica di questo
- file influisce su tutti gli utenti, che abbiano o no il file ~/.mc/ini .
-@@ -3151,7 +3151,7 @@
- .IP
- Questo file contiene i suggerimenti (dritte) mostrate dal programma.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I etc/mc/mc.menu
- .IP
- Questo file contiene il menu di sistema per le applicazioni.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/pl/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/pl/mc.1.in 2009-05-30 19:21:44.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/pl/mc.1.in 2009-05-30 19:22:07.000000000 +0200
-@@ -1152,7 +1152,7 @@
- tylko wtedy kiedy jest on w posiadaniu użytkownika lub roota i mamy do niego
- prawa zapisu. Jeśli takiego nie ma próbuje się z plikiem ~/.mc/menu z tymi
- samymi założeniami, jeśli jego też nie ma \- używa się standardowego pliku
--systemowego, który znajduje się w @prefix@/share/mc/mc.menu.
-+systemowego, który znajduje się w etc/mc/mc.menu.
- .PP
- Format pliku z menu użytkownika jest bardzo prosty. Linie zaczynające się
- od czegokolwiek innego niż spacja lub tabulacja, są traktowane jako
-@@ -2793,7 +2793,7 @@
- .IP
- Plik pomocy dla programu.
- .PP
-- at prefix@/share/mc/mc.ext
-+etc/mc/mc.ext
- .IP
- Standardowy plik rozszerzeń plików.
- .PP
-@@ -2807,7 +2807,7 @@
- Standardowy plik setupu do Midnight Commandera, używany tylko wówczas,
- kiedy użytkownik nie ma swojego własnego pliku ~/.mc/ini.
- .PP
-- at prefix@/share/mc/mc.lib
-+etc/mc/mc.lib
- .IP
- Globalne ustawienia Midnight Commandera. Ustawienia w tym pliku są
- uwzględniane przez wszystkie sesje Midnight Commandera, użyteczne do
-@@ -2822,7 +2822,7 @@
- .IP
- Plik zawierający podpowiedzi (hints) wyświetlane przez program.
- .PP
-- at prefix@/share/mc/mc.menu
-+etc/mc/mc.menu
- .IP
- Ten plik zawiera informacje o ogólnosystemowych aplikacjach w menu.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/ru/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/ru/mc.1.in 2009-05-30 19:22:18.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/ru/mc.1.in 2009-05-30 19:22:41.000000000 +0200
-@@ -3637,7 +3637,7 @@
- .IP
- Файл подсказки для программы.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I etc/mc/mc.ext
- .IP
- Используемый по умолчанию общесистемный файл расширений.
- .PP
-@@ -3653,7 +3653,7 @@
- имеет своего файла
- .B ~/.mc/ini
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I etc/mc/mc.lib
- .IP
- Глобальные установки для Midnight Commander. Установки из этого файла
- действительны для всех пользователей, независимо от того, имеют ли они
-@@ -3674,7 +3674,7 @@
- Этот файл содержит подсказки (hints или cookies), циклически
- отображаемые программой.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I etc/mc/mc.menu
- .IP
- Этот файл содержит общесистемное меню приложений.
- .PP
-Index: mc-4.6.2~git20090529/doc/man/sr/mc.1.in
-===================================================================
---- mc-4.6.2~git20090529.orig/doc/man/sr/mc.1.in 2009-05-30 19:22:58.000000000 +0200
-+++ mc-4.6.2~git20090529/doc/man/sr/mc.1.in 2009-05-30 19:23:17.000000000 +0200
-@@ -1358,7 +1358,7 @@
- дозвољен упис у њу од стране других (света). Ако таква датотека није
- нађена, на исти начин се покушава са датотеком ~/.mc/menu, а иначе ПН
- користи подразумевану датотеку менија за цео систем
-- at prefix@/share/mc/mc.menu.
-+etc/mc/mc.menu.
- .PP
- Формат датотеке менија је веома једноставан. Редови који почињу било
- чим осим размака или табулатора се узимају за ставке менија (да би се
-@@ -3247,7 +3247,7 @@
- .IP
- Датотека помоћи за програм.
- .PP
--.I @prefix@/share/mc/mc.ext
-+.I etc/mc/mc.ext
- .IP
- Подразумевана системска датотека врста.
- .PP
-@@ -3261,7 +3261,7 @@
- Подразумевана системска подешавања Поноћног наредника; користе се само
- у случају да корисник нема сопствену датотеку ~/.mc/ini.
- .PP
--.I @prefix@/share/mc/mc.lib
-+.I etc/mc/mc.lib
- .IP
- Глобалне поставке Поноћног наредника. Поставке из ове датотеке се
- односе на све кориснике без обзира на то да ли они имају своје
-@@ -3280,7 +3280,7 @@
- .IP
- Ова датотека садржи савете (колачиће) који се приказују у програму.
- .PP
--.I @prefix@/share/mc/mc.menu
-+.I etc/mc/mc.menu
- .IP
- Ова датотека садржи подразумевани мени програма за цео систем.
- .PP
More information about the Pkg-mc-commits
mailing list