Shell variable has moved to vfs/util-alone.c

["Andrew V. Samoilov" <sav bcs zp ua>]

Hi!

This patch moves shell variable from vfs/sfs.c to vfs/util-alone.c.
So mc can use its own shell variable and don't care about VFS subsystem.

I hope this patch doesn't break nothing, but if somebody know it is not so,
mail me please.

Regards,
Andrew.

--- src/ChangeLog~	Tue May 22 15:07:45 2001
+++ src/ChangeLog	Wed May 23 14:53:43 2001
@@ -1,3 +1,7 @@
+2001-05-23  Andrew V. Samoilov  <sav bcs zp ua>
+
+	* main.c (shell): Remove comment and #ifdef around shell variable.
+
 2001-05-22  Pavel Roskin  <proski gnu org>
 
 	* ext.c (exec_extension): Use g_free() on the result of
Index: src/main.c
===================================================================
RCS file: /home/sav/.cvsroot/mc/src/main.c,v
retrieving revision 1.113.2.1
diff -u -p -r1.113.2.1 main.c
--- src/main.c	2000/07/07 14:05:33	1.113.2.1
+++ src/main.c	2001/05/23 07:56:19
@@ -354,14 +351,8 @@ int boot_current_is_left = 1;
 /* Used for keeping track of the original stdout */
 int stdout_fd = 0;
 
-/*
- * Ugh.  Pavel, you shell hack in sfs is BAD.
- * We need to kill shell from vfs
- */
-#ifndef USE_VFS
 /* The user's shell */
 char *shell;
-#endif
 
 /* mc_home: The home of MC */
 char *mc_home;
--- vfs/ChangeLog~	Wed May 23 12:28:11 2001
+++ vfs/ChangeLog	Wed May 23 14:49:17 2001
@@ -1,3 +1,8 @@
+2001-05-23  Andrew V. Samoilov  <sav bcs zp ua>
+
+	* sfs.c (shell): Variable moved to ...
+	* util-alone.c (shell): ... here.
+
 2001-05-22  Pavel Roskin  <proski gnu org>
 
 	* vfs.c (vfs_split_text): Fill `columns' with zeroes before
Index: vfs/sfs.c
===================================================================
RCS file: /home/sav/.cvsroot/mc/vfs/sfs.c,v
retrieving revision 1.22
diff -u -p -r1.22 sfs.c
--- vfs/sfs.c	2000/10/12 08:58:38	1.22
+++ vfs/sfs.c	2001/05/23 07:54:44
@@ -27,9 +27,6 @@
 #include "vfs.h"
 #include "local.h"
 
-/* This is needed, or libvfs.so will lack symbol shell. Should look up who requires it */
-char *shell = "/bin/sh";
-
 struct cachedfile {
     char *name, *cache;
     uid_t uid;
--- vfs/util-alone.c	Wed May 23 11:05:13 2001
+++ vfs/util-alone.c	Wed May 23 11:06:44 2001
@@ -61,7 +54,8 @@
 
 int source_route = 0;
 int cd_symlinks = 0;
+char *shell = "/bin/sh";	/* User's shell */
 
 /*
  * We do not want/need many of midnight's functions, stub routines.