Merged revisions 56008 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 22 Feb 2007 00:38:46 +0000 (00:38 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 22 Feb 2007 00:38:46 +0000 (00:38 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56008 | file | 2007-02-21 19:35:55 -0500 (Wed, 21 Feb 2007) | 2 lines

Print out deprecation notice on usage output of CLI commands. (issue #8925 reported by blitzrage)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56009 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/cli.c

index a44a333..74bcfd8 100644 (file)
@@ -1729,8 +1729,11 @@ int ast_cli_command(int fd, const char *s)
        switch (res) {
        case RESULT_SHOWUSAGE:
                ast_cli(fd, "%s", S_OR(e->usage, "Invalid usage, but no usage information available.\n"));
+               AST_LIST_LOCK(&helpers);
+               if (e->deprecated)
+                       ast_cli(fd, "The '%s' command is deprecated and will be removed in a future release. Please use '%s' instead.\n", e->_full_cmd, e->_deprecated_by);
+               AST_LIST_UNLOCK(&helpers);
                break;
-
        case RESULT_FAILURE:
                ast_cli(fd, "Command '%s' failed.\n", s);
                /* FALLTHROUGH */