summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-03-07 15:44:54 +0000
committergjb <gjb@FreeBSD.org>2016-03-07 15:44:54 +0000
commita7d86f751a03778bef77031433cc328dc4db7e1f (patch)
tree6e221d2a587ef137896fe881b9095fe79f1d7a07 /bin
parentf4bd2481be4a57485def5a36b1489879e5d7a470 (diff)
parente6ddbee9c7f5412399916b825f2108aaece9b55a (diff)
downloadFreeBSD-src-a7d86f751a03778bef77031433cc328dc4db7e1f.zip
FreeBSD-src-a7d86f751a03778bef77031433cc328dc4db7e1f.tar.gz
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/expand.c3
-rw-r--r--bin/sh/histedit.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 6129bb6..6d0d78a 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -463,7 +463,6 @@ expbackq(union node *cmd, int quoted, int flag, struct worddest *dst)
argbackq = saveargbackq;
p = in.buf;
- lastc = '\0';
nnl = 0;
if (!quoted && flag & EXP_SPLIT)
ifs = ifsset() ? ifsval() : " \t\n";
@@ -1288,7 +1287,7 @@ patmatch(const char *pattern, const char *string)
if (wc == 0)
goto backtrack;
} else
- wc = (unsigned char)*q++;
+ q++;
break;
case '*':
c = *p;
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 7295c3f..a63ad68 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -359,7 +359,7 @@ histcmd(int argc, char **argv __unused)
* cursor, set it back to the current
* entry.
*/
- retval = history(hist, &he,
+ history(hist, &he,
H_NEXT_EVENT, oldhistnum);
}
} else
OpenPOWER on IntegriCloud