From 972fa7adcc0d64db8b9c7a274c32fa1723961697 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 23 Dec 2015 09:25:16 +0100 Subject: app-misc/mc: Removed old. Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler --- .../mc/files/mc-4.8.11-ncurses_build_fix.patch | 38 ------- app-misc/mc/files/mc-4.8.13-3297-prealloc.patch | 120 --------------------- 2 files changed, 158 deletions(-) delete mode 100644 app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch delete mode 100644 app-misc/mc/files/mc-4.8.13-3297-prealloc.patch (limited to 'app-misc/mc/files') diff --git a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch b/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch deleted file mode 100644 index 0d986eb59f83..000000000000 --- a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: lib/tty/key.c -=================================================================== ---- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f) -+++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9) -@@ -1947,4 +1947,5 @@ - { - int c; -+ static int flag = 0; /* Return value from select */ - #ifdef HAVE_LIBGPM - static struct Gpm_Event ev; /* Mouse event */ -@@ -1979,5 +1980,4 @@ - { - int nfd; -- static int flag = 0; /* Return value from select */ - fd_set select_set; - -Index: lib/tty/tty-ncurses.c -=================================================================== ---- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c) -+++ lib/tty/tty-ncurses.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9) -@@ -50,4 +50,5 @@ - #include "tty.h" - #include "color-internal.h" -+#include "key.h" - #include "mouse.h" - #include "win.h" -@@ -531,4 +532,5 @@ - { - int res; -+ unsigned char str[UTF8_CHAR_LEN + 1]; - - res = g_unichar_to_utf8 (c, (char *) str); -@@ -541,5 +543,4 @@ - else - { -- unsigned char str[UTF8_CHAR_LEN + 1]; - const char *s; - diff --git a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch b/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch deleted file mode 100644 index d84c3484ceba..000000000000 --- a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch +++ /dev/null @@ -1,120 +0,0 @@ -commit a3486faac37680e3bcf7d0b3905f745765a823fd -Author: Andrew Borodin -Date: Mon Nov 10 10:32:34 2014 +0300 - - Ticket #3297: don't lose file in case of preallocate space fail. - - Don't remove the destination file if it was retrieved incompletely - but it was already exist and appended during copy/move operation. - - Signed-off-by: Andrew Borodin - -diff --git a/src/filemanager/file.c b/src/filemanager/file.c -index 9fbf081..3009ccf 100644 ---- a/src/filemanager/file.c -+++ b/src/filemanager/file.c -@@ -1497,7 +1497,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - int open_flags; - gboolean is_first_time = TRUE; - vfs_path_t *src_vpath = NULL, *dst_vpath = NULL; -- gboolean write_errno_nospace = FALSE; - - /* FIXME: We should not be using global variables! */ - ctx->do_reget = 0; -@@ -1739,28 +1738,39 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - goto ret; - } - -- while (TRUE) -+ /* try preallocate space; if fail, try copy anyway */ -+ while (vfs_preallocate (dest_desc, file_size, ctx->do_append != 0 ? sb.st_size : 0) != 0) - { -- errno = vfs_preallocate (dest_desc, file_size, (ctx->do_append != 0) ? sb.st_size : 0); -- if (errno == 0) -+ if (ctx->skip_all) -+ { -+ /* cannot allocate, start the file copying anyway */ -+ return_status = FILE_CONT; - break; -+ } - -- if (ctx->skip_all) -- return_status = FILE_SKIPALL; -- else -+ return_status = -+ file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path); -+ -+ if (return_status == FILE_SKIPALL) -+ ctx->skip_all = TRUE; -+ -+ if (ctx->skip_all || return_status == FILE_SKIP) - { -- return_status = -- file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path); -- if (return_status == FILE_RETRY) -- continue; -- if (return_status == FILE_SKIPALL) -- ctx->skip_all = TRUE; -+ /* skip the space allocation error, start file copying */ -+ return_status = FILE_CONT; -+ break; - } -- mc_close (dest_desc); -- dest_desc = -1; -- mc_unlink (dst_vpath); -- dst_status = DEST_NONE; -- goto ret; -+ -+ if (return_status == FILE_ABORT) -+ { -+ mc_close (dest_desc); -+ dest_desc = -1; -+ mc_unlink (dst_vpath); -+ dst_status = DEST_NONE; -+ goto ret; -+ } -+ -+ /* return_status == FILE_RETRY -- try allocate space again */ - } - - ctx->eta_secs = 0.0; -@@ -1822,6 +1832,8 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - /* dst_write */ - while ((n_written = mc_write (dest_desc, t, n_read)) < n_read) - { -+ gboolean write_errno_nospace; -+ - if (n_written > 0) - { - n_read -= n_written; -@@ -1851,10 +1863,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - } - if (return_status != FILE_RETRY) - goto ret; -- -- /* User pressed "Retry". Will the next mc_write() call be successful? -- * Reset error flag to be ready for that. */ -- write_errno_nospace = FALSE; - } - } - -@@ -1933,16 +1941,9 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - - if (dst_status == DEST_SHORT) - { -- /* Remove short file */ -- int result = 0; -- -- /* In case of copy/move to full partition, keep source file -- * and remove incomplete destination one */ -- if (!write_errno_nospace) -- result = query_dialog (Q_ ("DialogTitle|Copy"), -- _("Incomplete file was retrieved. Keep it?"), -- D_ERROR, 2, _("&Delete"), _("&Keep")); -- if (result == 0) -+ /* Query to remove short file */ -+ if (query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved. Keep it?"), -+ D_ERROR, 2, _("&Delete"), _("&Keep")) == 0) - mc_unlink (dst_vpath); - } - else if (dst_status == DEST_FULL) -- cgit v1.2.3-65-gdbad