From 31ae001b6a8ec19b6aed5b362c6b7a15da6b9f5b Mon Sep 17 00:00:00 2001 From: Max Okumoto Date: Tue, 21 Jun 2005 21:06:24 +0000 Subject: [PATCH] Use strsep() instead of custom loop. --- usr.bin/make/main.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 07d810f5bc..80e6a1a180 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -38,7 +38,7 @@ * @(#) Copyright (c) 1988, 1989, 1990, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.3 (Berkeley) 3/19/94 * $FreeBSD: src/usr.bin/make/main.c,v 1.118 2005/02/13 13:33:56 harti Exp $ - * $DragonFly: src/usr.bin/make/main.c,v 1.123 2005/06/21 21:05:54 okumoto Exp $ + * $DragonFly: src/usr.bin/make/main.c,v 1.124 2005/06/21 21:06:24 okumoto Exp $ */ /* @@ -1004,18 +1004,11 @@ main(int argc, char **argv) */ if (TAILQ_EMPTY(&mf.sysIncPath)) { char syspath[] = PATH_DEFSYSPATH; - char *cp = NULL; - char *start; - - for (start = syspath; *start != '\0'; start = cp) { - for (cp = start; *cp != '\0' && *cp != ':'; cp++) - continue; - if (*cp == '\0') { - Path_AddDir(&mf.sysIncPath, start); - } else { - *cp++ = '\0'; - Path_AddDir(&mf.sysIncPath, start); - } + char *start = syspath; + char *cp; + + while ((cp = strsep(&start, ":")) != NULL) { + Path_AddDir(&mf.sysIncPath, cp); } } -- 2.41.0