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

Commit c2b7abdb authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing... 

am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."

* commit '1e147221':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
parents abccd9d3 1e147221

libs/androidfw/misc.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -56,9 +56,11 @@ FileType getFileType(const char* fileName) 
            return kFileTypeBlockDev;

            return kFileTypeBlockDev;

        else if (S_ISFIFO(sb.st_mode))

        else if (S_ISFIFO(sb.st_mode))

            return kFileTypeFifo;

            return kFileTypeFifo;

#ifdef HAVE_SYMLINKS

#if defined(S_ISLNK)

        else if (S_ISLNK(sb.st_mode))

        else if (S_ISLNK(sb.st_mode))

            return kFileTypeSymlink;

            return kFileTypeSymlink;

#endif

#if defined(S_ISSOCK)

        else if (S_ISSOCK(sb.st_mode))

        else if (S_ISSOCK(sb.st_mode))

            return kFileTypeSocket;

            return kFileTypeSocket;

#endif

#endif