From 3a590658e97507d50aaac70586599e093e7cd1fb Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 6 Apr 2014 08:36:37 +0400 Subject: [PATCH 1/1] jtag/drivers/remote_bitbang: use sizeof to determine maximum unix socket path length Different *nix systems use different constants, so sizeof should be used instead. This fixes the build on OS X (as sun_path length is hardcoded to 104 on Darwin). Change-Id: I1df611383dedcfc6d153ec59b453a895c7d84e94 Reported-by: Xiaofan Chen Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2095 Tested-by: jenkins Reviewed-by: Spencer Oliver Reviewed-by: Xiaofan --- src/jtag/drivers/remote_bitbang.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c index fc7ef6b874..a1c11b2445 100644 --- a/src/jtag/drivers/remote_bitbang.c +++ b/src/jtag/drivers/remote_bitbang.c @@ -29,10 +29,6 @@ #include #include "bitbang.h" -#ifndef UNIX_PATH_LEN -#define UNIX_PATH_LEN 108 -#endif - /* arbitrary limit on host name length: */ #define REMOTE_BITBANG_HOST_MAX 255 @@ -192,8 +188,8 @@ static int remote_bitbang_init_unix(void) struct sockaddr_un addr; addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, remote_bitbang_host, UNIX_PATH_LEN); - addr.sun_path[UNIX_PATH_LEN-1] = '\0'; + strncpy(addr.sun_path, remote_bitbang_host, sizeof(addr.sun_path)); + addr.sun_path[sizeof(addr.sun_path)-1] = '\0'; if (connect(fd, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) { LOG_ERROR("connect: %s", strerror(errno)); -- 2.30.2