Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

build: Use more gnulib modules.

Browse Source 
* autogen.sh (GNULIB_MODULES): Add getopt-gnu.
Use directory gnulib-local.
* gnulib-local/lib/getopt-pfx-ext.h.diff: New file.
* Makefile.in (SOURCE_FILES): Add it.
(distdir): Use 'mkdir -p' instead of 'mkdir'.
* lib/getopt.h: Remove file.
* lib/getopt.c: Remove file.
* lib/getopt1.c: Remove file.
* lib/Makefile.am (libgp_a_SOURCES): Remove them.
This commit is contained in:
Bruno Haible
2025-04-16 22:07:02 +02:00
parent 6ca5ea1384
commit 46db237ecc
9 changed files with 45 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2025-04-16 Bruno Haible <bruno@clisp.org>
build: Use more gnulib modules.
* autogen.sh (GNULIB_MODULES): Add getopt-gnu.
Use directory gnulib-local.
* gnulib-local/lib/getopt-pfx-ext.h.diff: New file.
* Makefile.in (SOURCE_FILES): Add it.
(distdir): Use 'mkdir -p' instead of 'mkdir'.
* lib/getopt.h: Remove file.
* lib/getopt.c: Remove file.
* lib/getopt1.c: Remove file.
* lib/Makefile.am (libgp_a_SOURCES): Remove them.
2025-04-16 Bruno Haible <bruno@clisp.org> 2025-04-16 Bruno Haible <bruno@clisp.org>
build: Use more gnulib modules. build: Use more gnulib modules.

5
Makefile.in
View File

@@ -67,7 +67,8 @@ maintainer-clean : force
SOURCE_FILES = \ SOURCE_FILES = \
README INSTALL.windows NEWS AUTHORS JOIN-GNU \ README INSTALL.windows NEWS AUTHORS JOIN-GNU \
autogen.sh configure.ac aclocal.m4 Makefile.in \ autogen.sh configure.ac aclocal.m4 Makefile.in \
Makefile.devel ChangeLog Makefile.devel ChangeLog \
gnulib-local/lib/getopt-pfx-ext.h.diff
# List of distributed files imported from other packages. # List of distributed files imported from other packages.
IMPORTED_FILES = \ IMPORTED_FILES = \
COPYING INSTALL \ COPYING INSTALL \
@@ -84,7 +85,7 @@ distdir : $(DISTFILES)
for file in $(DISTFILES); do \ for file in $(DISTFILES); do \
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \ if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
destdir=`echo '$(distdir)'/$$file | sed -e 's|//*[^/]*$$||'`; \ destdir=`echo '$(distdir)'/$$file | sed -e 's|//*[^/]*$$||'`; \
test -d "$$destdir" || mkdir "$$destdir"; \ test -d "$$destdir" || mkdir -p "$$destdir"; \
cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \ cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \
done done
subdir=@subdir@; test -d '$(distdir)'/$$subdir || mkdir '$(distdir)'/$$subdir; cd $$subdir; $(MAKE) distdir distdir='$(distdir)'/$$subdir subdir=@subdir@; test -d '$(distdir)'/$$subdir || mkdir '$(distdir)'/$$subdir; cd $$subdir; $(MAKE) distdir distdir='$(distdir)'/$$subdir

3
autogen.sh
View File

@@ -65,11 +65,12 @@ if test $skip_gnulib = false; then
} }
GNULIB_MODULES=' GNULIB_MODULES='
filename filename
getopt-gnu
read-file read-file
package-version package-version
' '
$GNULIB_TOOL --lib=libgp --source-base=lib --m4-base=lib/gnulib-m4 \ $GNULIB_TOOL --lib=libgp --source-base=lib --m4-base=lib/gnulib-m4 \
--makefile-name=Makefile.gnulib \ --makefile-name=Makefile.gnulib --local-dir=gnulib-local \
--import \ --import \
$GNULIB_MODULES $GNULIB_MODULES
$GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess

16
gnulib-local/lib/getopt-pfx-ext.h.diff Normal file
View File

@@ -0,0 +1,16 @@
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index 1f2b2d71bf..a61c68c795 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -38,11 +38,9 @@
# endif
# undef getopt_long
# undef getopt_long_only
-# undef option
# undef _getopt_internal
# define getopt_long __GETOPT_ID (getopt_long)
# define getopt_long_only __GETOPT_ID (getopt_long_only)
-# define option __GETOPT_ID (option)
# define _getopt_internal __GETOPT_ID (getopt_internal)
/* The system's getopt.h may have already included getopt-ext.h to

11
lib/.gitignore vendored
View File

@@ -22,11 +22,22 @@
/ftell.c /ftell.c
/ftello.c /ftello.c
/getdtablesize.c /getdtablesize.c
/getopt-cdefs.in.h
/getopt-core.h
/getopt-ext.h
/getopt-pfx-core.h
/getopt-pfx-ext.h
/getopt.c
/getopt.in.h
/getopt1.c
/getopt_int.h
/gettext.h
/idx.h /idx.h
/intprops-internal.h /intprops-internal.h
/inttypes.in.h /inttypes.in.h
/limits.in.h /limits.in.h
/lseek.c /lseek.c
/locale.in.h
/malloc.c /malloc.c
/malloca.c /malloca.c
/malloca.h /malloca.h

1
lib/Makefile.am
View File

@@ -28,7 +28,6 @@ noinst_LIBRARIES = libgp.a
include Makefile.gnulib include Makefile.gnulib
libgp_a_SOURCES += \ libgp_a_SOURCES += \
getopt.h getopt.c getopt1.c \
hash.h hash.cc hash.h hash.cc
# Allow users to use "gnulib-tool --update". # Allow users to use "gnulib-tool --update".

1004
lib/getopt.c
View File

File diff suppressed because it is too large Load Diff

124
lib/getopt.h
View File

@@ -1,124 +0,0 @@
/* Declarations for getopt.
Copyright (C) 1989-1998, 2000, 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 <https://www.gnu.org/licenses/>. */
#ifndef _GETOPT_H
#define _GETOPT_H 1
#ifdef __cplusplus
extern "C" {
#endif
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
the argument value is returned here.
Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */
extern char *optarg;
/* Index in ARGV of the next element to be scanned.
This is used for communication to and from the caller
and for communication between successive calls to `getopt'.
On entry to `getopt', zero means this is the first call; initialize.
When `getopt' returns -1, this is the index of the first of the
non-option elements that the caller should itself scan.
Otherwise, `optind' communicates from one call to the next
how much of ARGV has been scanned so far. */
extern int optind;
/* Callers store zero here to inhibit the error message `getopt' prints
for unrecognized options. */
extern int opterr;
/* Set to an option character which was unrecognized. */
extern int optopt;
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
of `struct option' terminated by an element containing a name which is
zero.
The field `has_arg' is:
no_argument (or 0) if the option does not take an argument,
required_argument (or 1) if the option requires an argument,
optional_argument (or 2) if the option takes an optional argument.
If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but
left unchanged if the option is not found.
To have a long-named option do something other than set an `int' to
a compiled-in constant, such as set a value from `optarg', set the
option's `flag' field to zero and its `val' field to a nonzero
value (the equivalent single-letter option character, if there is
one). For long options that have a zero `flag' field, `getopt'
returns the contents of the `val' field. */
struct option
{
const char *name;
/* has_arg can't be an enum because some compilers complain about
type mismatches in all the code that assumes it is an int. */
int has_arg;
int *flag;
int val;
};
/* Names for the values of the `has_arg' field of `struct option'. */
#define no_argument 0
#define required_argument 1
#define optional_argument 2
#ifdef __cplusplus
/* SunOS4 declares getopt with the following prototype:
extern int getopt (int argc, const char *const *argv, const char *shortopts);
We cannot redeclare it when compiling C++ code. */
#define getopt(x,y,z) getopt_long(x, y, z, (const struct option *) 0, (int *) 0)
#else /* not __cplusplus */
#ifdef __GNU_LIBRARY__
/* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
extern int getopt ();
#endif /* __GNU_LIBRARY__ */
#endif /* __cplusplus */
extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind);
/* Internal only. Users should not call this directly. */
extern int _getopt_internal (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind,
int long_only);
#ifdef __cplusplus
}
#endif
#endif /* getopt.h */

164
lib/getopt1.c
View File

@@ -1,164 +0,0 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
Copyright (C) 1987-1998, 2016
Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 <https://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "getopt.h"
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not
actually compiling the library itself. This code is part of the GNU C
Library, but also included in many other GNU distributions. Compiling
and linking in this code is a waste when using the GNU C library
(especially if it is a shared library). Rather than having every GNU
program understand `configure --with-gnu-libc' and omit the object files,
it is simpler to just do this in the source for each such file. */
#define GETOPT_INTERFACE_VERSION 2
#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
#include <gnu-versions.h>
#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
#define ELIDE_CODE
#endif
#endif
#ifndef ELIDE_CODE
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
#include <stdlib.h>
#endif
int
getopt_long (int argc, char *const *argv, const char *options,
const struct option *long_options, int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
}
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
If an option that starts with '-' (not '--') doesn't match a long option,
but does match a short option, it is parsed as a short option
instead. */
int
getopt_long_only (int argc, char *const *argv, const char *options,
const struct option *long_options, int *opt_index)
{
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
}
#endif /* Not ELIDE_CODE. */
#ifdef TEST
#include <stdio.h>
int
main (int argc, char **argv)
{
int c;
int digit_optind = 0;
while (1)
{
int this_option_optind = optind ? optind : 1;
int option_index = 0;
static struct option long_options[] =
{
{"add", 1, 0, 0},
{"append", 0, 0, 0},
{"delete", 1, 0, 0},
{"verbose", 0, 0, 0},
{"create", 0, 0, 0},
{"file", 1, 0, 0},
{0, 0, 0, 0}
};
c = getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index);
if (c == -1)
break;
switch (c)
{
case 0:
printf ("option %s", long_options[option_index].name);
if (optarg)
printf (" with arg %s", optarg);
printf ("\n");
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
if (digit_optind != 0 && digit_optind != this_option_optind)
printf ("digits occur in two different argv-elements.\n");
digit_optind = this_option_optind;
printf ("option %c\n", c);
break;
case 'a':
printf ("option a\n");
break;
case 'b':
printf ("option b\n");
break;
case 'c':
printf ("option c with value `%s'\n", optarg);
break;
case 'd':
printf ("option d with value `%s'\n", optarg);
break;
case '?':
break;
default:
printf ("?? getopt returned character code 0%o ??\n", c);
}
}
if (optind < argc)
{
printf ("non-option ARGV-elements: ");
while (optind < argc)
printf ("%s ", argv[optind++]);
printf ("\n");
}
exit (0);
}
#endif /* TEST */