Tue Feb 23 18:30:16 2016 UTC ()
name the long option after the ksh name (trackall) to indicate the intended
posix behavior not the bash one.


(christos)
diff -r1.23 -r1.24 src/bin/sh/options.h
cvs diff -r1.23 -r1.24 src/bin/sh/options.h (expand / switch to unified diff)

--- src/bin/sh/options.h 2016/02/23 16:22:43 1.23
+++ src/bin/sh/options.h 2016/02/23 18:30:16 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: options.h,v 1.23 2016/02/23 16:22:43 christos Exp $ */ 1/* $NetBSD: options.h,v 1.24 2016/02/23 18:30:16 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1991, 1993 4 * Copyright (c) 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to Berkeley by 7 * This code is derived from software contributed to Berkeley by
8 * Kenneth Almquist. 8 * Kenneth Almquist.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -93,27 +93,27 @@ DEF_OPT( "nounset", 'u' ) /* error expan @@ -93,27 +93,27 @@ DEF_OPT( "nounset", 'u' ) /* error expan
93#define uflag optlist[14].val 93#define uflag optlist[14].val
94DEF_OPT( "quietprofile", 'q' ) 94DEF_OPT( "quietprofile", 'q' )
95#define qflag optlist[15].val 95#define qflag optlist[15].val
96DEF_OPT( "nolog", 0 ) /* [U] no functon defs in command history */ 96DEF_OPT( "nolog", 0 ) /* [U] no functon defs in command history */
97#define nolog optlist[16].val 97#define nolog optlist[16].val
98DEF_OPT( "cdprint", 0 ) /* always print result of cd */ 98DEF_OPT( "cdprint", 0 ) /* always print result of cd */
99#define cdprint optlist[17].val 99#define cdprint optlist[17].val
100DEF_OPT( "tabcomplete", 0 ) /* <tab> causes filename expansion */ 100DEF_OPT( "tabcomplete", 0 ) /* <tab> causes filename expansion */
101#define tabcomplete optlist[18].val 101#define tabcomplete optlist[18].val
102DEF_OPT( "fork", 'F' ) /* use fork(2) instead of vfork(2) */ 102DEF_OPT( "fork", 'F' ) /* use fork(2) instead of vfork(2) */
103#define usefork optlist[19].val 103#define usefork optlist[19].val
104DEF_OPT( "nopriv", 'p' ) /* preserve privs even if set{u,g}id */ 104DEF_OPT( "nopriv", 'p' ) /* preserve privs even if set{u,g}id */
105#define pflag optlist[20].val 105#define pflag optlist[20].val
106DEF_OPT( "hashall", 'h' ) /* [U] locate cmds in funcs when defined */ 106DEF_OPT( "trackall", 'h' ) /* [U] locate cmds in funcs when defined */
107#define hflag optlist[21].val 107#define hflag optlist[21].val
108#ifdef DEBUG 108#ifdef DEBUG
109DEF_OPT( "debug", 0 ) /* enable debug prints */ 109DEF_OPT( "debug", 0 ) /* enable debug prints */
110#define debug optlist[22].val 110#define debug optlist[22].val
111#endif 111#endif
112 112
113#ifdef DEFINE_OPTIONS 113#ifdef DEFINE_OPTIONS
114 { 0, 0, 0, 0 }, 114 { 0, 0, 0, 0 },
115}; 115};
116#define NOPTS (sizeof optlist / sizeof optlist[0] - 1) 116#define NOPTS (sizeof optlist / sizeof optlist[0] - 1)
117int sizeof_optlist = sizeof optlist; 117int sizeof_optlist = sizeof optlist;
118#else 118#else
119extern struct optent optlist[]; 119extern struct optent optlist[];