changeset 1737:764ed5c12589

Move -f flag of /module command after a subcommand
author Myhailo Danylenko <isbear@ukrpost.net>
date Sat, 06 Mar 2010 21:04:31 +0200
parents 15e1f3957786
children bafcb83fd585
files mcabber/mcabber/commands.c
diffstat 1 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/mcabber/commands.c	Sat Mar 06 19:21:05 2010 +0100
+++ b/mcabber/mcabber/commands.c	Sat Mar 06 21:04:31 2010 +0200
@@ -2959,22 +2959,24 @@
   gboolean force = FALSE;
   char **args;
 
-  if (arg[0] == '-' && arg[1] == 'f') {
-    force = TRUE;
-    arg +=2;
-    while (*arg && *arg == ' ')
-      ++arg;
-  }
-  
   args = split_arg(arg, 2, 0);
   if (!args[0] || !strcmp(args[0], "list")) {
     module_list_print();
   } else {
     const gchar *error;
+    const gchar *name = args[1];
+
+    if (name && name[0] == '-' && name[1] == 'f') {
+      force = TRUE;
+      name +=2;
+      while (*name && *name == ' ')
+        ++name;
+    }
+
     if (!strcmp(args[0], "load"))
-      error = module_load(args[1], TRUE, force);
+      error = module_load(name, TRUE, force);
     else if (!strcmp(args[0], "unload"))
-      error = module_unload(args[1], TRUE, force);
+      error = module_unload(name, TRUE, force);
     else
       error = "Unknown subcommand";
     if (error)