diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 1998-11-28 03:41:47 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 1998-11-28 03:41:47 +0000 |
| commit | 1cc471c7794277f456771c772ec6675ac969c78c (patch) | |
| tree | e116e625ec74ab3a2b74f3c21c87e2cbbcbcf0e0 | |
| parent | 4beb28910871edfcdf5dce787bb0f0a7a9cf17a9 (diff) | |
use strsep() instead of strtok(), in particular to avoid an infinite loop
| -rw-r--r-- | usr.bin/cut/cut.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index 412698173ca..68a2bf68a74 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cut.c,v 1.5 1997/11/05 00:18:44 deraadt Exp $ */ +/* $OpenBSD: cut.c,v 1.6 1998/11/28 03:41:46 aaron Exp $ */ /* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: cut.c,v 1.5 1997/11/05 00:18:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cut.c,v 1.6 1998/11/28 03:41:46 aaron Exp $"; #endif /* not lint */ #include <ctype.h> @@ -153,7 +153,7 @@ get_list(list) * overlapping lists. We also handle "-3-5" although there's no * real reason too. */ - for (; p = strtok(list, ", \t"); list = NULL) { + for (; p = strsep(&list, ", \t");) { setautostart = start = stop = 0; if (*p == '-') { ++p; |