toLoongarch/udevil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

curlftpfs pass user:pass as option; allow email address as username

Browse Source
This commit is contained in:
IgnorantGuru 2012-08-03 07:21:35 -06:00
parent 2eeb5f0535
commit b65a72b9ee
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
0.3.1+
added remove to remove devices safely (under development)
accept smb workgroup/user
curlftpfs pass user:pass as option
allow email address as username
0.3.1 2012-07-25:
cifs,smbfs use guest option when no user specified
sshfs add port as option

24
src/udevil.c
View File

@ -2373,6 +2373,11 @@ static int parse_network_url( const char* url, const char* fstype,
// user:pass
if ( str = strchr( xurl, '@' ) )
{
if ( str2 = strchr( str + 1, '@' ) )
{
// there is a second @ - assume username contains email address
str = str2;
}
str[0] = '\0';
if ( str2 = strchr( xurl, ':' ) )
{
@ -2422,11 +2427,7 @@ static int parse_network_url( const char* url, const char* fstype,
else if ( !strcmp( nm->fstype, "nfs" ) )
nm->url = g_strdup_printf( "%s:%s", nm->host, nm->path ? nm->path : "/" );
else if ( !g_strcmp0( nm->fstype, "curlftpfs" ) )
nm->url = g_strdup_printf( "curlftpfs#ftp://%s%s%s%s%s%s%s%s",
nm->user ? nm->user : "",
nm->pass ? ":" : "",
nm->pass ? nm->pass : "",
nm->user || nm->pass ? "@" : "",
nm->url = g_strdup_printf( "curlftpfs#ftp://%s%s%s%s",
nm->host,
nm->port ? ":" : "",
nm->port ? nm->port : "",
@ -3367,6 +3368,17 @@ _get_type:
g_free( str );
}
}
else if ( !strcmp( fstype, "curlftpfs" ) )
{
if ( netmount->user )
{
if ( netmount->pass )
net_opts = g_strdup_printf( "user=%s:%s", netmount->user,
netmount->pass );
else
net_opts = g_strdup_printf( "user=%s", netmount->user );
}
}
else if ( !strcmp( fstype, "nfs" ) )
{
if ( netmount->port )
@ -3449,7 +3461,7 @@ _get_type:
// test options
if ( ( i = strspn( options,
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-=+_,.\"'$/" ) )
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-=+_,.:;\"'$@/" ) )
!= strlen( options ) )
{
str = g_strdup_printf( _("udevil: error 89: options contain an invalid character ('%c')\n"),