[src/trunk]: src/bin/sh PR bin/50896: make shift with more than 1 arg give a ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0dceedbc369d
branches:  trunk
changeset: 814127:0dceedbc369d
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 08 14:08:39 2016 +0000

description:
PR bin/50896: make shift with more than 1 arg give a usage message, from kre

diffstat:

 bin/sh/options.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r fc4bcc85269c -r 0dceedbc369d bin/sh/options.c
--- a/bin/sh/options.c  Tue Mar 08 09:51:15 2016 +0000
+++ b/bin/sh/options.c  Tue Mar 08 14:08:39 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.44 2016/02/24 14:38:40 christos Exp $    */
+/*     $NetBSD: options.c,v 1.45 2016/03/08 14:08:39 christos Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: options.c,v 1.44 2016/02/24 14:38:40 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.45 2016/03/08 14:08:39 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -335,6 +335,8 @@
        int n;
        char **ap1, **ap2;
 
+       if (argc > 2)
+               error("Usage: shift [n]");
        n = 1;
        if (argc > 1)
                n = number(argv[1]);
@@ -347,7 +349,8 @@
                        ckfree(*ap1);
        }
        ap2 = shellparam.p;
-       while ((*ap2++ = *ap1++) != NULL);
+       while ((*ap2++ = *ap1++) != NULL)
+               continue;
        shellparam.optnext = NULL;
        INTON;
        return 0;