From 64d994f34fef5d8d5b0c0e5cde1a8c2645e01953 Mon Sep 17 00:00:00 2001 From: June 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(-) (limited to 'bin') 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 93e0af94a689832af9a4589&follow=1'>commit diff
path: root/bin/cash/TOUR (unfollow)
Commit message (Collapse)Author
2019-02-08Don't open folds when using {}June McEnroe
2019-02-08Add sh syntax to hiJune McEnroe
2019-02-08Use [] to quote special characters in regexJune McEnroe
This looks much cleaner than having to double-escape backslash.
2019-02-08Improve ANSI output and base IRC on itJune McEnroe
2019-02-08Add hi -nJune McEnroe
2019-02-08Elaborate hi man pageJune McEnroe
2019-02-08Use set for parent in hiJune McEnroe
2019-02-08Switch back to semantic keyword grouping in hiJune McEnroe
2019-02-08Match only the basename in hiJune McEnroe
2019-02-07Add mdoc syntax to hiJune McEnroe
2019-02-07Support multi-line C macros in hiJune McEnroe
2019-02-07Detect .mk files as makeJune McEnroe
2019-02-07Add make syntax to hiJune McEnroe
2019-02-07Add IRC output to hiJune McEnroe
2019-02-07Improve C syntax accuracy and add Format classJune McEnroe
2019-02-07Factor out hi checkJune McEnroe
Fix subexpression bounds check and compile pattends.
2019-02-07Add Escape class to hiJune McEnroe
2019-02-07Add Todo class and parent syntax constraintJune McEnroe