PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uncrypt.cpp unique_fd build breakage.

Browse Source 
Change-Id: I4654f59463d1f3e1f4450e937cd910508b64c157
This commit is contained in:
Elliott Hughes
2016-03-29 12:44:09 -07:00
parent 20ab2db8f1
commit d6ac68665d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uncrypt/uncrypt.cpp
+10 -10
View File
@@ -615,20 +615,20 @@ int main(int argc, char** argv) {
// c3. The socket is created by init when starting the service. uncrypt // c3. The socket is created by init when starting the service. uncrypt
// will use the socket to communicate with its caller. // will use the socket to communicate with its caller.
unique_fd service_socket(android_get_control_socket(UNCRYPT_SOCKET.c_str())); android::base::unique_fd service_socket(android_get_control_socket(UNCRYPT_SOCKET.c_str()));
if (!service_socket) { if (service_socket == -1) {
ALOGE("failed to open socket \"%s\": %s", UNCRYPT_SOCKET.c_str(), strerror(errno)); ALOGE("failed to open socket \"%s\": %s", UNCRYPT_SOCKET.c_str(), strerror(errno));
return 1; return 1;
} }
fcntl(service_socket.get(), F_SETFD, FD_CLOEXEC); fcntl(service_socket, F_SETFD, FD_CLOEXEC);
if (listen(service_socket.get(), 1) == -1) { if (listen(service_socket, 1) == -1) {
ALOGE("failed to listen on socket %d: %s", service_socket.get(), strerror(errno)); ALOGE("failed to listen on socket %d: %s", service_socket.get(), strerror(errno));
return 1; return 1;
} }
unique_fd socket_fd(accept4(service_socket.get(), nullptr, nullptr, SOCK_CLOEXEC)); android::base::unique_fd socket_fd(accept4(service_socket, nullptr, nullptr, SOCK_CLOEXEC));
if (!socket_fd) { if (socket_fd == -1) {
ALOGE("failed to accept on socket %d: %s", service_socket.get(), strerror(errno)); ALOGE("failed to accept on socket %d: %s", service_socket.get(), strerror(errno));
return 1; return 1;
} }
@@ -636,13 +636,13 @@ int main(int argc, char** argv) {
bool success = false; bool success = false;
switch (action) { switch (action) {
case UNCRYPT: case UNCRYPT:
success = uncrypt_wrapper(input_path, map_file, socket_fd.get()); success = uncrypt_wrapper(input_path, map_file, socket_fd);
break; break;
case SETUP_BCB: case SETUP_BCB:
success = setup_bcb(socket_fd.get()); success = setup_bcb(socket_fd);
break; break;
case CLEAR_BCB: case CLEAR_BCB:
success = clear_bcb(socket_fd.get()); success = clear_bcb(socket_fd);
break; break;
default: // Should never happen. default: // Should never happen.
ALOGE("Invalid uncrypt action code: %d", action); ALOGE("Invalid uncrypt action code: %d", action);
@@ -653,7 +653,7 @@ int main(int argc, char** argv) {
// ensure the client to receive the last status code before the socket gets // ensure the client to receive the last status code before the socket gets
// destroyed. // destroyed.
int code; int code;
if (android::base::ReadFully(socket_fd.get(), &code, 4)) { if (android::base::ReadFully(socket_fd, &code, 4)) {
ALOGI(" received %d, exiting now", code); ALOGI(" received %d, exiting now", code);
} else { } else {
ALOGE("failed to read the code: %s", strerror(errno)); ALOGE("failed to read the code: %s", strerror(errno));