Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c86887 authored by Josh Gao's avatar Josh Gao
Browse files

libbase: add Fdopen that takes a unique_fd. 

Using fdopen with unique_fd correctly is more annoying than it should
be, because fdopen doesn't close the file descriptor received upon
failure, which means you have to something like the following:

    unique_fd ufd = ...;
    int fd = ufd.release();
    FILE* file = fdopen(fd, "...");
    if (!file) {
        close(fd);
        return;
    }

Add an android::base::Fdopen that does that dance for you.

Bug: http://b/113880863
Test: treehugger
Change-Id: I6325acf1ff06484005c1053fe09672c5eeeecaa1
parent ebb631b0

base/include/android-base/unique_fd.h

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <sys/socket.h>

#endif



#include <stdio.h>

#include <sys/types.h>

#include <unistd.h>
@@ -199,6 +200,17 @@ inline bool Socketpair(int type, unique_fd_impl<Closer>* left, unique_fd_impl<Cl 
  return Socketpair(AF_UNIX, type, 0, left, right);

}



// Using fdopen with unique_fd correctly is more annoying than it should be,

// because fdopen doesn't close the file descriptor received upon failure.

inline FILE* Fdopen(unique_fd&& ufd, const char* mode) {

  int fd = ufd.release();

  FILE* file = fdopen(fd, mode);

  if (!file) {

    close(fd);

  }

  return file;

}



#endif  // !defined(_WIN32)



}  // namespace base