[src/netbsd-1-5]: src/bin/dd Pull up revisions 1.18-1.19 (requested by kleink):

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

details:   https://anonhg.NetBSD.org/src/rev/3425735dba5e
branches:  netbsd-1-5
changeset: 490606:3425735dba5e
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 03 20:54:59 2001 +0000

description:
Pull up revisions 1.18-1.19 (requested by kleink):
  Accept the getopt(3) ``last option'' delimiter.  Fixes PR#11229.

diffstat:

 bin/dd/dd.c |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 214adc419fee -r 3425735dba5e bin/dd/dd.c
--- a/bin/dd/dd.c       Sat Feb 03 20:52:31 2001 +0000
+++ b/bin/dd/dd.c       Sat Feb 03 20:54:59 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dd.c,v 1.14.4.1 2000/08/26 00:54:59 matt Exp $ */
+/*     $NetBSD: dd.c,v 1.14.4.2 2001/02/03 20:54:59 he Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)dd.c       8.5 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: dd.c,v 1.14.4.1 2000/08/26 00:54:59 matt Exp $");
+__RCSID("$NetBSD: dd.c,v 1.14.4.2 2001/02/03 20:54:59 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -93,6 +93,18 @@
        int argc;
        char *argv[];
 {
+       int ch;
+
+       while ((ch = getopt(argc, argv, "")) != -1) {
+               switch (ch) {
+               default:
+                       errx(EXIT_FAILURE, "usage: dd [operand ...]");
+                       /* NOTREACHED */
+               }
+       }
+       argc -= (optind - 1);
+       argv += (optind - 1);
+
        jcl(argv);
        setup();