Three bugs in mc-4.6.1-pre1

[Andriy Gritsenko]

    Hi, people!

    I've recently found three bugs with upstream version of Midnight
Commander. I've fixed these already and pathces are in attachments. Some
words about these:
1. I used to view content of /dev/cdrom without additional tools but
right via F3 key. It's not a problem with a block devices. I appreciate
that you denied viewing of devices but block devices must be excluded as
they may be viewed. :)
2. With locale "ua" on some dialogs I cannot press meta-p to get previous
value from field history. It's very bad when you're not in X nor local
console and cannot use mouse and have to type what you need each time.
3. When you try open archives that have names that prepended with "./"
then you cannot see any files in root directory of archive. It's started
in recent versions of mc, 4.5.55 has not that bug.
    All these bugs are fixed, please, fix upstream too. :)

    With best wishes.
    Andriy.
-------------- next part --------------
--- mc-4.6.1-pre1.orig/src/view.c	Wed Dec 24 09:44:08 2003
+++ mc-4.6.1-pre1/src/view.c	Sat Apr  3 22:45:55 2004
@@ -630,7 +630,7 @@ do_view_init (WView *view, const char *_
 	    goto finish;
 	}
 
-	if (!S_ISREG (view->s.st_mode)) {
+	if (!S_ISREG (view->s.st_mode) && !S_ISBLK (view->s.st_mode)) {
 	    mc_close (fd);
 	    g_snprintf (tmp, sizeof (tmp),
 			_(" Cannot view: not a regular file "));
-------------- next part --------------
diff -udpr mc-4.6.1-pre1.orig/po/uk.po mc-4.6.1-pre1/po/uk.po
--- mc-4.6.1-pre1.orig/po/uk.po	Wed Dec 24 19:16:26 2003
+++ mc-4.6.1-pre1/po/uk.po	Sat Apr 17 17:17:14 2004
@@ -236,11 +236,11 @@ msgstr "???????? ??&o ??????"
 
 #: edit/editcmd.c:1236 edit/editcmd.c:1314 src/view.c:2110
 msgid "&Backwards"
-msgstr "&?????"
+msgstr "&H????"
 
 #: edit/editcmd.c:1238 edit/editcmd.c:1316
 msgid "&Regular expression"
-msgstr "&P????????? ?????"
+msgstr "?&e???????? ?????"
 
 #: edit/editcmd.c:1240 edit/editcmd.c:1318
 msgid "&Whole words only"
@@ -2094,7 +2094,7 @@ msgstr " ??????? ??????: ???? ????? "
 
 #: src/filegui.c:728
 msgid "preserve &Attributes"
-msgstr "???&p????? ????????"
+msgstr "????????? ?????&y??"
 
 #: src/filegui.c:730
 msgid "follow &Links"
-------------- next part --------------
diff -udpr mc-4.6.1-pre1.orig/vfs/tar.c mc-4.6.1-pre1/vfs/tar.c
--- mc-4.6.1-pre1.orig/vfs/tar.c	Wed Nov 26 23:10:44 2003
+++ mc-4.6.1-pre1/vfs/tar.c	Sat Apr 17 21:42:27 2004
@@ -455,13 +455,11 @@ tar_read_header (struct vfs_class *me, s
 	current_file_name = (next_long_name
 			     ? next_long_name
 			     : g_strdup (header->header.arch_name));
+	canonicalize_pathname (current_file_name);	
 	len = strlen (current_file_name);
-	if (current_file_name[len - 1] == '/') {
-	    current_file_name[len - 1] = 0;
-	}
 
 	data_position = current_tar_position;
-	
+
 	p = strrchr (current_file_name, '/');
 	if (p == NULL) {
 	    p = current_file_name;