mirror of
https://github.com/matrix-construct/construct
synced 2024-06-13 07:28:58 +02:00
charybdis: Move getopt out from ircd::.
This commit is contained in:
parent
f7f9d87df0
commit
2d494d8924
|
@ -16,6 +16,7 @@ AM_LDFLAGS += \
|
||||||
bin_PROGRAMS = charybdis
|
bin_PROGRAMS = charybdis
|
||||||
|
|
||||||
charybdis_SOURCES = \
|
charybdis_SOURCES = \
|
||||||
|
lgetopt.cc \
|
||||||
charybdis.cc
|
charybdis.cc
|
||||||
|
|
||||||
charybdis_LDADD = \
|
charybdis_LDADD = \
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#include <ircd/ircd.h>
|
#include <ircd/ircd.h>
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <ircd/ctx_ctx.h>
|
#include <ircd/ctx_ctx.h>
|
||||||
|
#include "lgetopt.h"
|
||||||
|
|
||||||
namespace path = ircd::path;
|
namespace path = ircd::path;
|
||||||
using ircd::lgetopt;
|
|
||||||
|
|
||||||
static void console_spawn();
|
static void console_spawn();
|
||||||
static void sigfd_handler(const boost::system::error_code &, int);
|
static void sigfd_handler(const boost::system::error_code &, int);
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
* USA
|
* USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace ircd {
|
#include <ircd/ircd.h>
|
||||||
|
#include "lgetopt.h"
|
||||||
# define OPTCHAR '-'
|
#define OPTCHAR '-'
|
||||||
|
|
||||||
using argtype = decltype(lgetopt::argtype);
|
using argtype = decltype(lgetopt::argtype);
|
||||||
|
|
||||||
|
@ -137,5 +137,3 @@ usage(const char *name, struct lgetopt *myopts)
|
||||||
|
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace ircd
|
|
139
charybdis/lgetopt.cc
Normal file
139
charybdis/lgetopt.cc
Normal file
|
@ -0,0 +1,139 @@
|
||||||
|
/*
|
||||||
|
* ircd-ratbox: A slightly useful ircd.
|
||||||
|
* getopt.c: Uses getopt to fetch the command line options.
|
||||||
|
*
|
||||||
|
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
|
||||||
|
* Copyright (C) 1996-2002 Hybrid Development Team
|
||||||
|
* Copyright (C) 2002-2005 ircd-ratbox development team
|
||||||
|
*
|
||||||
|
* 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 2 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, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||||
|
* USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <ircd/ircd.h>
|
||||||
|
#include "lgetopt.h"
|
||||||
|
#define OPTCHAR '-'
|
||||||
|
|
||||||
|
using argtype = decltype(lgetopt::argtype);
|
||||||
|
|
||||||
|
void
|
||||||
|
parseargs(int *argc, char * const **argv, struct lgetopt *opts)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
const char *progname = (*argv)[0];
|
||||||
|
|
||||||
|
/* loop through each argument */
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
int found = 0;
|
||||||
|
|
||||||
|
(*argc)--;
|
||||||
|
(*argv)++;
|
||||||
|
|
||||||
|
if(*argc < 1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check if it *is* an arg.. */
|
||||||
|
if((*argv)[0][0] != OPTCHAR)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* search through our argument list, and see if it matches */
|
||||||
|
for (i = 0; opts[i].opt; i++)
|
||||||
|
{
|
||||||
|
if(!strcmp(opts[i].opt, &(*argv)[0][1]))
|
||||||
|
{
|
||||||
|
/* found our argument */
|
||||||
|
found = 1;
|
||||||
|
|
||||||
|
switch (opts[i].argtype)
|
||||||
|
{
|
||||||
|
case argtype::BOOL:
|
||||||
|
*((bool *) opts[i].argloc) = true;
|
||||||
|
break;
|
||||||
|
case argtype::YESNO:
|
||||||
|
*((int *) opts[i].argloc) = 1;
|
||||||
|
break;
|
||||||
|
case argtype::INTEGER:
|
||||||
|
if(*argc < 2)
|
||||||
|
{
|
||||||
|
fprintf(stderr,
|
||||||
|
"Error: option '%c%s' requires an argument\n",
|
||||||
|
OPTCHAR, opts[i].opt);
|
||||||
|
usage(progname, opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
*((int *) opts[i].argloc) = atoi((*argv)[1]);
|
||||||
|
|
||||||
|
(*argc)--;
|
||||||
|
(*argv)++;
|
||||||
|
break;
|
||||||
|
case argtype::STRING:
|
||||||
|
if(*argc < 2)
|
||||||
|
{
|
||||||
|
fprintf(stderr,
|
||||||
|
"error: option '%c%s' requires an argument\n",
|
||||||
|
OPTCHAR, opts[i].opt);
|
||||||
|
usage(progname, opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
*((char **) opts[i].argloc) =
|
||||||
|
(char *)malloc(strlen((*argv)[1]) + 1);
|
||||||
|
strcpy(*((char **) opts[i].argloc), (*argv)[1]);
|
||||||
|
|
||||||
|
(*argc)--;
|
||||||
|
(*argv)++;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case argtype::USAGE:
|
||||||
|
usage(progname, opts);
|
||||||
|
/*NOTREACHED*/ default:
|
||||||
|
fprintf(stderr,
|
||||||
|
"Error: internal error in parseargs() at %s:%d\n",
|
||||||
|
__FILE__, __LINE__);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!found)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "error: unknown argument '%c%s'\n", OPTCHAR, &(*argv)[0][1]);
|
||||||
|
usage(progname, opts);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
usage(const char *name, struct lgetopt *myopts)
|
||||||
|
{
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
fprintf(stderr, "Usage: %s [options]\n", name);
|
||||||
|
fprintf(stderr, "Where valid options are:\n");
|
||||||
|
|
||||||
|
for (i = 0; myopts[i].opt; i++)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "\t%c%-10s %-20s%s\n", OPTCHAR,
|
||||||
|
myopts[i].opt, (myopts[i].argtype == argtype::YESNO || myopts[i].argtype == argtype::BOOL
|
||||||
|
|| myopts[i].argtype ==
|
||||||
|
argtype::USAGE) ? "" : myopts[i].argtype ==
|
||||||
|
argtype::INTEGER ? "<number>" : "<string>", myopts[i].desc);
|
||||||
|
}
|
||||||
|
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
|
@ -22,12 +22,6 @@
|
||||||
* USA
|
* USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#define HAVE_IRCD_GETOPT_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
namespace ircd {
|
|
||||||
|
|
||||||
struct lgetopt
|
struct lgetopt
|
||||||
{
|
{
|
||||||
const char *opt; /* name of the argument */
|
const char *opt; /* name of the argument */
|
||||||
|
@ -40,6 +34,3 @@ struct lgetopt
|
||||||
|
|
||||||
void usage(const char *, struct lgetopt *opts) __attribute__((noreturn));
|
void usage(const char *, struct lgetopt *opts) __attribute__((noreturn));
|
||||||
void parseargs(int *, char * const **, struct lgetopt *);
|
void parseargs(int *, char * const **, struct lgetopt *);
|
||||||
|
|
||||||
} // namespace ircd
|
|
||||||
#endif // __cplusplus
|
|
|
@ -76,7 +76,6 @@ namespace ircd
|
||||||
#include "life_guard.h"
|
#include "life_guard.h"
|
||||||
#include "defaults.h"
|
#include "defaults.h"
|
||||||
#include "exception.h"
|
#include "exception.h"
|
||||||
#include "getopt.h"
|
|
||||||
#include "numeric.h"
|
#include "numeric.h"
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "messages.h"
|
#include "messages.h"
|
||||||
|
|
|
@ -33,7 +33,6 @@ libircd_la_SOURCES = \
|
||||||
rfc1459.cc \
|
rfc1459.cc \
|
||||||
stringops.cc \
|
stringops.cc \
|
||||||
match.cc \
|
match.cc \
|
||||||
getopt.cc \
|
|
||||||
logger.cc \
|
logger.cc \
|
||||||
fs.cc \
|
fs.cc \
|
||||||
conf.cc \
|
conf.cc \
|
||||||
|
|
Loading…
Reference in a new issue