Implement ls --admissible=m/foo.

[paraslash.git] / m4 / lls / server_cmd.suite.m4

diff --git a/m4/lls/server_cmd.suite.m4 b/m4/lls/server_cmd.suite.m4
index 2a39907cee624219d1fb166b07dbf84288f67bb4..1cec68164a13d46fdd96bfcb50c2b0ea160a0585 100644 (file)
--- a/m4/lls/server_cmd.suite.m4
+++ b/m4/lls/server_cmd.suite.m4
@@ -169,6 +169,8 @@ aux_info_prefix = Permissions:
                playlists. Otherwise only the given tables are created.
        [/description]
 
+m4_include(`com_ll.m4')
+
 [subcommand jmp]
        purpose = reposition the current stream
        non-opts-name = n
@@ -231,9 +233,19 @@ aux_info_prefix = Permissions:
        [option admissible]
                short_opt = a
                summary = list only admissible files
+               arg_type = string
+               arg_info = optional_arg
+               typestr = specifier/name
+               default_val = .
                [help]
-                       List only files which are admissible with respect to the current mood
-                       or playlist.
+                       If the optional argument is supplied, it must be of the form "p/foo"
+                       or "m/bar" (which refer to the playlist named "foo" and the mood named
+                       "bar", respectively). The command then restricts its output to the set
+                       of files which are admissible with respect to the thusly identified
+                       mood or playlist.
+
+                       If no argument is given, or if the argument is the special value ".",
+                       the current mood or playlist is assumed.
                [/help]
        [option reverse]
                short_opt = r
@@ -500,15 +512,6 @@ aux_info_prefix = Permissions:
                the vss status flags, effectively stopping playback.
        [/description]
 
-[subcommand tasks]
-       purpose = list active server tasks (deprecated)
-       aux_info = NO_PERMISSION_REQUIRED
-       [description]
-               This used to print the ID, the status and the name of each task,
-               mainly for debugging purposes. As of version 0.6.2, the subcommand
-               prints nothing. It will be removed in 0.7.0. Don't use.
-       [/description]
-
 [subcommand term]
        purpose = ask the server to terminate
        aux_info = VSS_READ | VSS_WRITE