projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPar two samples dialog and T-Test paired dialogs: Converted to PsppireDialogAction
[pspp]
/
src
/
libpspp
/
argv-parser.c
diff --git
a/src/libpspp/argv-parser.c
b/src/libpspp/argv-parser.c
index ecf1ab23c74264ba4331ba413e5b14edd4836125..97ec02834a43d02baf4598c9b5c05d8832960c8b 100644
(file)
--- a/
src/libpspp/argv-parser.c
+++ b/
src/libpspp/argv-parser.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-16,14
+16,14
@@
#include <config.h>
#include <config.h>
-#include
<libpspp/argv-parser.h>
+#include
"libpspp/argv-parser.h"
#include <limits.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
{
struct argv_option_plus
{
@@
-128,11
+128,11
@@
argv_parser_run (struct argv_parser *ap, int argc, char **argv)
if (shortopt_ptrs[c] == NULL)
{
shortopt_ptrs[c] = aop;
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)
if (aop->base.has_arg != no_argument)
- ds_put_
char
(&shortopts, ':');
+ ds_put_
byte
(&shortopts, ':');
if (aop->base.has_arg == optional_argument)
if (aop->base.has_arg == optional_argument)
- ds_put_
char
(&shortopts, ':');
+ ds_put_
byte
(&shortopts, ':');
}
else
{
}
else
{
@@
-162,7
+162,7
@@
argv_parser_run (struct argv_parser *ap, int argc, char **argv)
retval = false;
break;
}
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);
{
struct argv_option_plus *aop = &ap->options[c - LONGOPT_VAL_BASE];
aop->cb (aop->base.id, aop->aux);