TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix mount media without known filesystem in tdehw storage backend

Browse Source 
This resolves Bug 1753
pull/16/head
Slávek Banko 12 years ago
parent 1060593d12
commit ef6c5d6fcb
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

38
tdecore/tdehw/tdestoragedevice.cpp
Unescape Escape View File

@ -226,9 +226,9 @@ bool TDEStorageDevice::ejectDrive() {
FILE *exepipe = popen(command.ascii(), "r"); FILE *exepipe = popen(command.ascii(), "r");
if (exepipe) { if (exepipe) {
TQString pmount_output; TQString eject_output;
char buffer[8092]; TQTextStream ts(exepipe, IO_ReadOnly);
pmount_output = fgets(buffer, sizeof(buffer), exepipe); eject_output = ts.read();
int retcode = pclose(exepipe); int retcode = pclose(exepipe);
if (retcode == 0) { if (retcode == 0) {
return TRUE; return TRUE;
@ -661,7 +661,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
optionString.insert(0, "-o "); optionString.insert(0, "-o ");
} }
if (mountOptions.contains("filesystem")) { if (mountOptions.contains("filesystem") && !mountOptions["filesystem"].isEmpty()) {
optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"]));
} }
@ -681,7 +681,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
optionString.insert(0, "--mount-options "); optionString.insert(0, "--mount-options ");
} }
if (mountOptions.contains("filesystem")) { if (mountOptions.contains("filesystem") && !mountOptions["filesystem"].isEmpty()) {
optionString.append(TQString(" --mount-fstype %1").arg(mountOptions["filesystem"])); optionString.append(TQString(" --mount-fstype %1").arg(mountOptions["filesystem"]));
} }
@ -715,7 +715,7 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
optionString.append(" -s"); optionString.append(" -s");
} }
if (mountOptions.contains("filesystem")) { if (mountOptions.contains("filesystem") && !mountOptions["filesystem"].isEmpty()) {
optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"]));
} }
@ -736,12 +736,12 @@ TQString TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOption
FILE *exepipe = popen(command.local8Bit(), "r"); FILE *exepipe = popen(command.local8Bit(), "r");
if (exepipe) { if (exepipe) {
TQString pmount_output; TQString mount_output;
char buffer[8092]; TQTextStream ts(exepipe, IO_ReadOnly);
pmount_output = fgets(buffer, sizeof(buffer), exepipe); mount_output = ts.read();
*retcode = pclose(exepipe); *retcode = pclose(exepipe);
if (errRet) { if (errRet) {
*errRet = pmount_output; *errRet = mount_output;
} }
} }
@ -793,7 +793,7 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me
optionString.append(" -s"); optionString.append(" -s");
} }
if (mountOptions.contains("filesystem")) { if (mountOptions.contains("filesystem") && !mountOptions["filesystem"].isEmpty()) {
optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"])); optionString.append(TQString(" -t %1").arg(mountOptions["filesystem"]));
} }
@ -810,12 +810,12 @@ TQString TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString me
FILE *exepipe = popen(command.local8Bit(), "r"); FILE *exepipe = popen(command.local8Bit(), "r");
if (exepipe) { if (exepipe) {
TQString pmount_output; TQString mount_output;
char buffer[8092]; TQTextStream ts(exepipe, IO_ReadOnly);
pmount_output = fgets(buffer, sizeof(buffer), exepipe); mount_output = ts.read();
*retcode = pclose(exepipe); *retcode = pclose(exepipe);
if (errRet) { if (errRet) {
*errRet = pmount_output; *errRet = mount_output;
} }
} }
@ -867,16 +867,16 @@ bool TDEStorageDevice::unmountDevice(TQString* errRet, int* retcode) {
FILE *exepipe = popen(command.local8Bit(), "r"); FILE *exepipe = popen(command.local8Bit(), "r");
if (exepipe) { if (exepipe) {
TQString pmount_output; TQString umount_output;
char buffer[8092]; TQTextStream ts(exepipe, IO_ReadOnly);
pmount_output = fgets(buffer, sizeof(buffer), exepipe); umount_output = ts.read();
*retcode = pclose(exepipe); *retcode = pclose(exepipe);
if (*retcode == 0) { if (*retcode == 0) {
return true; return true;
} }
else { else {
if (errRet) { if (errRet) {
*errRet = pmount_output; *errRet = umount_output;
} }
} }
} }

Write Preview
Loading…
Cancel
Save