summaryrefslogtreecommitdiff
path: root/src/actions.c
diff options
context:
space:
mode:
authorsabetts <sabetts>2005-02-22 03:04:40 +0000
committersabetts <sabetts>2005-02-22 03:04:40 +0000
commit1bed5ddd3e05299ab30efc48995d7a3cd5471ad3 (patch)
tree792cc9b3f096602fce56d68e90bf45c612a998c6 /src/actions.c
parentbdb189db87bc4a0c58ecd4a2677712bc9a1276e9 (diff)
downloadratpoison-1bed5ddd3e05299ab30efc48995d7a3cd5471ad3.zip
* src/main.c (read_startup_files): use xsprintf when generating
path to ratpoisonrc. * src/input.c (get_more_input): Use HAVE_HISTORY to ifdef out history_reset. * src/actions.c (command): new variable, raw, which records whether to tell parse_args not to parse the last arg. (cmd_set): likewise
Diffstat (limited to 'src/actions.c')
-rw-r--r--src/actions.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/actions.c b/src/actions.c
index e7ec191..0687d5b 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -2305,7 +2305,7 @@ command (int interactive, char *data)
struct cmdarg *acur;
struct list_head *iter, *tmp;
struct list_head head, args;
- int i, nargs = -1;
+ int i, nargs = 0, raw = 0;
INIT_LIST_HEAD (&args);
INIT_LIST_HEAD (&head);
@@ -2316,12 +2316,13 @@ command (int interactive, char *data)
|| uc->args[i].type == arg_SHELLCMD
|| uc->args[i].type == arg_RAW)
{
+ raw = 1;
nargs = i;
break;
}
/* Parse the arguments and call the function. */
- result = parse_args (rest, &head, nargs, uc->args[nargs].type == arg_RAW);
+ result = parse_args (rest, &head, nargs, raw);
if (result)
goto free_lists;
@@ -4740,7 +4741,7 @@ cmd_set (int interactive, struct cmdarg **args)
struct cmdarg *acur;
struct list_head *iter, *tmp;
struct list_head head, arglist;
- int i, nargs = -1;
+ int i, nargs = 0, raw = 0;
int parsed_args;
cmdret *result = NULL;
struct cmdarg **cmdargs;
@@ -4755,6 +4756,7 @@ cmd_set (int interactive, struct cmdarg **args)
|| ARG(0,variable)->args[i].type == arg_SHELLCMD
|| ARG(0,variable)->args[i].type == arg_RAW)
{
+ raw = 1;
nargs = i;
break;
}
@@ -4764,7 +4766,7 @@ cmd_set (int interactive, struct cmdarg **args)
input = xstrdup (args[1]->string);
else
input = xstrdup ("");
- result = parse_args (input, &head, nargs, ARG(0,variable)->args[i].type == arg_RAW);
+ result = parse_args (input, &head, nargs, raw);
free (input);
if (result)