Skip to content

Commit

Permalink
x11/rofi: fix I3 option
Browse files Browse the repository at this point in the history
MFH:		r409224
PR:		206846
Submitted by:	Tobias Kortkamp <t@tobik.me>
Approved by:	ports-secteam (blanket)
  • Loading branch information
opsec committed Feb 20, 2016
1 parent 8edebb9 commit 4667443
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
3 changes: 2 additions & 1 deletion x11/rofi/Makefile
Expand Up @@ -2,6 +2,7 @@

PORTNAME= rofi
PORTVERSION= 0.15.11
PORTREVISION= 1
CATEGORIES= x11

MAINTAINER= nomoo@nomoo.ru
Expand All @@ -25,7 +26,7 @@ OPTIONS_DEFINE= I3

I3_DESC= I3 support
I3_BUILD_DEPENDS= i3:${PORTSDIR}/x11-wm/i3
I3_CFLAGS= -I${LOCALBASE}/include/i3
I3_CFLAGS= -I${LOCALBASE}/include

PLIST_FILES= bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
man/man1/rofi-sensible-terminal.1.gz
Expand Down
24 changes: 24 additions & 0 deletions x11/rofi/files/patch-source_i3-support.c
@@ -0,0 +1,24 @@
# Description: Use correct namelen when connecting to i3 socket
# Pull Request: https://github.com/DaveDavenport/rofi/pull/330
--- source/i3-support.c.orig 2015-12-27 18:45:50 UTC
+++ source/i3-support.c
@@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
void i3_support_focus_window ( Window id )
{
i3_ipc_header_t head;
- int s, len;
+ int s;
ssize_t t;
struct sockaddr_un remote;
size_t upm = sizeof ( remote.sun_path );
@@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id

remote.sun_family = AF_UNIX;
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 ) );
close ( s );
return;

0 comments on commit 4667443

Please sign in to comment.