Merge pull request #476 from chme/mpd_check_args

[mpd] Refactoring of minimum argument check

src/mpd.c

@@ -1119,12 +1119,6 @@ mpd_command_consume(struct evbuffer *evbuf, int argc, char **argv, char **errmsg
   int enable;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'consume'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &enable);
   if (ret < 0)
     {
@@ -1148,12 +1142,6 @@ mpd_command_random(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int enable;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'random'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &enable);
   if (ret < 0)
     {
@@ -1177,12 +1165,6 @@ mpd_command_repeat(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int enable;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'repeat'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &enable);
   if (ret < 0)
     {
@@ -1208,12 +1190,6 @@ mpd_command_setvol(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int volume;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'setvol'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &volume);
   if (ret < 0)
     {
@@ -1248,12 +1224,6 @@ mpd_command_single(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   struct player_status status;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'single'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &enable);
   if (ret < 0)
     {
@@ -1298,12 +1268,6 @@ mpd_command_volume(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int volume;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'volume'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atoi32(argv[1], &volume);
   if (ret < 0)
     {
@@ -1551,12 +1515,6 @@ mpd_command_seek(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
   int seek_target_msec;
   int ret;
 
-  if (argc < 3)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'seek'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atou32(argv[1], &songpos);
   if (ret < 0)
     {
@@ -1601,12 +1559,6 @@ mpd_command_seekid(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int seek_target_msec;
   int ret;
 
-  if (argc < 3)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'seekcur'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atou32(argv[1], &id);
   if (ret < 0)
     {
@@ -1654,12 +1606,6 @@ mpd_command_seekcur(struct evbuffer *evbuf, int argc, char **argv, char **errmsg
   int seek_target_msec;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'seekcur'");
-      return ACK_ERROR_ARG;
-    }
-
   seek_target_sec = strtof(argv[1], NULL);
   seek_target_msec = seek_target_sec * 1000;
 
@@ -1752,12 +1698,6 @@ mpd_command_add(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, st
   struct media_file_info mfi;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'add'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = mpd_queue_add(argv[1], false);
 
   if (ret < 0)
@@ -1796,12 +1736,6 @@ mpd_command_addid(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   int to_pos = -1;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'addid'");
-      return ACK_ERROR_ARG;
-    }
-
   if (argc > 2)
     {
       ret = safe_atoi32(argv[2], &to_pos);
@@ -1917,12 +1851,6 @@ mpd_command_deleteid(struct evbuffer *evbuf, int argc, char **argv, char **errms
   uint32_t songid;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'deleteid'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atou32(argv[1], &songid);
   if (ret < 0)
     {
@@ -1950,12 +1878,6 @@ mpd_command_move(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
   uint32_t to_pos;
   int ret;
 
-  if (argc < 3)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'move'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = mpd_pars_range_arg(argv[1], &start_pos, &end_pos);
   if (ret < 0)
     {
@@ -1991,12 +1913,6 @@ mpd_command_moveid(struct evbuffer *evbuf, int argc, char **argv, char **errmsg,
   uint32_t to_pos;
   int ret;
 
-  if (argc < 3)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'moveid'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atou32(argv[1], &songid);
   if (ret < 0)
     {
@@ -2241,12 +2157,6 @@ plchanges_build_queryparams(struct query_params *query_params, int argc, char **
 
   memset(query_params, 0, sizeof(struct query_params));
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'plchanges'");
-      return ACK_ERROR_ARG;
-    }
-
   ret = safe_atou32(argv[1], &version);
   if (ret < 0)
     {
@@ -2371,12 +2281,6 @@ mpd_command_listplaylist(struct evbuffer *evbuf, int argc, char **argv, char **e
   struct db_media_file_info dbmfi;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'listplaylist'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -2440,12 +2344,6 @@ mpd_command_listplaylistinfo(struct evbuffer *evbuf, int argc, char **argv, char
   struct db_media_file_info dbmfi;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'listplaylistinfo'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -2565,12 +2463,6 @@ mpd_command_load(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
   struct player_status status;
   int ret;
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'load'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -2618,12 +2510,6 @@ mpd_command_playlistadd(struct evbuffer *evbuf, int argc, char **argv, char **er
       return ACK_ERROR_PERMISSION;
     }
 
-  if (argc < 3)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'playlistadd'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -2661,12 +2547,6 @@ mpd_command_rm(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, str
       return ACK_ERROR_PERMISSION;
     }
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'rm'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -2701,12 +2581,6 @@ mpd_command_save(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, s
       return ACK_ERROR_PERMISSION;
     }
 
-  if (argc < 2)
-    {
-      *errmsg = safe_asprintf("Missing argument for command 'save'");
-      return ACK_ERROR_ARG;
-    }
-
   if (!default_pl_dir || strstr(argv[1], ":/"))
     {
       // Argument is a virtual path, make sure it starts with a '/'
@@ -3574,7 +3448,9 @@ struct mpd_sticker_command {
   int need_args;
 };
 
-static struct mpd_sticker_command mpd_sticker_handlers[] = {
+static struct mpd_sticker_command mpd_sticker_handlers[] =
+  {
+    /* sticker command    | handler function        | minimum argument count */
     { "get",                mpd_sticker_get,          5 },
     { "set",                mpd_sticker_set,          6 },
     { "delete",             mpd_sticker_delete,       5 },
@@ -3608,12 +3484,6 @@ mpd_command_sticker(struct evbuffer *evbuf, int argc, char **argv, char **errmsg
   int i;
   int ret;
 
-  if (argc < 4)
-    {
-      *errmsg = safe_asprintf("not enough arguments");
-      return ACK_ERROR_ARG;
-    }
-
   if (strcmp(argv[2], "song") != 0)
     {
       *errmsg = safe_asprintf("unknown sticker domain");
@@ -4174,22 +4044,11 @@ struct mpd_channel
 
 static struct mpd_channel mpd_channels[] =
   {
-    {
+    /* channel               | handler function */
-      .channel = "outputvolume",
+    { "outputvolume",          channel_outputvolume },
-      .handler = channel_outputvolume
+    { "pairing",               channel_pairing },
-    },
+    { "verification",          channel_verification },
-    {
+    { NULL, NULL },
-      .channel = "pairing",
-      .handler = channel_pairing
-    },
-    {
-      .channel = "verification",
-      .handler = channel_verification
-    },
-    {
-      .channel = NULL,
-      .handler = NULL
-    },
   };
 
 /*
@@ -4367,480 +4226,139 @@ struct mpd_command
    * @return 0 if successful, one of ack values if an error occured
    */
   int (*handler)(struct evbuffer *evbuf, int argc, char **argv, char **errmsg, struct mpd_client_ctx *ctx);
+  int min_argc;
 };
 
 static struct mpd_command mpd_handlers[] =
   {
-    /*
+    /* commandname                | handler function                      | minimum argument count*/
-     * Commands for querying status
-     */
-    {
-      .mpdcommand = "clearerror",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "currentsong",
-      .handler = mpd_command_currentsong
-    },
-    {
-      .mpdcommand = "idle",
-      .handler = mpd_command_idle
-    },
-    {
-      .mpdcommand = "noidle",
-      .handler = mpd_command_noidle
-    },
-    {
-      .mpdcommand = "status",
-      .handler = mpd_command_status
-    },
-    {
-      .mpdcommand = "stats",
-      .handler = mpd_command_stats
-    },
 
-    /*
+    // Commands for querying status
-     * Playback options
+    { "clearerror",                 mpd_command_ignore,                     -1 },
-     */
+    { "currentsong",                mpd_command_currentsong,                -1 },
-    {
+    { "idle",                       mpd_command_idle,                       -1 },
-      .mpdcommand = "consume",
+    { "noidle",                     mpd_command_noidle,                     -1 },
-      .handler = mpd_command_consume
+    { "status",                     mpd_command_status,                     -1 },
-    },
+    { "stats",                      mpd_command_stats,                      -1 },
-    {
-      .mpdcommand = "crossfade",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "mixrampdb",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "mixrampdelay",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "random",
-      .handler = mpd_command_random
-    },
-    {
-      .mpdcommand = "repeat",
-      .handler = mpd_command_repeat
-    },
-    {
-      .mpdcommand = "setvol",
-      .handler = mpd_command_setvol
-    },
-    {
-      .mpdcommand = "single",
-      .handler = mpd_command_single
-    },
-    {
-      .mpdcommand = "replay_gain_mode",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "replay_gain_status",
-      .handler = mpd_command_replay_gain_status
-    },
-    {
-      .mpdcommand = "volume",
-      .handler = mpd_command_volume
-    },
 
-    /*
+    // Playback options
-     * Controlling playback
+    { "consume",                    mpd_command_consume,                     2 },
-     */
+    { "crossfade",                  mpd_command_ignore,                     -1 },
-    {
+    { "mixrampdb",                  mpd_command_ignore,                     -1 },
-      .mpdcommand = "next",
+    { "mixrampdelay",               mpd_command_ignore,                     -1 },
-      .handler = mpd_command_next
+    { "random",                     mpd_command_random,                      2 },
-    },
+    { "repeat",                     mpd_command_repeat,                      2 },
-    {
+    { "setvol",                     mpd_command_setvol,                      2 },
-      .mpdcommand = "pause",
+    { "single",                     mpd_command_single,                      2 },
-      .handler = mpd_command_pause
+    { "replay_gain_mode",           mpd_command_ignore,                     -1 },
-    },
+    { "replay_gain_status",         mpd_command_replay_gain_status,         -1 },
-    {
+    { "volume",                     mpd_command_volume,                      2 },
-      .mpdcommand = "play",
-      .handler = mpd_command_play
-    },
-    {
-      .mpdcommand = "playid",
-      .handler = mpd_command_playid
-    },
-    {
-      .mpdcommand = "previous",
-      .handler = mpd_command_previous
-    },
-    {
-      .mpdcommand = "seek",
-      .handler = mpd_command_seek
-    },
-    {
-      .mpdcommand = "seekid",
-      .handler = mpd_command_seekid
-    },
-    {
-      .mpdcommand = "seekcur",
-      .handler = mpd_command_seekcur
-    },
-    {
-      .mpdcommand = "stop",
-      .handler = mpd_command_stop
-    },
 
-    /*
+    // Controlling playback
-     * The current playlist
+    { "next",                       mpd_command_next,                       -1 },
-     */
+    { "pause",                      mpd_command_pause,                      -1 },
-    {
+    { "play",                       mpd_command_play,                       -1 },
-      .mpdcommand = "add",
+    { "playid",                     mpd_command_playid,                     -1 },
-      .handler = mpd_command_add
+    { "previous",                   mpd_command_previous,                   -1 },
-    },
+    { "seek",                       mpd_command_seek,                        3 },
-    {
+    { "seekid",                     mpd_command_seekid,                      3 },
-      .mpdcommand = "addid",
+    { "seekcur",                    mpd_command_seekcur,                     2 },
-      .handler = mpd_command_addid
+    { "stop",                       mpd_command_stop,                       -1 },
-    },
-    {
-      .mpdcommand = "clear",
-      .handler = mpd_command_clear
-    },
-    {
-      .mpdcommand = "delete",
-      .handler = mpd_command_delete
-    },
-    {
-      .mpdcommand = "deleteid",
-      .handler = mpd_command_deleteid
-    },
-    {
-      .mpdcommand = "move",
-      .handler = mpd_command_move
-    },
-    {
-      .mpdcommand = "moveid",
-      .handler = mpd_command_moveid
-    },
-    // According to the mpd protocol the use of "playlist" is deprecated
-    {
-      .mpdcommand = "playlist",
-      .handler = mpd_command_playlistinfo
-    },
-    {
-      .mpdcommand = "playlistfind",
-      .handler = mpd_command_playlistfind
-    },
-    {
-      .mpdcommand = "playlistid",
-      .handler = mpd_command_playlistid
-    },
-    {
-      .mpdcommand = "playlistinfo",
-      .handler = mpd_command_playlistinfo
-    },
-    {
-      .mpdcommand = "playlistsearch",
-      .handler = mpd_command_playlistsearch
-    },
-    {
-      .mpdcommand = "plchanges",
-      .handler = mpd_command_plchanges
-    },
-    {
-      .mpdcommand = "plchangesposid",
-      .handler = mpd_command_plchangesposid
-    },
-    /*
-    {
-      .mpdcommand = "prio",
-      .handler = mpd_command_prio
-    },
-    {
-      .mpdcommand = "prioid",
-      .handler = mpd_command_prioid
-    },
-    {
-      .mpdcommand = "rangeid",
-      .handler = mpd_command_rangeid
-    },
-    {
-      .mpdcommand = "shuffle",
-      .handler = mpd_command_shuffle
-    },
-    {
-      .mpdcommand = "swap",
-      .handler = mpd_command_swap
-    },
-    {
-      .mpdcommand = "swapid",
-      .handler = mpd_command_swapid
-    },
-    {
-      .mpdcommand = "addtagid",
-      .handler = mpd_command_addtagid
-    },
-    {
-      .mpdcommand = "cleartagid",
-      .handler = mpd_command_cleartagid
-    },
-     */
 
-    /*
+    // The current playlist
-     * Stored playlists
+    { "add",                        mpd_command_add,                         2 },
-     */
+    { "addid",                      mpd_command_addid,                       2 },
-    {
+    { "clear",                      mpd_command_clear,                      -1 },
-      .mpdcommand = "listplaylist",
+    { "delete",                     mpd_command_delete,                     -1 },
-      .handler = mpd_command_listplaylist
+    { "deleteid",                   mpd_command_deleteid,                    2 },
-    },
+    { "move",                       mpd_command_move,                        3 },
-    {
+    { "moveid",                     mpd_command_moveid,                      3 },
-      .mpdcommand = "listplaylistinfo",
+    { "playlist",                   mpd_command_playlistinfo,               -1 }, // According to the mpd protocol the use of "playlist" is deprecated
-      .handler = mpd_command_listplaylistinfo
+    { "playlistfind",               mpd_command_playlistfind,               -1 },
-    },
+    { "playlistid",                 mpd_command_playlistid,                 -1 },
-    {
+    { "playlistinfo",               mpd_command_playlistinfo,               -1 },
-      .mpdcommand = "listplaylists",
+    { "playlistsearch",             mpd_command_playlistsearch,             -1 },
-      .handler = mpd_command_listplaylists
+    { "plchanges",                  mpd_command_plchanges,                   2 },
-    },
+    { "plchangesposid",             mpd_command_plchangesposid,              2 },
-    {
+//    { "prio",                       mpd_command_prio,                       -1 },
-      .mpdcommand = "load",
+//    { "prioid",                     mpd_command_prioid,                     -1 },
-      .handler = mpd_command_load
+//    { "rangeid",                    mpd_command_rangeid,                    -1 },
-    },
+//    { "shuffle",                    mpd_command_shuffle,                    -1 },
-    {
+//    { "swap",                       mpd_command_swap,                       -1 },
-      .mpdcommand = "playlistadd",
+//    { "swapid",                     mpd_command_swapid,                     -1 },
-      .handler = mpd_command_playlistadd
+//    { "addtagid",                   mpd_command_addtagid,                   -1 },
-    },
+//    { "cleartagid",                 mpd_command_cleartagid,                 -1 },
-    /*
-    {
-      .mpdcommand = "playlistclear",
-      .handler = mpd_command_playlistclear
-    },
-    {
-      .mpdcommand = "playlistdelete",
-      .handler = mpd_command_playlistdelete
-    },
-    {
-      .mpdcommand = "playlistmove",
-      .handler = mpd_command_playlistmove
-    },
-    {
-      .mpdcommand = "rename",
-      .handler = mpd_command_rename
-    },
-     */
-    {
-      .mpdcommand = "rm",
-      .handler = mpd_command_rm
-    },
-    {
-      .mpdcommand = "save",
-      .handler = mpd_command_save
-    },
 
-    /*
+    // Stored playlists
-     * The music database
+    { "listplaylist",               mpd_command_listplaylist,                2 },
-     */
+    { "listplaylistinfo",           mpd_command_listplaylistinfo,            2 },
-    {
+    { "listplaylists",              mpd_command_listplaylists,              -1 },
-      .mpdcommand = "count",
+    { "load",                       mpd_command_load,                        2 },
-      .handler = mpd_command_count
+    { "playlistadd",                mpd_command_playlistadd,                 3 },
-    },
+//    { "playlistclear",              mpd_command_playlistclear,              -1 },
-    {
+//    { "playlistdelete",             mpd_command_playlistdelete,             -1 },
-      .mpdcommand = "find",
+//    { "playlistmove",               mpd_command_playlistmove,               -1 },
-      .handler = mpd_command_find
+//    { "rename",                     mpd_command_rename,                     -1 },
-    },
+    { "rm",                         mpd_command_rm,                          2 },
-    {
+    { "save",                       mpd_command_save,                        2 },
-      .mpdcommand = "findadd",
-      .handler = mpd_command_findadd
-    },
-    {
-      .mpdcommand = "list",
-      .handler = mpd_command_list
-    },
-    {
-      .mpdcommand = "listall",
-      .handler = mpd_command_listall
-    },
-    {
-      .mpdcommand = "listallinfo",
-      .handler = mpd_command_listallinfo
-    },
-    /*
-    {
-      .mpdcommand = "listfiles",
-      .handler = mpd_command_listfiles
-    },
-    */
-    {
-      .mpdcommand = "lsinfo",
-      .handler = mpd_command_lsinfo
-    },
-    /*
-    {
-      .mpdcommand = "readcomments",
-      .handler = mpd_command_readcomments
-    },
-    */
-    {
-      .mpdcommand = "search",
-      .handler = mpd_command_search
-    },
-    {
-      .mpdcommand = "searchadd",
-      .handler = mpd_command_searchadd
-    },
-    /*
-    {
-      .mpdcommand = "searchaddpl",
-      .handler = mpd_command_searchaddpl
-    },
-    */
-    {
-      .mpdcommand = "update",
-      .handler = mpd_command_update
-    },
-    /*
-    {
-      .mpdcommand = "rescan",
-      .handler = mpd_command_rescan
-    },
-    */
 
-    /*
+    // The music database
-     * Mounts and neighbors
+    { "count",                      mpd_command_count,                      -1 },
-     */
+    { "find",                       mpd_command_find,                       -1 },
-    /*
+    { "findadd",                    mpd_command_findadd,                    -1 },
-    {
+    { "list",                       mpd_command_list,                       -1 },
-      .mpdcommand = "mount",
+    { "listall",                    mpd_command_listall,                    -1 },
-      .handler = mpd_command_mount
+    { "listallinfo",                mpd_command_listallinfo,                -1 },
-    },
+//    { "listfiles",                  mpd_command_listfiles,                  -1 },
-    {
+    { "lsinfo",                     mpd_command_lsinfo,                     -1 },
-      .mpdcommand = "unmount",
+//    { "readcomments",               mpd_command_readcomments,               -1 },
-      .handler = mpd_command_unmount
+    { "search",                     mpd_command_search,                     -1 },
-    },
+    { "searchadd",                  mpd_command_searchadd,                  -1 },
-    {
+//    { "searchaddpl",                mpd_command_searchaddpl,                -1 },
-      .mpdcommand = "listmounts",
+    { "update",                     mpd_command_update,                     -1 },
-      .handler = mpd_command_listmounts
+//    { "rescan",                     mpd_command_rescan,                     -1 },
-    },
-    {
-      .mpdcommand = "listneighbors",
-      .handler = mpd_command_listneighbors
-    },
-     */
 
-    /*
+    // Mounts and neighbors
-     * Stickers
+//    { "mount",                      mpd_command_mount,                      -1 },
-     */
+//    { "unmount",                    mpd_command_unmount,                    -1 },
-    {
+//    { "listmounts",                 mpd_command_listmounts,                 -1 },
-      .mpdcommand = "sticker",
+//    { "listneighbors",              mpd_command_listneighbors,              -1 },
-      .handler = mpd_command_sticker
-    },
 
-    /*
+    // Stickers
-     * Connection settings
+    { "sticker",                    mpd_command_sticker,                     4 },
-     */
-    {
-      .mpdcommand = "close",
-      .handler = mpd_command_ignore
-    },
-    /*
-    {
-      .mpdcommand = "kill",
-      .handler = mpd_command_kill
-    },
-     */
-    {
-      .mpdcommand = "password",
-      .handler = mpd_command_password
-    },
-    {
-      .mpdcommand = "ping",
-      .handler = mpd_command_ignore
-    },
 
-    /*
+    // Connection settings
-     * Audio output devices
+    { "close",                      mpd_command_ignore,                     -1 },
-     */
+//    { "kill",                       mpd_command_kill,                       -1 },
-    {
+    { "password",                   mpd_command_password,                   -1 },
-      .mpdcommand = "disableoutput",
+    { "ping",                       mpd_command_ignore,                     -1 },
-      .handler = mpd_command_disableoutput
-    },
-    {
-      .mpdcommand = "enableoutput",
-      .handler = mpd_command_enableoutput
-    },
-    {
-      .mpdcommand = "toggleoutput",
-      .handler = mpd_command_toggleoutput
-    },
-    {
-      .mpdcommand = "outputs",
-      .handler = mpd_command_outputs
-    },
 
-    /*
+    // Audio output devices
-     * Reflection
+    { "disableoutput",              mpd_command_disableoutput,              -1 },
-     */
+    { "enableoutput",               mpd_command_enableoutput,               -1 },
-    /*
+    { "toggleoutput",               mpd_command_toggleoutput,               -1 },
-    {
+    { "outputs",                    mpd_command_outputs,                    -1 },
-      .mpdcommand = "config",
-      .handler = mpd_command_config
-    },
-    */
-    {
-      .mpdcommand = "commands",
-      .handler = mpd_command_commands
-    },
-    {
-      .mpdcommand = "notcommands",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "tagtypes",
-      .handler = mpd_command_tagtypes
-    },
-    {
-      .mpdcommand = "urlhandlers",
-      .handler = mpd_command_urlhandlers
-    },
-    {
-      .mpdcommand = "decoders",
-      .handler = mpd_command_decoders
-    },
 
-    /*
+    // Reflection
-     * Client to client
+//    { "config",                     mpd_command_config,                     -1 },
-     */
+    { "commands",                   mpd_command_commands,                   -1 },
-    {
+    { "notcommands",                mpd_command_ignore,                     -1 },
-      .mpdcommand = "subscribe",
+    { "tagtypes",                   mpd_command_tagtypes,                   -1 },
-      .handler = mpd_command_ignore
+    { "urlhandlers",                mpd_command_urlhandlers,                -1 },
-    },
+    { "decoders",                   mpd_command_decoders,                   -1 },
-    {
-      .mpdcommand = "unsubscribe",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "channels",
-      .handler = mpd_command_channels
-    },
-    {
-      .mpdcommand = "readmessages",
-      .handler = mpd_command_ignore
-    },
-    {
-      .mpdcommand = "sendmessage",
-      .handler = mpd_command_sendmessage
-    },
 
-    /*
+    // Client to client
-     * Forked-daapd commands (not supported by mpd)
+    { "subscribe",                  mpd_command_ignore,                     -1 },
-     */
+    { "unsubscribe",                mpd_command_ignore,                     -1 },
-    {
+    { "channels",                   mpd_command_channels,                   -1 },
-      .mpdcommand = "outputvolume",
+    { "readmessages",               mpd_command_ignore,                     -1 },
-      .handler = mpd_command_outputvolume
+    { "sendmessage",                mpd_command_sendmessage,                -1 },
-    },
 
-    /*
+    // Forked-daapd commands (not supported by mpd)
-     * NULL command to terminate loop
+    { "outputvolume",               mpd_command_outputvolume,               -1 },
-     */
+
-    {
+    // NULL command to terminate loop
-      .mpdcommand = NULL,
+    { NULL, NULL, -1 }
-      .handler = NULL
-    }
   };
 
 /*
@@ -4974,6 +4492,11 @@ mpd_read_cb(struct bufferevent *bev, void *ctx)
 	  errmsg = safe_asprintf("Unsupported command '%s'", argv[0]);
 	  ret = ACK_ERROR_UNKNOWN;
 	}
+      else if (command->min_argc > argc)
+	{
+	  errmsg = safe_asprintf("Missing argument(s) for command '%s', expected %d, given %d", argv[0], command->min_argc, argc);
+	  ret = ACK_ERROR_ARG;
+	}
       else if (strcmp(command->mpdcommand, "password") == 0)
 	{
 	  ret = command->handler(output, argc, argv, &errmsg, client_ctx);