/*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
static int icom_set(char *line)
{
- int ret;
struct select_cmdline_parser_params params = {
.override = 1,
.initialize = 0,
fi = NULL;
free(admissible_uids);
admissible_uids = NULL;
- ret = parse_select_options(line, ¶ms, &admissible_uids, &fi);
- if (ret >= 0)
- return ret;
- return icom_reset(NULL);
+ return parse_select_options(line, ¶ms, &admissible_uids, &fi);
}
+/**
+ * Wrapper for isspace.
+ * NetBSD needs this.
+ */
+/*
+ * The values should be cast to an unsigned char first, then to int.
+ * Why? Because the isdigit (as do all other is/to functions/macros)
+ * expect a number from 0 upto and including 255 as their (int) argument.
+ * Because char is signed on most systems, casting it to int immediately
+ * gives the functions an argument between -128 and 127 (inclusive),
+ * which they will use as an array index, and which will thus fail
+ * horribly for characters which have their most significant bit set.
+ */
+#define adu_isspace(c) isspace((int)(unsigned char)(c))
+
static int exec_interactive_command(char *line)
{
- const char const *delim = "\t\n\f\r\v ";
+ const char *delim = "\t\n\f\r\v ";
int i;
char *cmd, *args;
int ret = -E_SYNTAX;
return 1;
len = strlen(line);
- while (len && isspace(line[len - 1])) {
+ while (len && adu_isspace(line[len - 1])) {
line[len - 1] = '\0';
len--;
}
int com_interactive(void)
{
char line[255];
- int ret = 1;
+ int ret;
select_cmdline_parser_init(&select_conf);
ret = parse_select_options(NULL, NULL, &admissible_uids, &fi);