summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranton <anton@cvs.openbsd.org>2017-07-26 19:20:52 +0000
committeranton <anton@cvs.openbsd.org>2017-07-26 19:20:52 +0000
commitb6120655301bc49fa21708bc4fef2775768f9dc5 (patch)
tree96d94c6fd30f4fc200214bbf7ce66a9d2b96e396
parent0cde587c9d290fa9fb8f712b0c0c779332c320e9 (diff)
Align variables and put logical operators at EOL. No binary change.
-rw-r--r--bin/csh/file.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/csh/file.c b/bin/csh/file.c
index dba83e1e0c4..5d130ebf260 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.32 2017/07/26 19:15:09 anton Exp $ */
+/* $OpenBSD: file.c,v 1.33 2017/07/26 19:20:51 anton Exp $ */
/* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */
/*-
@@ -180,10 +180,10 @@ cl_getc(struct cmdline *cl)
static Char *
cl_lastw(struct cmdline *cl)
{
- static Char word[BUFSIZ];
- const unsigned char *delimiters = " '\"\t;&<>()|^%";
- Char *cp;
- size_t i;
+ static Char word[BUFSIZ];
+ const unsigned char *delimiters = " '\"\t;&<>()|^%";
+ Char *cp;
+ size_t i;
for (i = cl->len; i > 0; i--)
if (strchr(delimiters, cl->buf[i - 1]) != NULL)
@@ -200,7 +200,7 @@ cl_lastw(struct cmdline *cl)
static void
cl_putc(struct cmdline *cl, int c)
{
- unsigned char cc = c;
+ unsigned char cc = c;
write(cl->fdout, &cc, 1);
}
@@ -255,14 +255,14 @@ cl_erasew(struct cmdline *cl, int c)
const unsigned char *ws = " \t";
for (; cl->len > 0; cl->len--)
- if (strchr(ws, cl->buf[cl->len - 1]) == NULL
- && ((cl->flags & CL_ALTWERASE) == 0
- || isalpha(cl->buf[cl->len - 1])))
+ if (strchr(ws, cl->buf[cl->len - 1]) == NULL &&
+ ((cl->flags & CL_ALTWERASE) == 0 ||
+ isalpha(cl->buf[cl->len - 1])))
break;
for (; cl->len > 0; cl->len--)
- if (strchr(ws, cl->buf[cl->len - 1]) != NULL
- || ((cl->flags & CL_ALTWERASE)
- && !isalpha(cl->buf[cl->len - 1])))
+ if (strchr(ws, cl->buf[cl->len - 1]) != NULL ||
+ ((cl->flags & CL_ALTWERASE) &&
+ !isalpha(cl->buf[cl->len - 1])))
break;
return 0;