From c6aeff438d452be679cc3ba0a600db1d204b49a6 Mon Sep 17 00:00:00 2001
From: Vadim Kochan <vadim4j@gmail.com>
Date: Sat, 7 Nov 2015 16:55:15 +0200
Subject: str: Add converting cmdline args vector to str module

Move piece of code which converts cmdline args vector to string
from netsniff-ng.c to str.c as function.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 netsniff-ng.c | 18 ++----------------
 str.c         | 23 +++++++++++++++++++++++
 str.h         |  1 +
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/netsniff-ng.c b/netsniff-ng.c
index e5d1886..5119ad5 100644
--- a/netsniff-ng.c
+++ b/netsniff-ng.c
@@ -1506,22 +1506,8 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (!ctx.filter && optind != argc) {
-		int ret;
-		off_t offset = 0;
-
-		for (i = optind; i < argc; ++i) {
-			size_t alen = strlen(argv[i]) + 2;
-			size_t flen = ctx.filter ? strlen(ctx.filter) : 0;
-
-			ctx.filter = xrealloc(ctx.filter, flen + alen);
-			ret = slprintf(ctx.filter + offset, strlen(argv[i]) + 2, "%s ", argv[i]);
-			if (ret < 0)
-				panic("Cannot concatenate filter string!\n");
-			else
-				offset += ret;
-		}
-	}
+	if (!ctx.filter && optind != argc)
+		ctx.filter = argv2str(optind, argc, argv);
 
 	if (!ctx.device_in)
 		ctx.device_in = xstrdup("any");
diff --git a/str.c b/str.c
index 7a5cb49..f4cb099 100644
--- a/str.c
+++ b/str.c
@@ -9,6 +9,8 @@
 #include <stdarg.h>
 
 #include "str.h"
+#include "die.h"
+#include "xmalloc.h"
 
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
@@ -86,3 +88,24 @@ char *strtrim_right(char *p, char c)
 
 	return p;
 }
+
+char *argv2str(int startind, int argc, char **argv)
+{
+	off_t offset = 0;
+	char *str = NULL;
+	int ret, i;
+
+	for (i = startind; i < argc; ++i) {
+		size_t alen = strlen(argv[i]) + 2;
+		size_t slen = str ? strlen(str) : 0;
+
+		str = xrealloc(str, slen + alen);
+		ret = slprintf(str + offset, strlen(argv[i]) + 2, "%s ", argv[i]);
+		if (ret < 0)
+			panic("Cannot concatenate string!\n");
+		else
+			offset += ret;
+	}
+
+	return str;
+}
diff --git a/str.h b/str.h
index 7b8916c..7d078da 100644
--- a/str.h
+++ b/str.h
@@ -8,5 +8,6 @@ extern int slprintf(char *dst, size_t size, const char *fmt, ...)  __check_forma
 extern int slprintf_nocheck(char *dst, size_t size, const char *fmt, ...);
 extern char *strtrim_right(char *p, char c);
 extern noinline void *xmemset(void *s, int c, size_t n);
+extern char *argv2str(int startind, int argc, char **argv);
 
 #endif /* STR_H */
-- 
cgit v1.2.3-54-g00ecf