zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 12:53:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove popt and use glib GOption commandline option parser

Browse source 
(glib-2.6 is now the minimum required version).


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4700 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-02-03 16:48:02 +00:00 • committed by exg
commit ab8da71d29
20 changed files with 44 additions and 1464 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/core/args.c
View file

@ -1,5 +1,5 @@
/*
args.c : small frontend to libPopt command line argument parser
args.c : small frontend to GOption command line argument parser
Copyright (C) 1999-2001 Timo Sirainen
@ -21,46 +21,32 @@
#include "module.h"
#include "args.h"
static GArray *iopt_tables = NULL;
static GOptionContext *context = NULL;
void args_register(struct poptOption *options)
void args_register(GOptionEntry *options)
{
if (iopt_tables == NULL) {
iopt_tables = g_array_new(TRUE, TRUE,
sizeof(struct poptOption));
}
if (context == NULL)
context = g_option_context_new("");
while (options->longName != NULL || options->shortName != '\0' ||
options->arg != NULL) {
g_array_append_val(iopt_tables, *options);
options = options+1;
}
g_option_context_add_main_entries(context, options, PACKAGE_TARNAME);
}
void args_execute(int argc, char *argv[])
{
poptContext con;
int nextopt;
GError* error = NULL;
if (iopt_tables == NULL)
if (context == NULL)
return;
con = poptGetContext(PACKAGE_TARNAME, argc, argv,
(struct poptOption *) (iopt_tables->data), 0);
poptReadDefaultConfig(con, TRUE);
g_option_context_parse(context, &argc, &argv, &error);
g_option_context_free(context);
context = NULL;
while ((nextopt = poptGetNextOpt(con)) > 0) ;
if (nextopt != -1) {
printf("Error on option %s: %s.\n"
if (error != NULL) {
printf("%s\n"
"Run '%s --help' to see a full list of "
"available command line options.\n",
poptBadOption(con, 0), poptStrerror(nextopt), argv[0]);
error->message, argv[0]);
exit(1);
}
g_array_free(iopt_tables, TRUE);
iopt_tables = NULL;
poptFreeContext(con);
}

8
src/core/args.h
View file

@ -1,13 +1,7 @@
#ifndef __ARGS_H
#define __ARGS_H
#ifdef HAVE_POPT_H
# include <popt.h>
#else
# include "lib-popt/popt.h"
#endif
void args_register(struct poptOption *options);
void args_register(GOptionEntry *options);
void args_execute(int argc, char *argv[]);
#endif

10
src/core/core.c
View file

@ -167,10 +167,10 @@ static char *fix_path(const char *str)
void core_register_options(void)
{
static struct poptOption options[] = {
{ "config", 0, POPT_ARG_STRING, &irssi_config_file, 0, "Configuration file location (~/.irssi/config)", "PATH" },
{ "home", 0, POPT_ARG_STRING, &irssi_dir, 0, "Irssi home dir location (~/.irssi)", "PATH" },
{ NULL, '\0', 0, NULL }
static GOptionEntry options[] = {
{ "config", 0, 0, G_OPTION_ARG_STRING, &irssi_config_file, "Configuration file location (~/.irssi/config)", "PATH" },
{ "home", 0, 0, G_OPTION_ARG_STRING, &irssi_dir, "Irssi home dir location (~/.irssi)", "PATH" },
{ NULL }
};
args_register(options);
@ -192,6 +192,7 @@ void core_preinit(const char *path)
} else {
str = irssi_dir;
irssi_dir = fix_path(str);
g_free(str);
len = strlen(irssi_dir);
if (irssi_dir[len-1] == G_DIR_SEPARATOR)
irssi_dir[len-1] = '\0';
@ -201,6 +202,7 @@ void core_preinit(const char *path)
else {
str = irssi_config_file;
irssi_config_file = fix_path(str);
g_free(str);
}
session_set_binary(path);

7
src/core/session.c
View file

@ -329,14 +329,13 @@ static void sig_init_finished(void)
config_close(session);
unlink(session_file);
session_file = NULL;
}
void session_register_options(void)
{
static struct poptOption options[] = {
{ "session", 0, POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, &session_file, 0, "Used by /UPGRADE command", "PATH" },
{ NULL, '\0', 0, NULL }
static GOptionEntry options[] = {
{ "session", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &session_file, "Used by /UPGRADE command", "PATH" },
{ NULL }
};
session_file = NULL;