diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-04-04 11:28:36 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@ucw.cz> | 2010-05-12 03:21:10 +0200 |
| commit | 14b56bb1170bdfc4b3f6435017eab676c19b19bd (patch) | |
| tree | e3e83e1e30a27278d6eddfed55c7142bb7733f85 | |
| parent | ec2c681f5d94865892b383e6dc7a429e3bf58b11 (diff) | |
| download | glibc-14b56bb1170bdfc4b3f6435017eab676c19b19bd.tar.gz glibc-14b56bb1170bdfc4b3f6435017eab676c19b19bd.tar.xz glibc-14b56bb1170bdfc4b3f6435017eab676c19b19bd.zip | |
Add test case for last argp bug.
(cherry picked from commit 7ebaec64a0171a54dbe9aedd95497b130458060e)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | argp/Makefile | 5 | ||||
| -rw-r--r-- | argp/bug-argp2.c | 55 |
3 files changed, 63 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index db3d121085..8f3aef4323 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-04-04 Ulrich Drepper <drepper@redhat.com> + + * argp/Makefile: Add rules to build and run bug-argp2. + * argp/bug-argp2.c: New file. + 2010-02-05 Sergey Poznyakoff <gray@gnu.org.ua> [BZ #11254] diff --git a/argp/Makefile b/argp/Makefile index b8c9fca0fb..caa95dbb9f 100644 --- a/argp/Makefile +++ b/argp/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 1997,2002,2003,2006,2007,2010 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -26,12 +26,13 @@ distribute = argp-fmtstream.h argp-namefrob.h routines = $(addprefix argp-, ba fmtstream fs-xinl help parse pv \ pvh xinl eexst) -tests = argp-test tst-argp1 bug-argp1 tst-argp2 +tests = argp-test tst-argp1 bug-argp1 tst-argp2 bug-argp2 CFLAGS-argp-help.c = $(uses-callbacks) -fexceptions CFLAGS-argp-parse.c = $(uses-callbacks) CFLAGS-argp-fmtstream.c = -fexceptions bug-argp1-ARGS = -- --help +bug-argp2-ARGS = -- -d 111 --dstaddr 222 -p 333 --peer 444 include ../Rules diff --git a/argp/bug-argp2.c b/argp/bug-argp2.c new file mode 100644 index 0000000000..133e5cf6e8 --- /dev/null +++ b/argp/bug-argp2.c @@ -0,0 +1,55 @@ +#include <argp.h> +#include <stdio.h> +#include <stdlib.h> + +static struct argp_option argp_options[] = { + { "dstaddr", 'd', "ADDR", 0, + "set destination (peer) address to ADDR" }, + { "peer", 'p', "ADDR", OPTION_ALIAS }, + { NULL } +}; + +static error_t parse_opt (int key, char *arg, struct argp_state *state); + +static struct argp argp = +{ + argp_options, parse_opt +}; + +static int cnt; + +static int +do_test (int argc, char *argv[]) +{ + int remaining; + argp_parse (&argp, argc, argv, 0, &remaining, NULL); + return cnt != 4; +} + +static error_t +parse_opt (int key, char *arg, struct argp_state *state) +{ + switch (key) + { + case 'd': + case 'p': + printf ("got '%c' with argument '%s'\n", key, arg); + ++cnt; + break; + case 0: + case ARGP_KEY_END: + case ARGP_KEY_NO_ARGS: + case ARGP_KEY_INIT: + case ARGP_KEY_SUCCESS: + case ARGP_KEY_FINI: + // Ignore. + return ARGP_ERR_UNKNOWN; + default: + printf ("invalid key '%x'\n", key); + exit (1); + } + return 0; +} + +#define TEST_FUNCTION do_test (argc, argv) +#include "../test-skeleton.c" |