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

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

am 88cc0ade: am eda16b98: Merge "Kill LOCAL_SOCKET_NAMESPACE." 

* commit '88cc0ade':
  Kill LOCAL_SOCKET_NAMESPACE.
parents 293c0615 88cc0ade

libcutils/socket_local_client.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId, 


    switch (namespaceId) {

        case ANDROID_SOCKET_NAMESPACE_ABSTRACT:

#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE

#if defined(__linux__)

            namelen  = strlen(name);



            // Test with length +1 for the *initial* '\0'.
@@ -67,7 +67,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId, 
            

            p_addr->sun_path[0] = 0;

            memcpy(p_addr->sun_path + 1, name, namelen);

#else /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/

#else

            /* this OS doesn't have the Linux abstract namespace */



            namelen = strlen(name) + strlen(FILESYSTEM_SOCKET_PREFIX);
@@ -79,7 +79,7 @@ int socket_make_sockaddr_un(const char *name, int namespaceId, 


            strcpy(p_addr->sun_path, FILESYSTEM_SOCKET_PREFIX);

            strcat(p_addr->sun_path, name);

#endif /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/

#endif

        break;



        case ANDROID_SOCKET_NAMESPACE_RESERVED:

libcutils/socket_local_server.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int socket_local_server_bind(int s, const char *name, int namespaceId) 
    }



    /* basically: if this is a filesystem path, unlink first */

#ifndef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE

#if !defined(__linux__)

    if (1) {

#else

    if (namespaceId == ANDROID_SOCKET_NAMESPACE_RESERVED

liblog/log_read.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, 


    switch (namespaceId) {

    case ANDROID_SOCKET_NAMESPACE_ABSTRACT:

#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE

#if defined(__linux__)

        namelen  = strlen(name);



        /* Test with length +1 for the *initial* '\0'. */
@@ -87,7 +87,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, 


        p_addr->sun_path[0] = 0;

        memcpy(p_addr->sun_path + 1, name, namelen);

#else /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/

#else

        /* this OS doesn't have the Linux abstract namespace */



        namelen = strlen(name) + strlen(FILESYSTEM_SOCKET_PREFIX);
@@ -99,7 +99,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, 


        strcpy(p_addr->sun_path, FILESYSTEM_SOCKET_PREFIX);

        strcat(p_addr->sun_path, name);

#endif /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/

#endif

        break;



    case ANDROID_SOCKET_NAMESPACE_RESERVED: