aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-12-28 11:45:46 +0000
committerBadlop <badlop@process-one.net>2009-12-28 11:45:46 +0000
commit34d5d08501c87e0c3679ce4bd81b106e33f13ddd (patch)
tree7f4381df91b56d529b9f70238cb4f824d0c56f06
parentAdd explanation about global Access precendence over vhost Access (EJAB-803) (diff)
Support for arguments in ejabberdctl that are empty strings.
SVN Revision: 2827
-rw-r--r--src/ejabberd_ctl.erl19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl
index 13d03be3a..18ca7a725 100644
--- a/src/ejabberd_ctl.erl
+++ b/src/ejabberd_ctl.erl
@@ -318,18 +318,19 @@ format_args(Args, ArgsFormat) ->
[],
lists:zip(ArgsFormat, Args)).
-format_arg(Arg, Format) ->
- Parse = case Format of
- integer ->
- "~d";
- string ->
- NumChars = integer_to_list(string:len(Arg)),
- "~" ++ NumChars ++ "c"
- end,
+format_arg(Arg, integer) ->
+ format_arg2(Arg, "~d");
+format_arg("", string) ->
+ "";
+format_arg(Arg, string) ->
+ NumChars = integer_to_list(string:len(Arg)),
+ Parse = "~" ++ NumChars ++ "c",
+ format_arg2(Arg, Parse).
+
+format_arg2(Arg, Parse)->
{ok, [Arg2], _RemainingArguments} = io_lib:fread(Parse, Arg),
Arg2.
-
%%-----------------------------
%% Format result
%%-----------------------------