[LEDE-DEV] [PATCH] libubox: replace strtok with _r version.

Rosen Penev rosenp at gmail.com
Thu Dec 22 11:53:25 PST 2016


_r is re-entrant. Also happens to silence a cppcheck warning.

Signed-off by: Rosen Penev <rosenp at gmail.com>
---
 ulog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ulog.c b/ulog.c
index 296605d..b7300e7 100644
--- a/ulog.c
+++ b/ulog.c
@@ -35,12 +35,13 @@ static const char *ulog_default_ident(void)
 	FILE *self;
 	static char line[64];
 	char *p = NULL;
+	char *sbuf;
 
 	if ((self = fopen("/proc/self/status", "r")) != NULL) {
 		while (fgets(line, sizeof(line), self)) {
 			if (!strncmp(line, "Name:", 5)) {
-				strtok(line, "\t\n");
-				p = strtok(NULL, "\t\n");
+				strtok_r(line, "\t\n", &sbuf);
+				p = strtok_r(NULL, "\t\n", &sbuf);
 				break;
 			}
 		}
-- 
2.9.3




More information about the Lede-dev mailing list