mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replaced WITH_SMBFS by ENABLE_VFS_SMB

Browse Source
This commit is contained in:
Enrico Weigelt, metux IT service 2009-11-14 17:10:57 +01:00
parent c47852cbfe
commit 8c9619cef1
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4.include/vfs/mc-vfs-samba.m4
View File

@ -8,7 +8,7 @@ AC_DEFUN([AC_MC_VFS_SAMBA],
AC_ARG_WITH(samba,
[ --with-samba Support smb virtual file system [[no]]],
[if test x"$withval" != x"no"; then
AC_DEFINE(WITH_SMBFS, 1, [Define to enable VFS over SMB])
AC_DEFINE(ENABLE_VFS_SMB, 1, [Define to enable VFS over SMB])
vfs_flags="$vfs_flags, smbfs"
use_smbfs=yes
fi

4
src/args.c
View File

@ -145,14 +145,14 @@ static const GOptionEntry argument_main_table[] = {
N_("Log ftp dialog to specified file"),
"<file>"
},
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
{
"debuglevel", 'D', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT,
&mc_args__debug_level,
N_("Set debug level"),
"<integer>"
},
#endif
#endif /* ENABLE_VFS_SMB */
#endif
/* single file operations */

4
src/boxes.c
View File

@ -972,7 +972,7 @@ jobs_cmd (void)
}
#endif /* WITH_BACKGROUND */
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
struct smb_authinfo *
vfs_smb_get_authinfo (const char *host, const char *share, const char *domain,
const char *user)
@ -1078,4 +1078,4 @@ vfs_smb_get_authinfo (const char *host, const char *share, const char *domain,
return return_value;
}
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */

4
src/cmd.c
View File

@ -1171,14 +1171,14 @@ void fishlink_cmd (void)
"/#sh:", 1);
}
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
void smblink_cmd (void)
{
nice_cd (_(" SMB link to machine "), _(machine_str),
"[SMB File System]", ":smblink_cmd: SMB link to machine ",
"/#smb:", 0);
}
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */
#endif /* USE_NETCODE */
#ifdef USE_EXT2FSLIB

4
src/keybind.c
View File

@ -342,9 +342,9 @@ static name_keymap_t command_names[] = {
{ "CmdReverseSelection", CK_ReverseSelectionCmd },
{ "CmdSaveSetup", CK_SaveSetupCmd },
{ "CmdSelect", CK_SelectCmd },
#if defined (USE_NETCODE) && defined (WITH_SMBFS)
#if defined (USE_NETCODE) && defined (ENABLE_VFS_SMB)
{ "CmdSmblinkCmd", CK_SmblinkCmd },
#endif
#endif /* USE_NETCODE || ENABLE_VFS_SMB
{ "CmdSwapPanel", CK_SwapCmd },
{ "CmdSymlink", CK_SymlinkCmd },
{ "CmdTree", CK_TreeCmd },

20
src/main.c
View File

@ -87,9 +87,9 @@
#include "main.h"
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
#include "../vfs/smbfs.h" /* smbfs_set_debug() */
#endif
#endif /* ENABLE_VFS_SMB */
#ifdef USE_INTERNAL_EDIT
# include "../edit/edit.h"
@ -692,9 +692,9 @@ create_panel_menu (void)
#endif
entries = g_list_append (entries, menu_entry_create (_("FT&P link..."), CK_FtplinkCmd));
entries = g_list_append (entries, menu_entry_create (_("S&hell link..."), CK_FishlinkCmd));
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
entries = g_list_append (entries, menu_entry_create (_("SM&B link..."), CK_SmblinkCmd));
#endif
#endif /* ENABLE_VFS_SMB */
#endif
entries = g_list_append (entries, menu_separator_create ());
entries = g_list_append (entries, menu_entry_create (_("&Rescan"), CK_RereadCmd));
@ -1321,11 +1321,11 @@ midnight_execute_cmd (Widget *sender, unsigned long command)
case CK_SingleDirsizeCmd:
smart_dirsize_cmd ();
break;
#if defined (USE_NETCODE) && defined (WITH_SMBFS)
#if defined (USE_NETCODE) && defined (ENABLE_VFS_SMB)
case CK_SmblinkCmd:
smblink_cmd ();
break;
#endif
#endif /* USE_NETCODE && ENABLE_VFS_SMB */
case CK_Sort:
sort_cmd ();
break;
@ -2018,15 +2018,15 @@ mc_main__setup_by_args (int argc, char *argv[])
#ifdef USE_NETCODE
if (mc_args__netfs_logfile != NULL) {
mc_setctl ("/#ftp:", VFS_SETCTL_LOGFILE, (void *) mc_args__netfs_logfile);
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
smbfs_set_debugf (mc_args__netfs_logfile);
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */
}
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
if (mc_args__debug_level != 0)
smbfs_set_debug (mc_args__debug_level);
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */
#endif /* USE_NETCODE */
base = x_basename (argv[0]);

4
src/textconf.c
View File

@ -44,9 +44,9 @@ static const char *const vfs_supported[] = {
# ifdef ENABLE_VFS_MCFS
"mcfs",
# endif
# ifdef WITH_SMBFS
# ifdef ENABLE_VFS_SMB
"smbfs",
# endif
# endif /* ENABLE_VFS_SMB */
#endif /* USE_NETCODE */
#ifdef USE_EXT2FSLIB
"undelfs",

4
vfs/vfs-impl.h
View File

@ -113,7 +113,7 @@ union vfs_dirent {
/* Register a file system class */
int vfs_register_class (struct vfs_class *vfs);
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
/* Interface for requesting SMB credentials. */
struct smb_authinfo {
char *host;
@ -127,7 +127,7 @@ struct smb_authinfo *vfs_smb_get_authinfo (const char *host,
const char *share,
const char *domain,
const char *user);
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */
struct vfs_class *vfs_get_class (const char *path);
struct vfs_class *vfs_split (char *path, char **inpath, char **op);

4
vfs/vfs.c
View File

@ -1287,9 +1287,9 @@ vfs_init (void)
tcp_init();
init_ftpfs ();
init_fish ();
#ifdef WITH_SMBFS
#ifdef ENABLE_VFS_SMB
init_smbfs ();
#endif /* WITH_SMBFS */
#endif /* ENABLE_VFS_SMB */
#ifdef ENABLE_VFS_MCFS
init_mcfs ();
#endif /* ENABLE_VFS_MCFS */