--- ./lib/mc.lib	Sun Aug 19 12:07:04 2001
+++ ../mc-4.5.55/./lib/mc.lib	Thu Jun 20 14:05:34 2002
@@ -136,3 +136,55 @@
 kpplus=\e[+
 kpminus=\e[-
 kpasterix=\e[*
+
+[terminal:iris-ansi]
+f1=\e[001q
+f2=\e[002q
+f3=\e[003q
+f4=\e[004q
+f5=\e[005q
+f6=\e[006q
+f7=\e[007q
+f8=\e[008q
+f9=\e[009q
+f10=\e[010q
+f11=\e[011q
+f12=\e[012q
+f13=\e[013q
+f14=\e[014q
+f15=\e[015q
+f16=\e[016q
+f17=\e[017q
+f18=\e[018q
+f19=\e[019q
+f20=\e[020q
+f21=\e[021q
+f22=\e[022q
+f23=\e[023q
+f24=\e[024q
+
+[terminal:iris-ansi-net]
+f1=\e[001q
+f2=\e[002q
+f3=\e[003q
+f4=\e[004q
+f5=\e[005q
+f6=\e[006q
+f7=\e[007q
+f8=\e[008q
+f9=\e[009q
+f10=\e[010q
+f11=\e[011q
+f12=\e[012q
+f13=\e[013q
+f14=\e[014q
+f15=\e[015q
+f16=\e[016q
+f17=\e[017q
+f18=\e[018q
+f19=\e[019q
+f20=\e[020q
+f21=\e[021q
+f22=\e[022q
+f23=\e[023q
+f24=\e[024q
--- ./src/Makefile.in	Tue Jul 31 11:24:15 2001
+++ ../mc-4.5.55/./src/Makefile.in	Thu Jun 20 15:28:32 2002
@@ -82,7 +82,7 @@
 	@echo no tests are supplied.
 
 mc: $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) -L../vfs -L../slang -L../edit $(LIBS) 
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) -L../vfs -L../slang -L../edit $(LIBS) $(INTLLIBS)
 
 man2hlp: man2hlp.o
 	$(CC) $(LDFLAGS) man2hlp.o -o man2hlp
--- ./src/key.c	Sat Aug 18 15:27:31 2001
+++ ../mc-4.5.55/./src/key.c	Thu Jun 20 14:07:42 2002
@@ -360,7 +360,8 @@
 }
 
 /* The maximum sequence length (32 + null terminator) */
-static int seq_buffer [33];
+#define SEQ_BUFFER_LEN	33
+static int seq_buffer [SEQ_BUFFER_LEN];
 static int *seq_append = 0;
 
 static int push_char (int c)
@@ -368,7 +369,7 @@
     if (!seq_append)
 	seq_append = seq_buffer;
     
-    if (seq_append == &(seq_buffer [sizeof (seq_buffer)-2]))
+    if (seq_append == &(seq_buffer [SEQ_BUFFER_LEN - 2]))
 	return 0;
     *(seq_append++) = c;
     *seq_append = 0;
--- ./src/mem.h	Sat Jun 23 12:02:05 2001
+++ ../mc-4.5.55/./src/mem.h	Thu Jun 20 14:56:05 2002
@@ -1,7 +1,7 @@
 #ifndef __MEM_H
 #define __MEM_H
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
+#if (defined(STDC_HEADERS) || defined(HAVE_STRING_H)) && !defined(__sgi)
 #   include <string.h>
     /* An ANSI string.h and pre-ANSI memory.h might conflict */
 #   if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
--- ./vfs/cpio.c	Sat Aug 18 23:38:53 2001
+++ ../mc-4.5.55/./vfs/cpio.c	Thu Jun 20 14:08:18 2002
@@ -300,7 +300,7 @@
     if((len = mc_read(super->u.cpio.fd, (void *)buf, HEAD_LENGTH)) < HEAD_LENGTH)
 	return STATUS_EOF;
     CPIO_POS(super) += len;
-    buf[HEAD_LENGTH + 1] = 0;
+    buf[HEAD_LENGTH] = 0;
 
     if(sscanf((void *)buf, "070707%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo",
 	      &hd.c_dev, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid,
--- ./vfs/smbfs.c	Mon Aug 13 20:55:39 2001
+++ ../mc-4.5.55/./vfs/smbfs.c	Thu Jun 20 14:29:15 2002
@@ -247,11 +247,15 @@
 	DEBUGLEVEL = arg;
 }
 
+#ifndef SAMBACONFDIR
+# define SAMBACONFDIR	"/etc"
+#endif
+
 /********************** The callbacks ******************************/
 static int
 smbfs_init(vfs *me)
 {
-	char *servicesf = "/etc/smb.conf";
+	char *servicesf = SAMBACONFDIR "/smb.conf";
 
 /*	DEBUGLEVEL = 4;	*/
 
@@ -945,7 +949,8 @@
 get_master_browser(char **host)
 {
 	int count;
-	struct in_addr *ip_list, bcast_addr, ipzero;
+	struct in_addr *ip_list, bcast_addr;
+	extern struct in_addr ipzero;
 	/* does port = 137 for win95 master browser? */
 	int fd= open_socket_in( SOCK_DGRAM, 0, 3,
                              interpret_addr(lp_socket_address()), True ); 
--- ./vfs/samba/configure.in	Wed Mar 14 20:25:52 2001
+++ ../mc-4.5.55/./vfs/samba/configure.in	Thu Jun 20 14:09:55 2002
@@ -4,6 +4,23 @@
 # we want to be compatibe with older versions of Samba
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
+#################################################
+# check for samba-specific prefix
+AC_MSG_CHECKING(for a samba-specific prefix)
+AC_ARG_WITH(samba,
+[  --with-samba=PREFIX     Samba-specific prefix],
+[ case "${withval:+yes}" in
+  yes)
+    AC_MSG_RESULT(yes)
+    prefix=${withval}
+    ;;
+  *)
+    AC_MSG_RESULT(no)
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
 dnl Unique-to-Samba variables we'll be playing with.
 AC_SUBST(SHELL)
 AC_SUBST(RUNPROG)
--- ./vfs/samba/configure	Fri Aug 24 04:05:16 2001
+++ ../mc-4.5.55/./vfs/samba/configure	Thu Jun 20 14:11:28 2002
@@ -674,6 +674,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-samba=PREFIX     Samba-specific prefix
   --with-ldap     Include LDAP support
   --without-ldap  Don't include LDAP support (default)
   --with-nisplus     Include NISPLUS password database support
@@ -985,6 +986,28 @@
 ac_config_headers="$ac_config_headers include/config.h"
 
 # we want to be compatibe with older versions of Samba
+
+
+#################################################
+# check for samba-specific prefix
+echo $ac_n "checking for a samba-specific prefix""... $ac_c" 1>&6
+echo "configure:592: checking for a samba-specific prefix" >&5
+# Check whether --with-samba or --without-samba was given.
+if test "${with_samba+set}" = set; then
+  withval="$with_samba"
+   case "${withval:+yes}" in
+  yes)
+    echo "$ac_t""yes" 1>&6
+    prefix=${withval}
+    ;;
+  *)
+    echo "$ac_t""no" 1>&6
+    ;;
+  esac 
+else
+  echo "$ac_t""no" 1>&6
+
+fi
 
 # compile with optimisation and without debugging by default
 CFLAGS=${CFLAGS-"-O"}
--- ./slang/slvideo.c	Thu May 14 11:40:42 1998
+++ ../mc-4.5.55/./slang/slvideo.c	Thu Jun 20 14:11:54 2002
@@ -1342,7 +1342,9 @@
       case 14: newcolor = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY; break;
       case 15: newcolor = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY; break;
      }
+   /*
    // switch
+   */
    
    /*
      0        1       2        3
@@ -1377,7 +1379,9 @@
       case 14: newcolor |= BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_INTENSITY; break;
       case 15: newcolor |= BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_INTENSITY; break;
      }
+   /*
    // switch
+   */
    
    Color_Map [obj] = newcolor;