mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
170 lines
4.2 KiB
C
170 lines
4.2 KiB
C
/* getopt_long and getopt_long_only entry points for GNU getopt.
|
||
Copyright (C) 1987, 88, 89, 90, 91, 92, 1993, 1994
|
||
Free Software Foundation, Inc.
|
||
|
||
This file is part of the GNU C Library. Its master source is NOT part of
|
||
the C library, however. The master source lives in /gd/gnu/lib.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C Library 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
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <global.h>
|
||
#include "getopt.h"
|
||
|
||
#if (!defined (__STDC__) || !__STDC__) && !defined(MSDOS) && !defined(OS2)
|
||
/* This is a separate conditional since some stdc systems
|
||
reject `defined (const)'. */
|
||
#ifndef const
|
||
#define const
|
||
#endif
|
||
#endif
|
||
|
||
#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. */
|
||
|
||
#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
|
||
|
||
#ifndef __WIN__
|
||
#include <stdlib.h>
|
||
#endif /* __WIN__ */
|
||
|
||
#ifndef NULL
|
||
#define NULL 0
|
||
#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 /* _LIBC or not __GNU_LIBRARY__. */
|
||
|
||
#ifdef TEST
|
||
|
||
#include <stdio.h>
|
||
|
||
int
|
||
main (argc, argv)
|
||
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 == EOF)
|
||
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 */
|