1999-06-22 Miguel de Icaza <miguel@nuclecu.unam.mx>

* acconfig.h: Add WITH_SMBFS * macros/gnome-vfs.m4: Support conditional samba support. 1999-06-22 Miguel de Icaza <miguel@nuclecu.unam.mx> * gsession.c (create_default_panel): Use directory specified in command line. * gcorba.c (corba_create_window): Pass the directory we receive or cwd if this value is NULL. * gmain.c (non_corba_create_panels): Use parameter for startup directory (use the this_dir external directory for this). (create_panels): Pass this_dsir to non_corba_create_panels and corba_create_window.
2025-01-03 10:04:32 +03:00 · 1999-06-22 21:02:08 +00:00 · 1999-06-22 21:02:08 +00:00 · 9f81821878
commit 9f81821878
parent 3e808d598f
16 changed files with 463 additions and 325 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+1999-06-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* acconfig.h: Add WITH_SMBFS
+
+	* macros/gnome-vfs.m4: Support conditional samba support.
+
 1999-05-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>

 	* Make.common.in (confdir): Define confdir as sysconfdir.  This
--- a/acconfig.h
+++ b/acconfig.h
@ -205,6 +205,8 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES

+#undef WITH_SMBFS
+
@BOTTOM@

 #ifdef HAVE_LIBPT
--- a/configure.in
+++ b/configure.in
@ -959,7 +959,7 @@ AC_DEFUN(AC_EXT2_UNDEL, [
  GNOME_UNDELFS_CHECKS
  if test "$ext2fs_undel" = yes; then
     AC_MSG_RESULT(With ext2fs file recovery code)
-     vfs_flags="${vfs_flags} undelfs"
+     vfs_flags="${vfs_flags}, undelfs"
     undelfs_o="undelfs.o"
     LIBS="$LIBS $EXT2FS_UNDEL_LIBS"
  else
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@ -1,3 +1,16 @@
+1999-06-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gsession.c (create_default_panel): Use directory specified in
+	command line.
+
+	* gcorba.c (corba_create_window): Pass the directory we receive or
+	cwd if this value is NULL.
+
+	* gmain.c (non_corba_create_panels): Use parameter for startup
+	directory (use the this_dir external directory for this).
+	(create_panels): Pass this_dsir to non_corba_create_panels and
+	corba_create_window. 
+
 1999-06-22  David Martin <dmartina@usa.net>

 	* gnome-file-property-dialog.c (switch_metadata_box): Tag some
--- a/gnome/gcorba.c
+++ b/gnome/gcorba.c
@ -16,6 +16,7 @@
 #include "gcorba.h"
 #include "global.h"
 #include "gmain.h"
+#include "main.h"

 /*** Global variables ***/

@ -362,14 +363,18 @@ corba_init_server (void)
 * Creates a GMC window using a CORBA call to the server.
 **/
 void
-corba_create_window (void)
+corba_create_window (const char *startup_dir)
 {
 	CORBA_Environment ev;
 	char cwd[MC_MAXPATHLEN];
-
-	mc_get_current_wd (cwd, MC_MAXPATHLEN);
-
+	char *dir = cwd;
+	
+	if (this_dir == NULL)
+		mc_get_current_wd (cwd, MC_MAXPATHLEN);
+	else
+		dir = this_dir;
+	
 	CORBA_exception_init (&ev);
-	GNOME_FileManagerFactory_create_window (gmc_server, cwd, &ev);
+	GNOME_FileManagerFactory_create_window (gmc_server, startup_dir, &ev);
 	CORBA_exception_free (&ev);
 }
--- a/gnome/gcorba.h
+++ b/gnome/gcorba.h
@ -18,7 +18,7 @@ extern CORBA_ORB orb;


 int corba_init_server (void);
-void corba_create_window (void);
+void corba_create_window (const char *startup_dir);


 #endif
--- a/gnome/glayout.c
+++ b/gnome/glayout.c
@ -794,7 +794,7 @@ create_container (Dlg_head *h, char *name, char *geometry)
 }

 WPanel *
-new_panel_with_geometry_at (char *dir, char *geometry)
+new_panel_with_geometry_at (const char *dir, const char *geometry)
 {
 	WPanel *panel;

@ -810,7 +810,7 @@ new_panel_with_geometry_at (char *dir, char *geometry)
 }

 WPanel *
-new_panel_at (char *dir)
+new_panel_at (const char *dir)
 {
 	return new_panel_with_geometry_at (dir, NULL);
 }
--- a/gnome/gmain.c
+++ b/gnome/gmain.c
@ -468,7 +468,7 @@ idle_destroy_panel (gpointer data)
 * when we do not have a CORBA server.
 */
 static void
-non_corba_create_panels (void)
+non_corba_create_panels (char *startup_dir)
 {
 	WPanel *panel;

@ -488,7 +488,7 @@ non_corba_create_panels (void)
 	 * at a higher priority than the one used in session_load().
 	 */

-	panel = new_panel_at (".");
+	panel = new_panel_at (startup_dir);
 	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT, idle_destroy_panel, panel);
 	panel->widget.options |= W_PANEL_HIDDEN;

@ -508,10 +508,10 @@ void
 create_panels (void)
 {
 	if (!corba_have_server)
-		non_corba_create_panels ();
+		non_corba_create_panels (this_dir ? this_dir : ".");
 	else {
 		if (!nowindows)
-			corba_create_window ();
+			corba_create_window (this_dir);

 		session_set_restart (FALSE);
 	}
--- a/gnome/gmain.h
+++ b/gnome/gmain.h
@ -32,8 +32,8 @@ void x_add_widget       	     (Dlg_head *h, Widget_Item *w);
 int  translate_gdk_keysym_to_curses (GdkEventKey *event);
 void gnome_init_panels ();
 void bind_gtk_keys (GtkWidget *w, Dlg_head *h);
-WPanel *new_panel_at (char *dir);
-WPanel *new_panel_with_geometry_at (char *dir, char *geometry);
+WPanel *new_panel_at (const char *dir);
+WPanel *new_panel_with_geometry_at (const char *dir, const char *geometry);
 void set_current_panel (WPanel *panel);
 void layout_panel_gone (WPanel *panel);
 void gtkrundlg_event (Dlg_head *h);
--- a/gnome/gsession.c
+++ b/gnome/gsession.c
@ -140,13 +140,17 @@ idle_create_default_panel (gpointer data)

 /* Queues the creation of the default panel */
 static void
-create_default_panel (void)
+create_default_panel (const char *startup_dir)
 {
 	char buf[MC_MAXPATHLEN];
+	char *dir = buf;

-	mc_get_current_wd (buf, MC_MAXPATHLEN);
-
-	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT + 1, idle_create_default_panel, g_strdup (buf));
+	if (startup_dir == NULL)
+		mc_get_current_wd (buf, MC_MAXPATHLEN);
+	else
+		dir = startup_dir;
+	
+	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT + 1, idle_create_default_panel, g_strdup (dir));
 }

 /* Callback from the master client to save the session */
@ -226,7 +230,7 @@ session_load (void)
 		filename = gnome_client_get_config_prefix (master_client);
 		load_session_info (filename);
 	} else if (!nowindows)
-		create_default_panel ();
+		create_default_panel (this_dir);
 }

 /**
--- a/po/mc.pot
+++ b/po/mc.pot
--- a/src/main.c
+++ b/src/main.c
@ -1242,7 +1242,9 @@ static menu_entry PanelMenu [] = {
    { ' ', "", ' ', 0 },		    
    { ' ', N_("&Network link..."),          'N', netlink_cmd },
    { ' ', N_("FT&P link..."),              'P', ftplink_cmd },
+#ifdef WITH_SMBFS
    { ' ', N_("SM&B link..."),              'B', smblink_cmd },
+#endif
 #endif
    { ' ', "", ' ', 0 },
 #ifdef OS2_NT
@ -1264,7 +1266,9 @@ static menu_entry RightMenu [] = {
    { ' ', "", ' ', 0 },		    
    { ' ', N_("&Network link..."),       'N', netlink_cmd },
    { ' ', N_("FT&P link..."),           'P', ftplink_cmd },
+#ifdef WITH_SMBFS
    { ' ', N_("SM&B link..."),           'B', smblink_cmd },
+#endif
 #endif
    { ' ', "", ' ', 0 },
 #ifdef OS2_NT
@ -2579,7 +2583,9 @@ process_args (int c, const char *option_arg)
 #ifdef USE_NETCODE
    case 'l':
 	ftpfs_set_debug (option_arg);
+#ifdef WITH_SMBFS
 	smbfs_set_debug (option_arg);
+#endif
 	break;
 #endif

@ -2777,7 +2783,7 @@ init_corba_with_args (int *argc, char **argv, poptContext *ctx)

 #ifndef HAVE_CORBA
 void
-corba_create_window (void)
+corba_create_window (const char *startup_dir)
 {
 	/* nothing */
 }
--- a/src/main.h
+++ b/src/main.h
@ -133,6 +133,9 @@ void do_update_prompt (void);
 extern char control_file [];
 extern char *shell;

+/* directory specified on command line for startup */
+extern char *this_dir;
+
 /* FIXME: remove this when using slang */
 extern const int status_using_ncurses;

--- a/vfs/Make-mc.in
+++ b/vfs/Make-mc.in
@ -21,7 +21,7 @@ AR = @AR@
 #
 # VFS code
 #
-NETFILES   = tcputil.o fish.o ftpfs.o smbfs.o mcfs.o utilvfs.o
+NETFILES   = tcputil.o fish.o ftpfs.o @smbfs@ mcfs.o utilvfs.o

 SAMBAFILES=         \
    samba/param/loadparm.o  \
--- a/vfs/samba/include/config.h
+++ b/vfs/samba/include/config.h
@ -66,7 +66,7 @@
 /* #undef HAVE_BROKEN_READDIR */
 #define HAVE_ERRNO_DECL 1
 #define HAVE_LONGLONG 1
-#define HAVE_OFF64_T 1
+/* #undef HAVE_OFF64_T */
 /* #undef HAVE_REMSH */
 /* #undef HAVE_UNSIGNED_CHAR */
 #define HAVE_UTIMBUF 1
@ -103,18 +103,18 @@
 /* #undef FTRUNCATE_NEEDS_ROOT */
 /* #undef HAVE_TRAPDOOR_UID */
 /* #undef HAVE_ROOT */
-/* #undef HAVE_UNION_SEMUN */
-/* #undef HAVE_NETMASK_IFCONF */
+#define HAVE_UNION_SEMUN 1
+#define HAVE_NETMASK_IFCONF 1
 #define HAVE_GETTIMEOFDAY_TZ 1
 /* #undef HAVE_SOCK_SIN_LEN */
 /* #undef STAT_READ_FILSYS */
-/* #undef STAT_STATFS2_BSIZE */
+#define STAT_STATFS2_BSIZE 1
 /* #undef STAT_STATFS2_FSIZE */
 /* #undef STAT_STATFS2_FS_DATA */
 /* #undef STAT_STATFS3_OSF1 */
 /* #undef STAT_STATFS4 */
 /* #undef STAT_STATVFS */
-#define STAT_STATVFS64 1
+/* #undef STAT_STATVFS64 */
 /* #undef HAVE_NETMASK_IFREQ */
 /* #undef HAVE_NETMASK_AIX */
 #define HAVE_CRYPT 1
@ -139,10 +139,10 @@
 #define HAVE_SETRESUID 1
 /* #undef WITH_NETATALK */
 /* #undef HAVE_INO64_T */
-#define HAVE_STRUCT_FLOCK64 1
+/* #undef HAVE_STRUCT_FLOCK64 */
 /* #undef SIZEOF_INO_T */
 /* #undef SIZEOF_OFF_T */
-#define STAT_STATVFS64 1
+/* #undef STAT_STATVFS64 */
 #define HAVE_LIBREADLINE 1
 /* #undef HAVE_KERNEL_OPLOCKS */
 /* #undef HAVE_IRIX_SPECIFIC_CAPABILITIES */
@ -157,19 +157,19 @@
 #define HAVE_GETSPNAM 1
 /* #undef HAVE_BIGCRYPT */
 /* #undef HAVE_GETPRPWNAM */
-#define HAVE_FSTAT64 1
-#define HAVE_LSTAT64 1
-#define HAVE_STAT64 1
+/* #undef HAVE_FSTAT64 */
+/* #undef HAVE_LSTAT64 */
+/* #undef HAVE_STAT64 */
 #define HAVE_SETRESGID 1
 /* #undef HAVE_SETRESGID_DECL */
 #define HAVE_SHADOW_H 1
 #define HAVE_MEMSET 1
 #define HAVE_STRCASECMP 1
-#define HAVE_STRUCT_DIRENT64 1
+/* #undef HAVE_STRUCT_DIRENT64 */
 /* #undef HAVE_TRUNCATED_SALT */
 #define BROKEN_NISPLUS_INCLUDE_FILES 1
 /* #undef HAVE_RPC_AUTH_ERROR_CONFLICT */
-#define HAVE_EXPLICIT_LARGEFILE_SUPPORT 1
+/* #undef HAVE_EXPLICIT_LARGEFILE_SUPPORT */
 /* #undef USE_BOTH_CRYPT_CALLS */

 /* The number of bytes in a int.  */
@ -185,16 +185,16 @@
 /* #undef HAVE___ACL */

 /* Define if you have the __chdir function.  */
-/* #undef HAVE___CHDIR */
+#define HAVE___CHDIR 1

 /* Define if you have the __close function.  */
 #define HAVE___CLOSE 1

 /* Define if you have the __closedir function.  */
-/* #undef HAVE___CLOSEDIR */
+#define HAVE___CLOSEDIR 1

 /* Define if you have the __dup function.  */
-/* #undef HAVE___DUP */
+#define HAVE___DUP 1

 /* Define if you have the __dup2 function.  */
 #define HAVE___DUP2 1
@ -221,10 +221,10 @@
 #define HAVE___FXSTAT 1

 /* Define if you have the __getcwd function.  */
-/* #undef HAVE___GETCWD */
+#define HAVE___GETCWD 1

 /* Define if you have the __getdents function.  */
-/* #undef HAVE___GETDENTS */
+#define HAVE___GETDENTS 1

 /* Define if you have the __llseek function.  */
 /* #undef HAVE___LLSEEK */
@ -248,25 +248,25 @@
 /* #undef HAVE___OPEN64 */

 /* Define if you have the __opendir function.  */
-/* #undef HAVE___OPENDIR */
+#define HAVE___OPENDIR 1

 /* Define if you have the __pread function.  */
 /* #undef HAVE___PREAD */

 /* Define if you have the __pread64 function.  */
-#define HAVE___PREAD64 1
+/* #undef HAVE___PREAD64 */

 /* Define if you have the __pwrite function.  */
 /* #undef HAVE___PWRITE */

 /* Define if you have the __pwrite64 function.  */
-#define HAVE___PWRITE64 1
+/* #undef HAVE___PWRITE64 */

 /* Define if you have the __read function.  */
 #define HAVE___READ 1

 /* Define if you have the __readdir function.  */
-/* #undef HAVE___READDIR */
+#define HAVE___READDIR 1

 /* Define if you have the __readdir64 function.  */
 /* #undef HAVE___READDIR64 */
@ -281,7 +281,7 @@
 /* #undef HAVE___STAT64 */

 /* Define if you have the __sys_llseek function.  */
-/* #undef HAVE___SYS_LLSEEK */
+#define HAVE___SYS_LLSEEK 1

 /* Define if you have the __telldir function.  */
 /* #undef HAVE___TELLDIR */
@ -413,7 +413,7 @@
 #define HAVE_CONNECT 1

 /* Define if you have the creat64 function.  */
-#define HAVE_CREAT64 1
+/* #undef HAVE_CREAT64 */

 /* Define if you have the crypt function.  */
 #define HAVE_CRYPT 1
@ -431,19 +431,19 @@
 #define HAVE_EXECL 1

 /* Define if you have the fopen64 function.  */
-#define HAVE_FOPEN64 1
+/* #undef HAVE_FOPEN64 */

 /* Define if you have the fseek64 function.  */
 /* #undef HAVE_FSEEK64 */

 /* Define if you have the fseeko64 function.  */
-#define HAVE_FSEEKO64 1
+/* #undef HAVE_FSEEKO64 */

 /* Define if you have the fstat function.  */
 #define HAVE_FSTAT 1

 /* Define if you have the fstat64 function.  */
-#define HAVE_FSTAT64 1
+/* #undef HAVE_FSTAT64 */

 /* Define if you have the fsync function.  */
 #define HAVE_FSYNC 1
@ -452,13 +452,13 @@
 /* #undef HAVE_FTELL64 */

 /* Define if you have the ftello64 function.  */
-#define HAVE_FTELLO64 1
+/* #undef HAVE_FTELLO64 */

 /* Define if you have the ftruncate function.  */
 #define HAVE_FTRUNCATE 1

 /* Define if you have the ftruncate64 function.  */
-#define HAVE_FTRUNCATE64 1
+/* #undef HAVE_FTRUNCATE64 */

 /* Define if you have the getauthuid function.  */
 /* #undef HAVE_GETAUTHUID */
@ -491,7 +491,7 @@
 #define HAVE_GLOB 1

 /* Define if you have the grantpt function.  */
-#define HAVE_GRANTPT 1
+/* #undef HAVE_GRANTPT */

 /* Define if you have the initgroups function.  */
 #define HAVE_INITGROUPS 1
@ -503,10 +503,10 @@
 #define HAVE_LLSEEK 1

 /* Define if you have the lseek64 function.  */
-#define HAVE_LSEEK64 1
+/* #undef HAVE_LSEEK64 */

 /* Define if you have the lstat64 function.  */
-#define HAVE_LSTAT64 1
+/* #undef HAVE_LSTAT64 */

 /* Define if you have the memmove function.  */
 #define HAVE_MEMMOVE 1
@ -518,10 +518,10 @@
 #define HAVE_MKTIME 1

 /* Define if you have the mmap64 function.  */
-#define HAVE_MMAP64 1
+/* #undef HAVE_MMAP64 */

 /* Define if you have the open64 function.  */
-#define HAVE_OPEN64 1
+/* #undef HAVE_OPEN64 */

 /* Define if you have the pathconf function.  */
 #define HAVE_PATHCONF 1
@ -530,19 +530,19 @@
 #define HAVE_PIPE 1

 /* Define if you have the pread function.  */
-#define HAVE_PREAD 1
+/* #undef HAVE_PREAD */

 /* Define if you have the pread64 function.  */
-#define HAVE_PREAD64 1
+/* #undef HAVE_PREAD64 */

 /* Define if you have the putprpwnam function.  */
 /* #undef HAVE_PUTPRPWNAM */

 /* Define if you have the pwrite function.  */
-#define HAVE_PWRITE 1
+/* #undef HAVE_PWRITE */

 /* Define if you have the pwrite64 function.  */
-#define HAVE_PWRITE64 1
+/* #undef HAVE_PWRITE64 */

 /* Define if you have the rand function.  */
 #define HAVE_RAND 1
@ -554,7 +554,7 @@
 /* #undef HAVE_RDCHK */

 /* Define if you have the readdir64 function.  */
-#define HAVE_READDIR64 1
+/* #undef HAVE_READDIR64 */

 /* Define if you have the rename function.  */
 #define HAVE_RENAME 1
@ -620,7 +620,7 @@
 #define HAVE_SRANDOM 1

 /* Define if you have the stat64 function.  */
-#define HAVE_STAT64 1
+/* #undef HAVE_STAT64 */

 /* Define if you have the strcasecmp function.  */
 #define HAVE_STRCASECMP 1
@ -725,7 +725,7 @@
 #define HAVE_RPC_RPC_H 1

 /* Define if you have the <rpcsvc/nis.h> header file.  */
-#define HAVE_RPCSVC_NIS_H 1
+/* #undef HAVE_RPCSVC_NIS_H */

 /* Define if you have the <rpcsvc/yp_prot.h> header file.  */
 #define HAVE_RPCSVC_YP_PROT_H 1
@ -752,7 +752,7 @@
 #define HAVE_STRINGS_H 1

 /* Define if you have the <stropts.h> header file.  */
-#define HAVE_STROPTS_H 1
+/* #undef HAVE_STROPTS_H */

 /* Define if you have the <sys/acl.h> header file.  */
 /* #undef HAVE_SYS_ACL_H */
@ -824,7 +824,7 @@
 #define HAVE_SYS_STATFS_H 1

 /* Define if you have the <sys/statvfs.h> header file.  */
-#define HAVE_SYS_STATVFS_H 1
+/* #undef HAVE_SYS_STATVFS_H */

 /* Define if you have the <sys/syscall.h> header file.  */
 #define HAVE_SYS_SYSCALL_H 1
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@ -967,6 +967,7 @@ vfs_file_is_ftp (char *filename)
 #endif
 }

+#ifdef WITH_SMBFS
 int
 vfs_file_is_smb (char *filename)
 {
@ -981,6 +982,13 @@ vfs_file_is_smb (char *filename)
    return 0;
 #endif
 }
+#else
+int
+vfs_file_is_smb (char *filename)
+{
+	return 0;
+}
+#endif

 char *vfs_get_current_dir (void)
 {
@ -1205,7 +1213,9 @@ vfs_init (void)
 #ifdef USE_NETCODE
    tcp_init();
    vfs_register (&vfs_ftpfs_ops);
+#ifdef WITH_SMBFS
    vfs_register (&vfs_smbfs_ops);
+#endif
    vfs_register (&vfs_mcfs_ops);
 #endif