batctl; branch, next, updated. v2010.1.0-15-g25dec90 - commits - lists.open-mesh.org

4 Nov 2010

The following commit has been merged in the next branch:
commit 25dec908eeeca865abe33748e4af57dde9cd688c
Author: Sven Eckelmann sven.eckelmann@gmx.de
Date:   Thu Nov 4 14:03:43 2010 +0100
batctl: Convert strtok to reentrant safe strtok_r
Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

diff --git a/bisect.c b/bisect.c
index 2fa15f0..b7d8969 100644
--- a/bisect.c
+++ b/bisect.c
@@ -466,7 +466,7 @@ err:
 static int parse_log_file(char *file_path)
 {
    FILE *fd;
-	char line_buff[MAX_LINE], *start_ptr, *tok_ptr;
+	char line_buff[MAX_LINE], *start_ptr, *start_ptr_safe, *tok_ptr;
    char *neigh, *iface_addr, *orig, *prev_sender, rt_flag;
    int line_count = 0, tq, ttl, seqno, i, res, max;
@@ -483,12 +483,12 @@ static int parse_log_file(char *file_path)
    	line_count++;
if (strstr(start_ptr, "Received BATMAN packet via NB")) {
-			tok_ptr = strtok(start_ptr, " ");
+			strtok_r(start_ptr, " ", &start_ptr_safe);
    		neigh = iface_addr = orig = prev_sender = NULL;
    		seqno = tq = ttl = -1;
for (i = 0; i < 21; i++) {
-				tok_ptr = strtok(NULL, " ");
+				tok_ptr = strtok_r(NULL, " ", &start_ptr_safe);
    			if (!tok_ptr)
    				break;
@@ -547,11 +547,11 @@ static int parse_log_file(char *file_path)
    			max = 3;
    		}
-			tok_ptr = strtok(start_ptr, " ");
+			strtok_r(start_ptr, " ", &start_ptr_safe);
    		orig = neigh = prev_sender = NULL;
for (i = 0; i < max; i++) {
-				tok_ptr = strtok(NULL, " ");
+				tok_ptr = strtok_r(NULL, " ", &start_ptr_safe);
    			if (!tok_ptr)
    				break;
diff --git a/vis.c b/vis.c
index 4bc5954..7fba1ab 100644
--- a/vis.c
+++ b/vis.c
@@ -186,7 +186,7 @@ static int format(char *mesh_iface, const struct funcs *funcs)
    char *line = NULL;
    char *orig, *from;
    char *duplet;
-	char *line_save_ptr;
+	char *line_save_ptr, *component_save_ptr;
    char *duplet_save_ptr;
    char *endptr;
    char *value;
@@ -207,12 +207,12 @@ static int format(char *mesh_iface, const struct funcs *funcs)
duplet_save_ptr = line_save_ptr;
    	while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) {
-			flag = strtok(duplet, " ");
+			flag = strtok_r(duplet, " ", &component_save_ptr);
    		if (!flag)
    			continue;
    		if (!strcmp(flag, "TQ")) {
-				from = strtok(NULL, " ");
-				value = strtok(NULL, " ");
+				from = strtok_r(NULL, " ", &component_save_ptr);
+				value = strtok_r(NULL, " ", &component_save_ptr);
    			tq = strtoul(value, &endptr, 0);
    			funcs->print_tq(orig, from, tq);
    			continue;
@@ -221,13 +221,13 @@ static int format(char *mesh_iface, const struct funcs *funcs)
    			/* We have an HNA record */
    			if (!with_HNA)
    				continue;
-				from = strtok(NULL, " ");
+				from = strtok_r(NULL, " ", &component_save_ptr);
    			funcs->print_HNA(orig, from);
    			continue;
    		}
    		if (!strcmp(flag, "SEC") && with_2nd) {
    			/* We found a secondary interface MAC address. */
-				from = strtok(NULL, " ");
+				from = strtok_r(NULL, " ", &component_save_ptr);
    			funcs->print_2nd(orig, from);
    		}
    		if (!strcmp(flag, "PRIMARY") && with_2nd) {
-- 
batctl

    