diff options
| -rw-r--r-- | smb4k/core/smb4kmounter.cpp | 22 | ||||
| -rw-r--r-- | utilities/smb4k_umount.cpp | 15 |
2 files changed, 4 insertions, 33 deletions
diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index 254bfd9..d610443 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -1052,10 +1052,8 @@ void Smb4KMounter::processMount() struct statvfs filesystem; #endif -#if !defined(__sun) && !defined(__irix__) +#if !defined(__sun) if ( statfs( m_priv->path().local8Bit(), &filesystem ) == -1 ) -#elif defined(__irix__) - if ( statfs( m_priv->path(), &filesystem, sizeof( filesystem ), 0 ) == -1 ) #else if ( statvfs( m_priv->path(), &filesystem ) == -1 ) #endif @@ -1079,7 +1077,7 @@ void Smb4KMounter::processMount() } else { -#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__) +#if !defined(__FreeBSD__) && !defined(__sun) if ( (uint)filesystem.f_type == 0xFF534D42 /* CIFS */) { // The user name will be send if no login was specified. @@ -1111,22 +1109,6 @@ void Smb4KMounter::processMount() share = new Smb4KShare( name, m_priv->path(), "smbfs", (int)getuid(), (int)getgid() ); m_mounted_shares.append( share ); } -#elif defined(__irix__) - if ( (uint)filesystem.f_fstyp == 0xFF534D42 /* CIFS */) - { - // The user name will be send if no login was specified. - TQString cifs_login = !m_priv->cifsLogin().isEmpty() ? - m_priv->cifsLogin() : - getpwuid( getuid() )->pw_name; - - share = new Smb4KShare( name, m_priv->path(), "cifs", cifs_login, false ); - m_mounted_shares.append( share ); - } - else if ( (uint)filesystem.f_basetype == 0x517B && !strncmp( fs, "smbfs", strlen( fs )+1 ) ) - { - share = new Smb4KShare( name, m_priv->path(), "smbfs", (int)getuid(), (int)getgid() ); - m_mounted_shares.append( share ); - } #endif else { diff --git a/utilities/smb4k_umount.cpp b/utilities/smb4k_umount.cpp index 550544a..d5558c9 100644 --- a/utilities/smb4k_umount.cpp +++ b/utilities/smb4k_umount.cpp @@ -144,10 +144,8 @@ bool check_filesystem( const char *path, const char *fs ) struct statvfs filesystem; #endif -#if !defined(__sun) && !defined(__irix__) +#if !defined(__sun) if ( statfs( path, &filesystem ) == -1 ) -#elif defined(__irix__) - if ( statfs( path, &filesystem, sizeof( filesystem ), 0 ) == -1 ) #else if ( statvfs( path, &filesystem ) == -1 ) #endif @@ -168,7 +166,7 @@ bool check_filesystem( const char *path, const char *fs ) return ok; } -#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__) +#if !defined(__FreeBSD__) && !defined(__sun) // First entry is for CIFS, the second for SMBFS. if ( (uint)filesystem.f_type == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) ) { @@ -192,15 +190,6 @@ bool check_filesystem( const char *path, const char *fs ) { ok = true; } -#elif defined(__irix__) - if ( (uint)filesystem.f_fstyp == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) ) - { - ok = true; - } - else if ( (uint)filesystem.f_basetype == 0x517B && !strncmp( fs, "smbfs", strlen( fs )+1 ) ) - { - ok = true; - } #endif else { |