diff options
author | Timothy Pearson <[email protected]> | 2014-10-05 16:00:42 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-10-05 16:00:42 -0500 |
commit | 03518d6339ad40346fdcf7ab4b66d8eb307a36a8 (patch) | |
tree | 55f88ec42581d6d1484db0da8c7ae749d6cc5799 /tdeioslave/file/file.cc | |
parent | 7cd4adc908abf8c5e3b391c4a88f0514ba8468c4 (diff) | |
parent | 3f5a4b419f7907ba61c6f63458e0413cccb74760 (diff) | |
download | tdelibs-03518d6339ad40346fdcf7ab4b66d8eb307a36a8.tar.gz tdelibs-03518d6339ad40346fdcf7ab4b66d8eb307a36a8.zip |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeioslave/file/file.cc')
-rw-r--r-- | tdeioslave/file/file.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc index b13357fe6..ad1cc5574 100644 --- a/tdeioslave/file/file.cc +++ b/tdeioslave/file/file.cc @@ -1455,6 +1455,9 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c dev.data() point.data() tmp ); +#elif defined(__OpenBSD__) + buffer.sprintf( "%s %s %s -t %s %s %s 2>%s", "tdesu", mountProg.latin1(), readonly.data(), + fstype.data(), dev.data(), point.data(), tmp ); #else buffer.sprintf( "%s %s -t %s %s %s 2>%s", mountProg.latin1(), readonly.data(), fstype.data(), dev.data(), point.data(), tmp ); @@ -1614,7 +1617,11 @@ void FileProtocol::unmount( const TQString& _point ) error( TDEIO::ERR_COULD_NOT_UNMOUNT, i18n("Could not find program \"umount\"")); return; } +#ifdef __OpenBSD__ + buffer.sprintf( "%s %s %s 2>%s", "tdesu", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp ); +#else buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), TQFile::encodeName(TDEProcess::quote(_point)).data(), tmp ); +#endif system( buffer.data() ); #endif /* HAVE_VOLMGT */ |