summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvisa <visa@openbsd.org>2019-07-28 12:47:56 +0000
committervisa <visa@openbsd.org>2019-07-28 12:47:56 +0000
commitdd20b077cc6778a30aba4bb3ca439ed748a6db9f (patch)
treee2b3a5b29072c6dc92b8154f6eb22b49c3093cca
parentregen (diff)
downloadwireguard-openbsd-dd20b077cc6778a30aba4bb3ca439ed748a6db9f.tar.xz
wireguard-openbsd-dd20b077cc6778a30aba4bb3ca439ed748a6db9f.zip
Fix trimming of newline.
-rw-r--r--sys/arch/octeon/stand/rdboot/cmd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/octeon/stand/rdboot/cmd.c b/sys/arch/octeon/stand/rdboot/cmd.c
index 85c8a28e238..f8f128a5ef4 100644
--- a/sys/arch/octeon/stand/rdboot/cmd.c
+++ b/sys/arch/octeon/stand/rdboot/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.1 2019/07/17 14:36:32 visa Exp $ */
+/* $OpenBSD: cmd.c,v 1.2 2019/07/28 12:47:56 visa Exp $ */
/*
* Copyright (c) 1997-1999 Michael Shalayeff
@@ -251,6 +251,7 @@ readline(char *buf, size_t n, int to)
struct termios saved_tio, tio;
struct timeval tv;
fd_set fdset;
+ char *p;
int timed_out = 0;
#ifdef DEBUG
extern int debug;
@@ -288,7 +289,9 @@ readline(char *buf, size_t n, int to)
return 0;
/* Strip trailing newline. */
- strtok(buf, "\n");
+ p = strchr(buf, '\n');
+ if (p != NULL)
+ *p = '\0';
return strlen(buf);
}