lobase

Linux port of OpenBSDs userland.
Log | Files | Refs | README

commit 05d48b2df2929b9d4f7b420463c4695ed1c09e53
parent a946ef146fb9cc0e9a14651f84ddb6035a3064e5
Author: Duncaen <mail@duncano.de>
Date:   Wed, 24 May 2017 16:51:20 +0200

bin/ksh: revert changes to avoid conflicts

Diffstat:
bin/ksh/misc.c | 2+-
bin/ksh/sh.h | 4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c @@ -115,7 +115,7 @@ Xcheck_grow_(XString *xsp, char *xp, int more) return xsp->beg + (xp - old_beg); } -const struct ksh_option options[] = { +const struct option options[] = { /* Special cases (see parse_args()): -A, -o, -s. * Options are sorted by their longnames - the order of these * entries MUST match the order of sh_flag F* enumerations in sh.h. diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h @@ -119,12 +119,12 @@ extern struct env *genv; #define OF_INTERNAL 0x08 /* set internally by shell */ #define OF_ANY (OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL) -struct ksh_option { +struct option { const char *name; /* long name of option */ char c; /* character flag (if any) */ short flags; /* OF_* */ }; -extern const struct ksh_option options[]; +extern const struct option options[]; /* * flags (the order of these enums MUST match the order in misc.c(options[]))