Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
Ecore_Con.h ecore_con.c ecore_con_private.h
Log Message:
cleaner handling of optional features
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Ecore_Con.h 24 Sep 2006 07:35:50 -0000 1.20
+++ Ecore_Con.h 24 Sep 2006 07:53:47 -0000 1.21
@@ -74,8 +74,8 @@
ECORE_CON_LOCAL_USER,
ECORE_CON_LOCAL_SYSTEM,
ECORE_CON_LOCAL_ABSTRACT,
- ECORE_CON_REMOTE_SYSTEM
- ,ECORE_CON_USE_SSL = 16
+ ECORE_CON_REMOTE_SYSTEM,
+ ECORE_CON_USE_SSL = 16
} Ecore_Con_Type;
#endif
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- ecore_con.c 24 Sep 2006 07:24:52 -0000 1.79
+++ ecore_con.c 24 Sep 2006 07:53:47 -0000 1.80
@@ -171,11 +171,8 @@
#endif
if ((type == ECORE_CON_LOCAL_USER) ||
- (type == ECORE_CON_LOCAL_SYSTEM)
-#ifdef HAVE_ABSTRACT_SOCKETS
- || (type == ECORE_CON_LOCAL_ABSTRACT)
-#endif
- )
+ (type == ECORE_CON_LOCAL_SYSTEM) ||
+ (type == ECORE_CON_LOCAL_ABSTRACT))
{
const char *homedir;
struct stat st;
@@ -236,24 +233,25 @@
goto error;
}
socket_unix.sun_family = AF_UNIX;
-#ifdef HAVE_ABSTRACT_SOCKET
if (type == ECORE_CON_LOCAL_ABSTRACT)
{
+#ifdef HAVE_ABSTRACT_SOCKET
/* . is a placeholder */
snprintf(socket_unix.sun_path, sizeof(socket_unix.sun_path),
".%s", name);
/* first char null indicates abstract namespace */
socket_unix.sun_path[0] = '\0';
socket_unix_len = LENGTH_OF_ABSTRACT_SOCKADDR_UN(&socket_unix,
name);
+#else
+ fprintf(stderr, "Your system does not support abstract
sockets!\n");
+ umask(pmode);
+ goto error;
+#endif
}
else
{
strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
}
-#else
- strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
- socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
-#endif
if (bind(svr->fd, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
{
if (connect(svr->fd, (struct sockaddr *)&socket_unix,
@@ -425,11 +423,8 @@
if ((type == ECORE_CON_REMOTE_SYSTEM) && (port < 0)) return NULL;
if ((type == ECORE_CON_LOCAL_USER) ||
- (type == ECORE_CON_LOCAL_SYSTEM)
-#ifdef HAVE_ABSTRACT_SOCKETS
- || (type == ECORE_CON_LOCAL_ABSTRACT)
-#endif
- )
+ (type == ECORE_CON_LOCAL_SYSTEM) ||
+ (type == ECORE_CON_LOCAL_ABSTRACT))
{
const char *homedir;
int socket_unix_len;
@@ -465,23 +460,23 @@
if (setsockopt(svr->fd, SOL_SOCKET, SO_REUSEADDR, &curstate,
sizeof(curstate)) < 0) goto error;
socket_unix.sun_family = AF_UNIX;
-#ifdef HAVE_ABSTRACT_SOCKETS
if (type == ECORE_CON_LOCAL_ABSTRACT)
{
+#ifdef HAVE_ABSTRACT_SOCKETS
/* copy name insto sun_path, prefixed by null to indicate abstract
namespace */
snprintf(socket_unix.sun_path, sizeof(socket_unix.sun_path),
".%s", name);
socket_unix.sun_path[0] = '\0';
socket_unix_len = LENGTH_OF_ABSTRACT_SOCKADDR_UN(&socket_unix,
name);
+#else
+ fprintf(stderr, "Your system does not support abstract
sockets!\n");
+ goto error;
+#endif
}
else
{
strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
}
-#else
- strncpy(socket_unix.sun_path, buf, sizeof(socket_unix.sun_path));
- socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
-#endif
if (connect(svr->fd, (struct sockaddr *)&socket_unix, socket_unix_len)
< 0) goto error;
svr->path = strdup(buf);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_con_private.h 24 Sep 2006 07:24:52 -0000 1.15
+++ ecore_con_private.h 24 Sep 2006 07:53:47 -0000 1.16
@@ -27,13 +27,9 @@
{
ECORE_CON_LOCAL_USER,
ECORE_CON_LOCAL_SYSTEM,
-#ifdef HAVE_ABSTRACT_SOCKETS
ECORE_CON_LOCAL_ABSTRACT,
-#endif
- ECORE_CON_REMOTE_SYSTEM
-#if USE_OPENSSL
- ,ECORE_CON_USE_SSL = 16
-#endif
+ ECORE_CON_REMOTE_SYSTEM,
+ ECORE_CON_USE_SSL = 16
} Ecore_Con_Type;
struct _Ecore_Con_Client
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
