summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-03-28 21:33:05 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-03-28 21:33:05 +0000
commitd7eeb04832478dfaae6ebb1ecc1e17e59637561c (patch)
tree701d302a540d0fb7bf4fffe241740b0785a29f5b
parentc7d3a861b50e69bd7963b9064d35b957fa18fe6a (diff)
spacing
-rw-r--r--bin/ksh/c_ksh.c6
-rw-r--r--bin/ksh/c_test.c6
-rw-r--r--bin/ksh/sh.h14
-rw-r--r--bin/ksh/syn.c8
-rw-r--r--bin/ksh/var.c40
5 files changed, 37 insertions, 37 deletions
diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index 6bfbffbef93..2e822a01cc4 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_ksh.c,v 1.25 2005/02/02 07:53:01 otto Exp $ */
+/* $OpenBSD: c_ksh.c,v 1.26 2005/03/28 21:33:04 deraadt Exp $ */
/*
* built-in Korn commands: c_*
@@ -866,8 +866,8 @@ c_alias(char **wp)
/* "hash -r" means reset all the tracked aliases.. */
if (rflag) {
static const char *const args[] = {
- "unalias", "-ta", (const char *) 0
- };
+ "unalias", "-ta", (const char *) 0
+ };
if (!tflag || *wp) {
shprintf(
diff --git a/bin/ksh/c_test.c b/bin/ksh/c_test.c
index 2023d51be60..0e6ee7fd259 100644
--- a/bin/ksh/c_test.c
+++ b/bin/ksh/c_test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_test.c,v 1.15 2005/02/02 07:53:01 otto Exp $ */
+/* $OpenBSD: c_test.c,v 1.16 2005/03/28 21:33:04 deraadt Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
@@ -505,8 +505,8 @@ ptest_isa(Test_env *te, Test_meta meta)
{
/* Order important - indexed by Test_meta values */
static const char *const tokens[] = {
- "-o", "-a", "!", "(", ")"
- };
+ "-o", "-a", "!", "(", ")"
+ };
int ret;
if (te->pos.wp >= te->wp_end)
diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h
index a0e1269e715..15a6cff8377 100644
--- a/bin/ksh/sh.h
+++ b/bin/ksh/sh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sh.h,v 1.26 2005/02/21 16:01:58 otto Exp $ */
+/* $OpenBSD: sh.h,v 1.27 2005/03/28 21:33:04 deraadt Exp $ */
/*
* Public Domain Bourne/Korn shell
@@ -224,8 +224,8 @@ EXTERN char newline [] I__("\n");
EXTERN char slash [] I__("/");
enum temp_type {
- TT_HEREDOC_EXP, /* expanded heredoc */
- TT_HIST_EDIT /* temp file used for history editing (fc -e) */
+ TT_HEREDOC_EXP, /* expanded heredoc */
+ TT_HIST_EDIT /* temp file used for history editing (fc -e) */
};
typedef enum temp_type Temp_type;
/* temp/heredoc files. The file is removed when the struct is freed. */
@@ -295,10 +295,10 @@ extern Trap sigtraps[NSIG+1];
*/
/* values for ksh_tmout_state */
enum tmout_enum {
- TMOUT_EXECUTING = 0, /* executing commands */
- TMOUT_READING, /* waiting for input */
- TMOUT_LEAVING /* have timed out */
- };
+ TMOUT_EXECUTING = 0, /* executing commands */
+ TMOUT_READING, /* waiting for input */
+ TMOUT_LEAVING /* have timed out */
+};
EXTERN unsigned int ksh_tmout;
EXTERN enum tmout_enum ksh_tmout_state I__(TMOUT_EXECUTING);
diff --git a/bin/ksh/syn.c b/bin/ksh/syn.c
index a3723feb08f..ea494ac7c27 100644
--- a/bin/ksh/syn.c
+++ b/bin/ksh/syn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syn.c,v 1.20 2004/12/22 17:14:34 millert Exp $ */
+/* $OpenBSD: syn.c,v 1.21 2005/03/28 21:33:04 deraadt Exp $ */
/*
* shell parser (C version)
@@ -807,9 +807,9 @@ static const char dbtest_not[] = { CHAR, '!', EOS };
static const char dbtest_oparen[] = { CHAR, '(', EOS };
static const char dbtest_cparen[] = { CHAR, ')', EOS };
const char *const dbtest_tokens[] = {
- dbtest_or, dbtest_and, dbtest_not,
- dbtest_oparen, dbtest_cparen
- };
+ dbtest_or, dbtest_and, dbtest_not,
+ dbtest_oparen, dbtest_cparen
+};
const char db_close[] = { CHAR, ']', CHAR, ']', EOS };
const char db_lthan[] = { CHAR, '<', EOS };
const char db_gthan[] = { CHAR, '>', EOS };
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index d229b766096..cbfc084a014 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: var.c,v 1.24 2005/03/28 21:28:22 deraadt Exp $ */
+/* $OpenBSD: var.c,v 1.25 2005/03/28 21:33:04 deraadt Exp $ */
#include "sh.h"
#include <time.h>
@@ -85,29 +85,29 @@ initvar(void)
const char *name;
int v;
} names[] = {
- { "COLUMNS", V_COLUMNS },
- { "IFS", V_IFS },
- { "OPTIND", V_OPTIND },
- { "PATH", V_PATH },
- { "POSIXLY_CORRECT", V_POSIXLY_CORRECT },
- { "TMPDIR", V_TMPDIR },
+ { "COLUMNS", V_COLUMNS },
+ { "IFS", V_IFS },
+ { "OPTIND", V_OPTIND },
+ { "PATH", V_PATH },
+ { "POSIXLY_CORRECT", V_POSIXLY_CORRECT },
+ { "TMPDIR", V_TMPDIR },
#ifdef HISTORY
- { "HISTFILE", V_HISTFILE },
- { "HISTSIZE", V_HISTSIZE },
+ { "HISTFILE", V_HISTFILE },
+ { "HISTSIZE", V_HISTSIZE },
#endif /* HISTORY */
#ifdef EDIT
- { "EDITOR", V_EDITOR },
- { "VISUAL", V_VISUAL },
+ { "EDITOR", V_EDITOR },
+ { "VISUAL", V_VISUAL },
#endif /* EDIT */
- { "MAIL", V_MAIL },
- { "MAILCHECK", V_MAILCHECK },
- { "MAILPATH", V_MAILPATH },
- { "RANDOM", V_RANDOM },
- { "SECONDS", V_SECONDS },
- { "TMOUT", V_TMOUT },
- { "LINENO", V_LINENO },
- { (char *) 0, 0 }
- };
+ { "MAIL", V_MAIL },
+ { "MAILCHECK", V_MAILCHECK },
+ { "MAILPATH", V_MAILPATH },
+ { "RANDOM", V_RANDOM },
+ { "SECONDS", V_SECONDS },
+ { "TMOUT", V_TMOUT },
+ { "LINENO", V_LINENO },
+ { (char *) 0, 0 }
+ };
int i;
struct tbl *tp;