From ec34511ccf89968a6f112587dde65476c02b94aa Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 4 Jul 2009 17:41:39 +0200 Subject: move argv-iter module to gnulib * gl/lib/argv-iter.c: Remove file. * gl/lib/argv-iter.h: Remove file. * gl/modules/argv-iter: Remove file. * gl/modules/argv-iter-tests: Remove file. * gl/tests/test-argv-iter.c: Remove file. * gnulib: Update submodule, to get argv-iter --- gl/tests/test-argv-iter.c | 120 ---------------------------------------------- 1 file changed, 120 deletions(-) delete mode 100644 gl/tests/test-argv-iter.c (limited to 'gl/tests') diff --git a/gl/tests/test-argv-iter.c b/gl/tests/test-argv-iter.c deleted file mode 100644 index 8d14d9f2e..000000000 --- a/gl/tests/test-argv-iter.c +++ /dev/null @@ -1,120 +0,0 @@ -/* Test argv iterator - Copyright (C) 2008-2009 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Jim Meyering. */ - -#include -#include -#include -#include - -#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) -#define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) - -#include "argv-iter.h" - -static FILE * -write_nul_delimited_argv (char **argv) -{ - FILE *fp = tmpfile (); - ASSERT (fp); - while (*argv) - { - size_t len = strlen (*argv) + 1; - ASSERT (fwrite (*argv, len, 1, fp) == 1); - argv++; - } - ASSERT (fflush (fp) == 0); - rewind (fp); - return fp; -} - -int -main () -{ - /* set_program_name (argv[0]); placate overzealous "syntax-check" test. */ - static char *av[][4] = { - {NULL}, - {"1", NULL}, - {"1", "2", NULL}, - {"1", "2", "3", NULL} - }; - - int use_stream; - for (use_stream = 0; use_stream < 2; use_stream++) - { - size_t i; - for (i = 0; i < ARRAY_CARDINALITY (av); i++) - { - FILE *fp; - struct argv_iterator *ai; - size_t n_found = 0; - if (use_stream) - { - /* Generate an identical list to be read via FP. */ - ASSERT ((fp = write_nul_delimited_argv (av[i])) != NULL); - ai = argv_iter_init_stream (fp); - } - else - { - fp = NULL; - ai = argv_iter_init_argv (av[i]); - } - ASSERT (ai); - - while (1) - { - enum argv_iter_err ai_err; - char *s = argv_iter (ai, &ai_err); - ASSERT ((i == n_found) == (ai_err == AI_ERR_EOF)); - ASSERT ((s == NULL) ^ (ai_err == AI_ERR_OK)); - ASSERT (ai_err == AI_ERR_OK || ai_err == AI_ERR_EOF); - if (ai_err == AI_ERR_OK) - ++n_found; - if (ai_err == AI_ERR_EOF) - break; - /* In stream mode, the strings are equal, but - in argv mode the actual pointers are equal. */ - ASSERT (use_stream - ? STREQ (s, av[i][n_found - 1]) - : s == av[i][n_found - 1]); - } - ASSERT (argv_iter_n_args (ai) == i); - argv_iter_free (ai); - if (fp) - ASSERT (fclose (fp) == 0); - } - } - - return 0; -} - -/* - * Local variables: - * indent-tabs-mode: nil - * End: - */ -- cgit v1.2.3-70-g09d2