Rename afs_ls and afs_rm to ls and rm.

diff --git a/afs.cmd b/afs.cmd
index 92f2e56a6703aa57fc874a94de32c7d4611937a8..efebdc8bfd33ea1dd7d029df83db36b7f94ba18b 100644 (file)
--- a/afs.cmd
+++ b/afs.cmd
@@ -38,7 +38,7 @@ U: init [table_name ...]
 H: When invoked without arguments, this command creates all tables. Otherwise
 H: only the tables given by table_name... are created.
 ---
 H: When invoked without arguments, this command creates all tables. Otherwise
 H: only the tables given by table_name... are created.
 ---

-N: afs_ls
+N: ls

 P: AFS_READ
 D: List audio files.
 U: ls [-l[s|l|v|m]] -p -a -r -s{p|s|l|n|f|c|i|y|b|d|a} [pattern...]
 P: AFS_READ
 D: List audio files.
 U: ls [-l[s|l|v|m]] -p -a -r -s{p|s|l|n|f|c|i|y|b|d|a} [pattern...]


@@ -158,7 +158,7 @@ U: rmatt pattern...
 H: Remove all attributes matching any given pattern. All information
 H: about this attribute in the audio file table is lost.
 ---
 H: Remove all attributes matching any given pattern. All information
 H: about this attribute in the audio file table is lost.
 ---

-N: afs_rm
+N: rm

 P: AFS_READ | AFS_WRITE
 D: Remove entries from the audio file table.
 U: rm [-v] [-f] [-p] pattern...
 P: AFS_READ | AFS_WRITE
 D: Remove entries from the audio file table.
 U: rm [-v] [-f] [-p] pattern...

diff --git a/aft.c b/aft.c
index b09745541438d37bfb2a2082256a154334be69a1..ed9d2584c4953b5322fabdf25adb01cfd379cba0 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1232,7 +1232,7 @@ out:
  * full list: list everything, including afsi, afhi, atts as clear text
  *
  * */
  * full list: list everything, including afsi, afhi, atts as clear text
  *
  * */

-int com_afs_ls(int fd, int argc, char * const * const argv)
+int com_ls(int fd, int argc, char * const * const argv)

 {
        int i, ret;
        unsigned flags = 0;
 {
        int i, ret;
        unsigned flags = 0;


@@ -2012,7 +2012,7 @@ static int com_rm_callback(const struct osl_object *query,
 }
 
 /* TODO options: -r (recursive) */
 }
 
 /* TODO options: -r (recursive) */

-int com_afs_rm(int fd, int argc,  char * const * const argv)
+int com_rm(int fd, int argc,  char * const * const argv)

 {
        uint32_t flags = 0;
        struct osl_object query = {.data = &flags, .size = sizeof(flags)},
 {
        uint32_t flags = 0;
        struct osl_object query = {.data = &flags, .size = sizeof(flags)},