/* PSPP - a program for statistical analysis.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011 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
#include <config.h>
-#include <libpspp/argv-parser.h>
+#include "libpspp/argv-parser.h"
#include <limits.h>
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
struct argv_option_plus
{
if (shortopt_ptrs[c] == NULL)
{
shortopt_ptrs[c] = aop;
- ds_put_char (&shortopts, aop->base.short_name);
+ ds_put_byte (&shortopts, aop->base.short_name);
if (aop->base.has_arg != no_argument)
- ds_put_char (&shortopts, ':');
+ ds_put_byte (&shortopts, ':');
if (aop->base.has_arg == optional_argument)
- ds_put_char (&shortopts, ':');
+ ds_put_byte (&shortopts, ':');
}
else
{
retval = false;
break;
}
- else if (c >= LONGOPT_VAL_BASE && c < LONGOPT_VAL_BASE + n_longopts)
+ else if (c >= LONGOPT_VAL_BASE && c < LONGOPT_VAL_BASE + n_longopts + 1)
{
struct argv_option_plus *aop = &ap->options[c - LONGOPT_VAL_BASE];
aop->cb (aop->base.id, aop->aux);