1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00

Merge pull request #330 from t6/patch-1

Use correct namelen when connecting to i3 socket
This commit is contained in:
Dave Davenport 2016-02-02 10:40:42 +01:00
commit 8e49d76096

View file

@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
void i3_support_focus_window ( Window id ) void i3_support_focus_window ( Window id )
{ {
i3_ipc_header_t head; i3_ipc_header_t head;
int s, len; int s;
ssize_t t; ssize_t t;
struct sockaddr_un remote; struct sockaddr_un remote;
size_t upm = sizeof ( remote.sun_path ); size_t upm = sizeof ( remote.sun_path );
@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id )
remote.sun_family = AF_UNIX; remote.sun_family = AF_UNIX;
g_strlcpy ( remote.sun_path, i3_socket_path, upm ); g_strlcpy ( remote.sun_path, i3_socket_path, upm );
len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) { if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) ); fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
close ( s ); close ( s );
return; return;