Index: powerline-2.6/client/powerline.c
===================================================================
--- powerline-2.6.orig/client/powerline.c
+++ powerline-2.6/client/powerline.c
@@ -71,7 +71,7 @@ inline size_t true_sun_len(const struct
 #endif
 
 #define ADDRESS_SIZE sizeof(ADDRESS_TEMPLATE) + (sizeof(uid_t) * 4)
-#define NUM_ARGS_SIZE (sizeof(int) * 2)
+#define NUM_ARGS_SIZE (sizeof(int) * 2 + 1)
 #define BUF_SIZE 4096
 #define NEW_ARGV_SIZE 200
 
Index: powerline-2.6/client/powerline.c
===================================================================
--- powerline-2.6.orig/client/powerline.c
+++ powerline-2.6/client/powerline.c
@@ -42,7 +42,7 @@ void do_write(int sd, const char *raw, s
 	}
 }
 
-inline size_t true_sun_len(const struct sockaddr_un *ptr) {
+static inline size_t true_sun_len(const struct sockaddr_un *ptr) {
 #ifdef __linux__
 	/* Because SUN_LEN uses strlen and abstract namespace paths begin
 	 * with a null byte, SUN_LEN is broken for these. Passing the full