X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=6c895e3b9282ededaaa1a25ff988859c27605ca7;hb=c542546683d922f088e9a9c2ae399834e9b0bb12;hp=3fe6e5db008a6d2cfdc767cbd8e04321ea739391;hpb=c975bf720b79dc05e4990d812ce45547dcc39c96;p=paraslash.git

diff --git a/command.c b/command.c
index 3fe6e5db..6c895e3b 100644
--- a/command.c
+++ b/command.c
@@ -44,7 +44,7 @@ static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
-extern struct dbtool dblist[];
+extern struct audio_file_selector dblist[];
 extern struct audio_format afl[];
 extern struct sender senders[];
 extern char *user_list;
@@ -63,7 +63,7 @@ static int com_stop(int, int, char **);
 static int com_pause(int, int, char **);
 static int com_next(int, int, char **);
 static int com_nomore(int, int, char **);
-static int com_cdt(int, int, char **);
+static int com_chs(int, int, char **);
 static int com_ff(int, int, char **);
 static int com_jmp(int, int, char **);
 static int com_sender(int, int, char **);
@@ -72,14 +72,14 @@ static int com_sender(int, int, char **);
 /* commands that are handled by the server itself */
 static struct server_command cmd_struct[] = {
 {
-.name = "cdt",
-.handler = com_cdt,
+.name = "chs",
+.handler = com_chs,
 .perms = DB_READ | DB_WRITE,
-.description = "change database tool",
-.synopsis = "cdt [name_of_new_dbtool]",
+.description = "change the current audio file selector",
+.synopsis = "chs [new_selector]",
 .help =
-"Deactivate current dbtool and activate name_of_new_dbtool. If no\n"
-"argument was given, print the current database tool.\n"
+"Shutdown the current selector and activate new_selector. If no\n"
+"argument was given, print the name of the current selector.\n"
 },
 
 {
@@ -559,15 +559,15 @@ static int com_si(int fd, int argc, __unused char **argv)
 {
 	int i, ret;
 	char *ut;
-	char *dbtools = NULL, *sender_info = NULL, *sender_list = NULL;
+	char *selectors = NULL, *sender_info = NULL, *sender_list = NULL;
 	struct mallinfo mi = mallinfo();
 
 	if (argc)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	for (i = 0; dblist[i].name; i++) {
-		dbtools = para_strcat(dbtools, dblist[i].name);
-		dbtools = para_strcat(dbtools, " ");
+		selectors = para_strcat(selectors, dblist[i].name);
+		selectors = para_strcat(selectors, " ");
 	}
 	for (i = 0; senders[i].name; i++) {
 		char *info = senders[i].info();
@@ -593,14 +593,14 @@ static int com_si(int fd, int argc, __unused char **argv)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		dbtools,
+		selectors,
 		SUPPORTED_AUDIO_FORMATS,
 		sender_list,
 		sender_info
 	);
 	mmd_unlock();
 	free(ut);
-	free(dbtools);
+	free(selectors);
 	free(sender_list);
 	free(sender_info);
 	return ret;
@@ -732,7 +732,7 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
 				*handler = para_strdup("para_server"); /* server commands */
 			return cmd;
 		}
-	/* not found, look for dbtool commands */
+	/* not found, look for commands supported by the current selector */
 	mmd_lock();
 	if (handler)
 		*handler = make_message("the %s database tool", dblist[mmd->dbt_num].name);
@@ -848,17 +848,17 @@ static int com_pause(__unused int socket_fd, int argc, __unused char **argv)
 	return 1;
 }
 
-static int com_cdt(int fd, int argc, char **argv)
+static int com_chs(int fd, int argc, char **argv)
 {
 	int i, ret;
 
 	if (!argc) {
-		char *dbtool;
+		char *selector;
 		mmd_lock();
-		dbtool = para_strdup(dblist[mmd->dbt_num].name);
+		selector = para_strdup(dblist[mmd->dbt_num].name);
 		mmd_unlock();
-		ret = send_va_buffer(fd, "%s\n", dbtool);
-		free(dbtool);
+		ret = send_va_buffer(fd, "%s\n", selector);
+		free(selector);
 		return ret;
 	}
 	for (i = 0; dblist[i].name; i++) {