From 7608383a3e6d3568f888f5f421c18c7d9ccdb02b Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 19 Aug 2002 07:22:01 +0000
Subject: [PATCH] * mcfs.c [!WITH_MCFS]: Disable most code.

---
 vfs/ChangeLog |  4 +++
 vfs/mcfs.c    | 89 +++++++++++++++++++++++++++------------------------
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 289cae5b5..2b2012318 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-19  Pavel Roskin  <proski@gnu.org>
+
+	* mcfs.c [!WITH_MCFS]: Disable most code.
+
 2002-08-18  Pavel Roskin  <proski@gnu.org>
 
 	* vfs.h: Declare vfs_timeout and tar_gzipped_memlimit.
diff --git a/vfs/mcfs.c b/vfs/mcfs.c
index 6fe373c00..255c8624a 100644
--- a/vfs/mcfs.c
+++ b/vfs/mcfs.c
@@ -51,7 +51,6 @@
 #include "../src/dialog.h"
 
 #define MCFS_MAX_CONNECTIONS 32
-#define mcserver_port 9876
 
 static struct _mcfs_connection {
     char *host;
@@ -62,6 +61,10 @@ static struct _mcfs_connection {
     int  version;
 } mcfs_connections [MCFS_MAX_CONNECTIONS];
 
+#ifdef WITH_MCFS
+
+#define mcserver_port 9876
+
 typedef struct _mcfs_connection mcfs_connection;
 
 typedef struct { int handle; mcfs_connection *conn; } mcfs_handle;
@@ -93,47 +96,6 @@ static void mcfs_fill_names (vfs *me, void (*func)(char *))
     }
 }
 
-static void mcfs_free_bucket (int bucket)
-{
-    g_free (mcfs_connections [bucket].host);
-    g_free (mcfs_connections [bucket].user);
-    g_free (mcfs_connections [bucket].home);
-
-    /* Set all the fields to zero */
-    mcfs_connections [bucket].host =
-	mcfs_connections [bucket].user =
-	    mcfs_connections [bucket].home = 0;
-    mcfs_connections [bucket].sock =
-	mcfs_connections [bucket].version = 0;
-}
-
-/* FIXME: This part should go to another c module, perhaps tcp.c */
-static int mcfs_invalidate_socket (int);
-
-void tcp_invalidate_socket (int sock)
-{
-     mcfs_invalidate_socket (sock);
-}
-/* FIXME end: 'cause it is used not only by mcfs */
-
-static int mcfs_invalidate_socket (int sock)
-{
-    int i, j = -1;
-    extern int mc_chdir (char *);
-    
-    for (i = 0; i < MCFS_MAX_CONNECTIONS; i++)
-	if (mcfs_connections [i].sock == sock) {
-	    mcfs_free_bucket (i);
-	    j = 0;
-	}
-
-    if (j == -1)
-        return -1; /* It was not our sock */
-    /* Break from any possible loop */
-    mc_chdir ("/");
-    return 0;
-}
-
 /* This routine checks the server RPC version and logs the user in */
 static int mcfs_login_server (int my_socket, char *user, int port,
 			      int port_autodetected, char *netrcpass,
@@ -1164,3 +1126,46 @@ vfs vfs_mcfs_ops = {
 
 MMAPNULL
 };
+
+#endif /* WITH_MCFS */
+
+
+/* FIXME: This part should go to another c module, perhaps tcp.c */
+
+static void mcfs_free_bucket (int bucket)
+{
+    g_free (mcfs_connections [bucket].host);
+    g_free (mcfs_connections [bucket].user);
+    g_free (mcfs_connections [bucket].home);
+
+    /* Set all the fields to zero */
+    mcfs_connections [bucket].host =
+	mcfs_connections [bucket].user =
+	    mcfs_connections [bucket].home = 0;
+    mcfs_connections [bucket].sock =
+	mcfs_connections [bucket].version = 0;
+}
+
+static int mcfs_invalidate_socket (int sock)
+{
+    int i, j = -1;
+    extern int mc_chdir (char *);
+    
+    for (i = 0; i < MCFS_MAX_CONNECTIONS; i++)
+	if (mcfs_connections [i].sock == sock) {
+	    mcfs_free_bucket (i);
+	    j = 0;
+	}
+
+    if (j == -1)
+        return -1; /* It was not our sock */
+    /* Break from any possible loop */
+    mc_chdir ("/");
+    return 0;
+}
+
+void tcp_invalidate_socket (int sock)
+{
+     mcfs_invalidate_socket (sock);
+}
+/* FIXME end: 'cause it is used not only by mcfs */