Code: Alles auswählen
diff -Naur neutrino_old/data/locale/deutsch.locale neutrino/data/locale/deutsch.locale
--- neutrino_old/data/locale/deutsch.locale 2004-12-15 18:39:58.000000000 +0100
+++ neutrino/data/locale/deutsch.locale 2004-12-15 18:30:21.000000000 +0100
@@ -551,7 +551,7 @@
networkmenu.gateway Standard Gateway
networkmenu.head Netzwerk Einstellungen
networkmenu.ipaddress IP-Adresse
-networkmenu.mount NFS/CIFS
+networkmenu.mount NFS/CIFS/FTPFS
networkmenu.nameserver Nameserver
networkmenu.netmask Netzmaske
networkmenu.setupnow Netzwerkeinstellungen jetzt zuweisen
@@ -561,23 +561,24 @@
nfs.alreadymounted Verzeichnis bereits gemountet.
nfs.automount Beim Start mounten
nfs.dir Verzeichnis/Freigabe
-nfs.ip NFS/CIFS Server IP
+nfs.ip Server IP
nfs.localdir lokales Verzeichnis
-nfs.mount NFS/CIFS Verzeichnis mounten
+nfs.mount Netzwerk Verzeichnis mounten
nfs.mount_options Mount-Optionen
nfs.mounterror Mount-Fehler
nfs.mounterror_notsup Dateisystem-Typ wird nicht unterstützt.
nfs.mountnow Jetzt mounten
nfs.mounttimeout Mount-Fehler: Timeout
-nfs.password CIFS Passwort
+nfs.password Passwort
nfs.remount Verzeichnisse erneut mounten
nfs.type Typ
nfs.type_cifs CIFS
+nfs.type_lufs FTPFS
nfs.type_nfs NFS
-nfs.umount NFS/CIFS Verzeichnis unmounten
+nfs.umount Netzwerk Verzeichnis unmounten
nfs.umounterror Umount-Fehler
-nfs.username CIFS Benutzername
-nfsmenu.head NFS/CIFS Einstellungen
+nfs.username Benutzername
+nfsmenu.head NFS/CIFS/FTPFS Einstellungen
nvod.percentage (%d%% vorbei)
nvod.starting (Beginn in %d min)
nvodselector.directormode Bildregie-Modus
diff -Naur neutrino_old/data/locale/english.locale neutrino/data/locale/english.locale
--- neutrino_old/data/locale/english.locale 2004-12-15 18:40:23.000000000 +0100
+++ neutrino/data/locale/english.locale 2004-12-15 18:28:20.000000000 +0100
@@ -513,7 +513,7 @@
networkmenu.gateway default gateway
networkmenu.head Network Settings
networkmenu.ipaddress IP address
-networkmenu.mount NFS/CIFS
+networkmenu.mount NFS/CIFS/FTPFS
networkmenu.nameserver name server
networkmenu.netmask netmask
networkmenu.setupnow setup network now
@@ -523,23 +523,24 @@
nfs.alreadymounted directory already mounted
nfs.automount mount on startup
nfs.dir directory/share
-nfs.ip NFS/CIFS Server IP
+nfs.ip Server IP
nfs.localdir local dir
-nfs.mount Mount NFS/CIFS volume
+nfs.mount Mount Network volume
nfs.mount_options mount options
nfs.mounterror mount error
nfs.mounterror_notsup filesystem type not supported
nfs.mountnow mount now
nfs.mounttimeout mount error: timeout
-nfs.password CIFS password
+nfs.password password
nfs.remount remount directories
nfs.type type
nfs.type_cifs CIFS
+nfs.type_lufs FTPFS
nfs.type_nfs NFS
-nfs.umount Umount NFS/CIFS volume
+nfs.umount Umount Network volume
nfs.umounterror error umounting volume
-nfs.username CIFS username
-nfsmenu.head NFS/CIFS settings
+nfs.username username
+nfsmenu.head NFS/CIFS/FTPFS settings
nvod.percentage (%d%% over)
nvod.starting (starting in %d min)
nvodselector.directormode Direct-Mode
diff -Naur neutrino_old/src/gui/nfs.cpp neutrino/src/gui/nfs.cpp
--- neutrino_old/src/gui/nfs.cpp 2004-12-15 18:37:49.000000000 +0100
+++ neutrino/src/gui/nfs.cpp 2004-12-15 18:08:34.000000000 +0100
@@ -101,6 +101,7 @@
{
m_nfs_sup = CNFSMountGui::FS_UNPROBED;
m_cifs_sup = CNFSMountGui::FS_UNPROBED;
+ m_lufs_sup = CNFSMountGui::FS_UNPROBED;
}
bool in_proc_filesystems(const char * const fsname)
@@ -135,6 +136,8 @@
}
else if (fstype == CNFSMountGui::CIFS)
return (system("insmod cifs") == 0);
+ else if (fstype == CNFSMountGui::LUFS)
+ return (system("insmod lufs") == 0);
return false;
}
@@ -148,6 +151,8 @@
}
else if (fstype == CNFSMountGui::CIFS)
return (system("rmmod cifs") == 0);
+ else if (fstype == CNFSMountGui::LUFS)
+ return (system("rmmod lufs") == 0);
return false;
}
@@ -157,8 +162,10 @@
if (fstype == CNFSMountGui::NFS)
fsname = "nfs";
- else /* if (fstype == CNFSMountGui::CIFS) */
+ else if (fstype == CNFSMountGui::CIFS)
fsname = "cifs";
+ else if (fstype == CNFSMountGui::LUFS)
+ fsname = "lufs";
if (in_proc_filesystems(fsname))
return CNFSMountGui::FS_READY;
@@ -184,10 +191,11 @@
return CNFSMountGui::FS_UNSUPPORTED;
}
-const char * nfs_entry_printf_string[2] =
+const char * nfs_entry_printf_string[3] =
{
"NFS %s:%s -> %s auto: %4s",
- "CIFS //%s/%s -> %s auto: %4s"
+ "CIFS //%s/%s -> %s auto: %4s",
+ "FTPFS %s/%s -> %s auto: %4s"
};
int CNFSMountGui::exec( CMenuTarget* parent, const std::string & actionKey )
@@ -201,7 +209,10 @@
if (m_cifs_sup == CNFSMountGui::FS_UNPROBED)
m_cifs_sup = fsSupported(CNFSMountGui::CIFS);
- printf("SUPPORT: NFS: %d, CIFS: %d\n", m_nfs_sup, m_cifs_sup);
+ if (m_lufs_sup == CNFSMountGui::FS_UNPROBED)
+ m_lufs_sup = fsSupported(CNFSMountGui::LUFS);
+
+ printf("SUPPORT: NFS: %d, CIFS: %d, LUFS: %d\n", m_nfs_sup, m_cifs_sup, m_lufs_sup);
if (actionKey.empty())
{
@@ -209,7 +220,7 @@
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES; i++)
{
sprintf(m_entry[i],
- nfs_entry_printf_string[(g_settings.network_nfs_type[i] == (int) NFS) ? 0 : 1],
+ nfs_entry_printf_string[(g_settings.network_nfs_type[i] == (int) NFS) ? 0 : ((g_settings.network_nfs_type[i] == (int) CIFS) ? 1 : 2)],
g_settings.network_nfs_ip[i].c_str(),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_dir[i]),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_local_dir[i]),
@@ -224,7 +235,7 @@
for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES; i++)
{
sprintf(m_entry[i],
- nfs_entry_printf_string[(g_settings.network_nfs_type[i] == (int) NFS) ? 0 : 1],
+ nfs_entry_printf_string[(g_settings.network_nfs_type[i] == (int) NFS) ? 0 : ((g_settings.network_nfs_type[i] == (int) CIFS) ? 1 : 2)],
g_settings.network_nfs_ip[i].c_str(),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_dir[i]),
FILESYSTEM_ENCODING_TO_UTF8(g_settings.network_nfs_local_dir[i]),
@@ -282,11 +293,12 @@
{ 1, LOCALE_MESSAGEBOX_YES }
};
-#define NFS_TYPE_OPTION_COUNT 2
+#define NFS_TYPE_OPTION_COUNT 3
const CMenuOptionChooser::keyval NFS_TYPE_OPTIONS[NFS_TYPE_OPTION_COUNT] =
{
{ CNFSMountGui::NFS , LOCALE_NFS_TYPE_NFS },
- { CNFSMountGui::CIFS, LOCALE_NFS_TYPE_CIFS }
+ { CNFSMountGui::CIFS, LOCALE_NFS_TYPE_CIFS },
+ { CNFSMountGui::LUFS, LOCALE_NFS_TYPE_LUFS }
};
int CNFSMountGui::menuEntry(int nr)
@@ -312,12 +324,16 @@
/* rewrite fstype in new entries */
if(strlen(local_dir)==0)
{
- if(m_cifs_sup != CNFSMountGui::FS_UNSUPPORTED && m_nfs_sup == CNFSMountGui::FS_UNSUPPORTED)
+ if(m_cifs_sup != CNFSMountGui::FS_UNSUPPORTED && m_nfs_sup == CNFSMountGui::FS_UNSUPPORTED && m_lufs_sup == CNFSMountGui::FS_UNSUPPORTED)
*type = (int) CIFS;
+
+ else if(m_lufs_sup != CNFSMountGui::FS_UNSUPPORTED && m_cifs_sup == CNFSMountGui::FS_UNSUPPORTED && m_nfs_sup == CNFSMountGui::FS_UNSUPPORTED)
+ *type = (int) LUFS;
}
- bool typeEnabled = (m_cifs_sup != CNFSMountGui::FS_UNSUPPORTED && m_nfs_sup != CNFSMountGui::FS_UNSUPPORTED) ||
+ bool typeEnabled = (m_cifs_sup != CNFSMountGui::FS_UNSUPPORTED && m_nfs_sup != CNFSMountGui::FS_UNSUPPORTED && m_lufs_sup != CNFSMountGui::FS_UNSUPPORTED) ||
(m_cifs_sup != CNFSMountGui::FS_UNSUPPORTED && *type != (int)CIFS) ||
- (m_nfs_sup != CNFSMountGui::FS_UNSUPPORTED && *type != (int)NFS);
+ (m_nfs_sup != CNFSMountGui::FS_UNSUPPORTED && *type != (int)NFS) ||
+ (m_lufs_sup != CNFSMountGui::FS_UNSUPPORTED && *type != (int)LUFS);
CMenuWidget mountMenuEntryW(LOCALE_NFS_MOUNT, "network.raw",720);
mountMenuEntryW.addItem(GenericMenuSeparator);
@@ -331,9 +347,9 @@
CStringInputSMS options2Input(LOCALE_NFS_MOUNT_OPTIONS, options2, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-=.,:|!?/ ");
CMenuForwarder *options2_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, options2, &options2Input);
CStringInputSMS userInput(LOCALE_NFS_USERNAME, username, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:|!?/ ");
- CMenuForwarder *username_fwd = new CMenuForwarder(LOCALE_NFS_USERNAME, *type==CIFS, username, &userInput);
+ CMenuForwarder *username_fwd = new CMenuForwarder(LOCALE_NFS_USERNAME, (*type==CIFS || LUFS), username, &userInput);
CStringInputSMS passInput(LOCALE_NFS_PASSWORD, password, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:|!?/ ");
- CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, *type==CIFS, NULL, &passInput);
+ CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, (*type==CIFS || LUFS), NULL, &passInput);
CNFSMountGuiNotifier notifier(username_fwd, password_fwd, type);
mountMenuEntryW.addItem(new CMenuOptionChooser(LOCALE_NFS_TYPE, type, NFS_TYPE_OPTIONS, NFS_TYPE_OPTION_COUNT, typeEnabled, ¬ifier));
@@ -366,7 +382,7 @@
if (sup == CNFSMountGui::FS_UNSUPPORTED)
{
printf("FS type %d not supported\n", (int) fstype);
- ShowHintUTF(LOCALE_MESSAGEBOX_INFO, (std::string(g_Locale->getText(LOCALE_NFS_MOUNTERROR_NOTSUP)) + ((fstype == NFS) ? " (NFS)" : " (CIFS)")).c_str()); // UTF-8
+ ShowHintUTF(LOCALE_MESSAGEBOX_INFO, (std::string(g_Locale->getText(LOCALE_NFS_MOUNTERROR_NOTSUP)) + ((fstype == NFS) ? " (NFS)" : ((fstype == CIFS) ? " (CIFS)" : " (LUFS)"))).c_str()); // UTF-8
return;
}
@@ -410,6 +426,11 @@
strcpy(options1,"ro");
strcpy(options2,"");
}
+ else if(fstype == LUFS)
+ {
+ strcpy(options1,"");
+ strcpy(options2,"");
+ }
}
if(fstype == NFS)
@@ -423,7 +444,7 @@
cmd += " -o ";
cmd += options1;
}
- else
+ else if(fstype == CIFS)
{
cmd = "mount -t cifs //";
cmd += ip;
@@ -442,6 +463,22 @@
cmd += ',';
cmd += options1;
}
+ else
+ {
+ cmd = "lufsd none ";
+ cmd += local_dir;
+ cmd += " -o fs=ftpfs,username=";
+ cmd += username;
+ cmd += ",password=";
+ cmd += password;
+ cmd += ",host=";
+ cmd += ip;
+ cmd += ",root=/";
+ cmd += dir;
+ cmd += ',';
+ cmd += options1;
+ }
+
if (options2[0] !='\0')
{
cmd += ',';
@@ -520,7 +557,7 @@
mountType[0] = 0; /* strcpy(mountType,""); */
in.getline(buffer, 200);
sscanf(buffer,"%s %s %s ", mountDev, mountOn, mountType);
- if(strcmp(mountType,"nfs")==0 || strcmp(mountType,"cifs")==0)
+ if(strcmp(mountType,"nfs")==0 || strcmp(mountType,"cifs")==0 || strcmp(mountType,"lufs")==0)
{
count++;
std::string s1 = mountDev;
diff -Naur neutrino_old/src/gui/nfs.h neutrino/src/gui/nfs.h
--- neutrino_old/src/gui/nfs.h 2004-12-15 18:38:00.000000000 +0100
+++ neutrino/src/gui/nfs.h 2004-12-15 15:02:15.000000000 +0100
@@ -54,7 +54,8 @@
enum FSType
{
NFS = 0,
- CIFS = 1
+ CIFS = 1,
+ LUFS = 2
};
private:
@@ -68,6 +69,7 @@
FS_Support m_nfs_sup;
FS_Support m_cifs_sup;
+ FS_Support m_lufs_sup;
public:
CNFSMountGui();
diff -Naur neutrino_old/src/system/locals.h neutrino/src/system/locals.h
--- neutrino_old/src/system/locals.h 2004-12-15 18:36:20.000000000 +0100
+++ neutrino/src/system/locals.h 2004-12-15 18:31:15.000000000 +0100
@@ -600,6 +600,7 @@
LOCALE_NFS_REMOUNT,
LOCALE_NFS_TYPE,
LOCALE_NFS_TYPE_CIFS,
+ LOCALE_NFS_TYPE_LUFS,
LOCALE_NFS_TYPE_NFS,
LOCALE_NFS_UMOUNT,
LOCALE_NFS_UMOUNTERROR,
diff -Naur neutrino_old/src/system/locals_intern.h neutrino/src/system/locals_intern.h
--- neutrino_old/src/system/locals_intern.h 2004-12-15 18:37:15.000000000 +0100
+++ neutrino/src/system/locals_intern.h 2004-12-15 18:31:56.000000000 +0100
@@ -600,6 +600,7 @@
"nfs.remount",
"nfs.type",
"nfs.type_cifs",
+ "nfs.type_lufs",
"nfs.type_nfs",
"nfs.umount",
"nfs.umounterror",