cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 16:05:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mac: open preferences for user if Imager is not allowed access

Browse source 
Normally the system will prompt the user to allow Imager access
to removable volumes.
Open preferences and ask user to allow Imager manually in a
corner case in which this does not occur.
This commit is contained in:
Floris Bos 2020-07-21 15:04:38 +02:00
parent c4ab7b91a1
commit 7e4f5c9045
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mac/macfile.cpp
View file

@ -22,7 +22,7 @@ bool MacFile::isSequential() const
return false;
}
bool MacFile::authOpen(const QByteArray &filename)
MacFile::authOpenResult MacFile::authOpen(const QByteArray &filename)
{
int fd = -1;
@ -34,13 +34,13 @@ bool MacFile::authOpen(const QByteArray &filename)
kAuthorizationFlagPreAuthorize;
AuthorizationRef authRef;
if (AuthorizationCreate(&rights, nullptr, flags, &authRef) != 0)
return false;
return authOpenCancelled;
AuthorizationExternalForm externalForm;
if (AuthorizationMakeExternalForm(authRef, &externalForm) != 0)
{
AuthorizationFree(authRef, 0);
return false;
return authOpenError;
}
const char *cmd = "/usr/libexec/authopen";
@ -110,17 +110,17 @@ bool MacFile::authOpen(const QByteArray &filename)
if (wpid == -1)
{
qDebug() << "waitpid() failed executing authopen";
return false;
return authOpenError;
}
if (WEXITSTATUS(status))
{
qDebug() << "authopen returned failure code" << WEXITSTATUS(status);
return false;
return authOpenError;
}
qDebug() << "fd received:" << fd;
}
AuthorizationFree(authRef, 0);
return open(fd, QIODevice::ReadWrite | QIODevice::ExistingOnly | QIODevice::Unbuffered, QFileDevice::AutoCloseHandle);
return open(fd, QIODevice::ReadWrite | QIODevice::ExistingOnly | QIODevice::Unbuffered, QFileDevice::AutoCloseHandle) ? authOpenSuccess : authOpenError;
}