From 75f6ed0d8f93446d8442cf7bcd97cb36ee956c7a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 10 Jan 2019 20:05:18 -0500 Subject: Replace strchrnul with strchr --- bin/cash/input.c | 6 ++++-- bin/cash/mail.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/cash/input.c b/bin/cash/input.c index feb782e7..24ba73b5 100644 --- a/bin/cash/input.c +++ b/bin/cash/input.c @@ -224,7 +224,8 @@ again: p = parsefile->buf + (parsenextc - parsefile->buf); end = p + parselleft; *end = '\0'; - q = strchrnul(p, '\n'); + q = strchr(p, '\n'); + if (!q) q = strchr(p, '\0'); if (q != end && *q == '\0') { /* delete nul characters */ for (r = q; q != end; q++) { @@ -236,7 +237,8 @@ again: goto again; end = p + parselleft; *end = '\0'; - q = strchrnul(p, '\n'); + q = strchr(p, '\n'); + if (!q) q = strchr(p, '\0'); } if (q == end) { parsenleft = parselleft; diff --git a/bin/cash/mail.c b/bin/cash/mail.c index 81243b87..6f8a3d39 100644 --- a/bin/cash/mail.c +++ b/bin/cash/mail.c @@ -87,7 +87,8 @@ chkmail(int silent) p = mpath; if (*p == '\0') break; - mpath = strchrnul(mpath, ':'); + mpath = strchr(p, ':'); + if (!mpath) mpath = strchr(p, '\0'); if (*mpath != '\0') { *mpath++ = '\0'; if (p == mpath - 1) -- cgit 1.4.1 f='/src/diff/etc/code.map?id=0c5cae773081392ea2fb58dcab70d777c45c403d&follow=1'>diff
path: root/etc/code.map (unfollow)
Commit message (Expand)Author
2021-02-07Add simple battery status and clock to xsessionJune McEnroe
2021-02-07Set cursor theme and sizeJune McEnroe
2021-02-07Use scrot for up -s if no screencaptureJune McEnroe
2021-02-07Enable mouse acceleration in XJune McEnroe
2021-02-07Set colours for Xt and cwmJune McEnroe
2021-02-07Set urgency on bell in xtermJune McEnroe
2021-02-07Add bindings for brightness controlJune McEnroe
2021-02-07Set X key repeat rateJune McEnroe
2021-02-07Bump font size to 12June McEnroe
2021-02-07Fully configure and rebind cwmJune McEnroe
2021-02-07Add BintiJune McEnroe
2021-02-07Finish configuring xtermJune McEnroe
2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe
2021-02-06Set root window to black on purple snowJune McEnroe
2021-02-06Add xmodmap configurationJune McEnroe
2021-02-06Add initial OpenBSD X configurationJune McEnroe
2021-02-06Add xterm output to schemeJune McEnroe