1999-06-01 Robert Brady <rwb197@ecs.soton.ac.uk>

	* file.c (move_dir_dir): Give an error when an attempt is made to
	move an empty directory into itself.

1999-06-14  Wayne Roberts <wroberts1@cx983858-b.orng1.occa.home.com>

	* vfs/smbfs.c: New file.  Implements the Samba-based file system.

	* vfs/vfs.h: Declare vfs_smbfs_ops, vfs_file_is_smb.

	* vfs/vfs.c (vfs_file_is_smb): implemented.
	(vfs_init) register smbfs.

	* vfs/samba: Incorporate SAMBA source code required for smbfs

1999-05-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* Make.common.in (confdir): Define confdir as sysconfdir.  This
	should fix the problem we had with FSSTND distributions.

ChangeLog

@@ -1,3 +1,8 @@
+1999-05-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* Make.common.in (confdir): Define confdir as sysconfdir.  This
+	should fix the problem we had with FSSTND distributions.
+
 1999-02-22  Vladimir Kondratiev <vkondra@iil.intel.com>
 
 	* mc.spec.in: added syntax files to %files

Make.common.in

@@ -31,7 +31,7 @@ suppbindir = $(mclibdir)/bin
 gnewdir	   = $(prefix)/share/mc/templates
 tidir      = $(mclibdir)/term
 extfsdir   = $(mclibdir)/extfs
-confdir    = $(prefix)/etc
+confdir    = $(sysconfdir)
 icondir    = $(datadir)/pixmaps/mc
 syntaxdir  = $(mclibdir)/syntax
 localedir  = $(datadir)/locale

Makefile.in

@@ -75,6 +75,7 @@ uninstall:
 
 cross TAGS clean depend dep:
 	@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
+	cd vfs/samba && $(MAKE) $@
 
 Makefile: Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) config.status
@@ -100,6 +101,7 @@ distclean:
 	rm -f lib/mc.ext mcfn_install 
 	rm -f vfs/extfs/{ftplist,uzip,uzoo,lslR,ulha,ucpio,deb,urar,uar}
 	rm -f $(srcdir)/config.log $(srcdir)/config.status 
+	cd vfs/samba && $(MAKE) $@
 
 distcopy:
 	sed -e "s/^%define ver .*/%define ver      $(VERSION)/; s/^%define rel .*/%define rel      1/" mc.spec > Specfile

autogen.sh

@@ -14,6 +14,7 @@ else
 fi
 autoheader
 autoconf
+(cd vfs/samba; autoheader; autoconf)
 )
 
 $srcdir/configure --enable-maintainer-mode $*

configure.in

@@ -1233,6 +1233,8 @@ dnl
 dnl Output configuration filesn
 dnl
 
+AC_CONFIG_SUBDIRS(vfs/samba)
+
 AC_OUTPUT([
 Make.common 
 Makefile 

doc/mc.sgml

@@ -2714,6 +2714,7 @@ and many bug fixes (in alphabetical order):
 <item>Tomasz Cholewo (<tt/tjchol01@mecca.spd.louisville.edu/)
 <item>Torben Fjerdingstad (<tt/torben.fjerdingstad@uni-c.dk/)
 <item>Vadim Sinolitis (<tt/vvs@nsrd.npi.msu.su/)
+<item>Wayne Roberts (<tt/wroberts1@cx983858-b.orng1.occa.home.com/)
 <item>Wim Osterholt (<tt/wim@djo.wtm.tudelft.nl/)
 </itemize>
 

src/ChangeLog

@@ -1,3 +1,8 @@
+1999-06-01  Robert Brady  <rwb197@ecs.soton.ac.uk>
+
+	* file.c (move_dir_dir): Give an error when an attempt is made to
+	move an empty directory into itself.
+
 1999-06-22  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* cmd.c (quick_view_cmd): Change panel when the file we want to

src/cmd.c

@@ -1322,6 +1322,12 @@ void ftplink_cmd (void)
 	     "[FTP File System]", "/#ftp:", 1);
 }
 
+void smblink_cmd (void)
+{
+    nice_cd (_(" SMB link to machine "), _(machine_str),
+	     "[SMB File System]", "/#smb:", 0);
+}
+
 #ifdef HAVE_SETSOCKOPT
 void source_routing (void)
 {

src/cmd.h

@@ -2,6 +2,7 @@
 #define __CMD_H
 void netlink_cmd (void);
 void ftplink_cmd (void);
+void smblink_cmd (void);
 void undelete_cmd (void);
 void help_cmd (void);
 void dirsizes_cmd (void);

src/file.c

@@ -323,7 +323,7 @@ check_hardlinks (char *src_name, char *dst_name, struct stat *pstat)
     char *p;
 
 #if 1	/* What will happen if we kill this line? mc_link() will fail on this and it is right behaviour... */
-    if (vfs_file_is_ftp (src_name))
+    if (vfs_file_is_ftp (src_name) || vfs_file_is_smb (src_name))
         return 0;
 #endif
     for (lp = linklist; lp != NULL; lp = lp -> next)
@@ -1230,6 +1230,25 @@ move_dir_dir (FileOpContext *ctx, char *s, char *d, long *progress_count, double
 	move_over = 1;
     } else
 	destdir = concat_dir_and_file (d, x_basename (s));
+#ifndef OS2_NT
+    if (sbuf.st_dev == dbuf.st_dev
+	&& sbuf.st_ino == dbuf.st_ino){
+	    int msize = COLS - 36;
+            char st[MC_MAXPATHLEN];
+            char dt[MC_MAXPATHLEN];
+
+	    if (msize < 0)
+		msize = 40;
+	    msize /= 2;
+
+	    strcpy (st, name_trunc (s, msize));
+	    strcpy (dt, name_trunc (d, msize));
+	    message_3s (1, MSG_ERROR, _(" `%s' and `%s' are the same directory "),
+		     st, dt );
+	    do_refresh ();
+	    return FILE_SKIP;
+	}
+#endif
 
     /* Check if the user inputted an existing dir */
  retry_dst_stat: