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/lib/argv-iter.c | 117 ----------------------------------------------------- gl/lib/argv-iter.h | 47 --------------------- 2 files changed, 164 deletions(-) delete mode 100644 gl/lib/argv-iter.c delete mode 100644 gl/lib/argv-iter.h (limited to 'gl/lib') diff --git a/gl/lib/argv-iter.c b/gl/lib/argv-iter.c deleted file mode 100644 index d7df073b3..000000000 --- a/gl/lib/argv-iter.c +++ /dev/null @@ -1,117 +0,0 @@ -/* Iterate over arguments from argv or --files0-from=FILE - 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 "argv-iter.h" - -#include -#include - -struct argv_iterator -{ - /* Test FP to determine whether in read-mode or argv-mode. */ - /* file-mode: fp records position */ - FILE *fp; - size_t item_idx; - char *tok; - size_t buf_len; - - /* argv-mode: record just argv and current pointer */ - char **arg_list; - char **p; -}; - -struct argv_iterator * -argv_iter_init_argv (char **argv) -{ - struct argv_iterator *ai = malloc (sizeof *ai); - if (!ai) - return NULL; - ai->fp = NULL; - ai->arg_list = argv; - ai->p = argv; - return ai; -} - -/* Initialize to read from the stream, FP. - The input is expected to contain a list of NUL-delimited tokens. */ -struct argv_iterator * -argv_iter_init_stream (FILE *fp) -{ - struct argv_iterator *ai = malloc (sizeof *ai); - if (!ai) - return NULL; - ai->fp = fp; - ai->tok = NULL; - ai->buf_len = 0; - - ai->item_idx = 0; - ai->arg_list = NULL; - return ai; -} - -char * -argv_iter (struct argv_iterator *ai, enum argv_iter_err *err) -{ - if (ai->fp) - { - ssize_t len = getdelim (&ai->tok, &ai->buf_len, '\0', ai->fp); - if (len < 0) - { - *err = feof (ai->fp) ? AI_ERR_EOF : AI_ERR_READ; - return NULL; - } - - *err = AI_ERR_OK; - ai->item_idx++; - return ai->tok; - } - else - { - if (*(ai->p) == NULL) - { - *err = AI_ERR_EOF; - return NULL; - } - else - { - *err = AI_ERR_OK; - return *(ai->p++); - } - } -} - -size_t -argv_iter_n_args (struct argv_iterator const *ai) -{ - return ai->fp ? ai->item_idx : ai->p - ai->arg_list; -} - -void -argv_iter_free (struct argv_iterator *ai) -{ - if (ai->fp) - free (ai->tok); - free (ai); -} - -/* - * Local variables: - * indent-tabs-mode: nil - * End: - */ diff --git a/gl/lib/argv-iter.h b/gl/lib/argv-iter.h deleted file mode 100644 index 537fb1ea2..000000000 --- a/gl/lib/argv-iter.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Iterate over arguments from argv or --files0-from=FILE - 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 . */ - -#include -#include - -struct argv_iterator; -enum argv_iter_err; - -#undef _ATTRIBUTE_NONNULL_ -#if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__ -# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m))) -#else -# define _ATTRIBUTE_NONNULL_(m) -#endif - -enum argv_iter_err -{ - AI_ERR_OK = 1, - AI_ERR_EOF, - AI_ERR_MEM, - AI_ERR_READ -}; - -struct argv_iterator *argv_iter_init_argv (char **argv) - _ATTRIBUTE_NONNULL_ (1); -struct argv_iterator *argv_iter_init_stream (FILE *fp) - _ATTRIBUTE_NONNULL_ (1); -char *argv_iter (struct argv_iterator *, enum argv_iter_err *) - _ATTRIBUTE_NONNULL_ (1) _ATTRIBUTE_NONNULL_ (2); -size_t argv_iter_n_args (struct argv_iterator const *) - _ATTRIBUTE_NONNULL_ (1); -void argv_iter_free (struct argv_iterator *) - _ATTRIBUTE_NONNULL_ (1); -- cgit v1.2.3-70-g09d2