X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=8ec57feca4ca6b41a2bbf19dae6364cb6d8fe9cd;hp=dae21e6d037dda6d920bd4b0ed7e9094cef777f4;hb=8769ef42c84de55cea4cd6820802e8b8f53393c8;hpb=dda5531a160fe43b35c8da5f6a149e4f9c561877

diff --git a/command.c b/command.c
index dae21e6d..8ec57fec 100644
--- a/command.c
+++ b/command.c
@@ -119,7 +119,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		"%s:%s\n"	"%s:%s\n"	"%s:%s\n"	"%s:%u\n"
 		"%s:%li\n" 	"%s:%s\n"	"%s:%s\n" "%s"
 		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n" "%s:%s\n"
-		"%s:%s\n"	"%s:%u\n",
+		"%s:%s\n"	"%s:%u\n"	"%s\n",
 		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
 		status_item_list[SI_MTIME], mtime,
 		status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
@@ -147,7 +147,8 @@ static char *get_status(struct misc_meta_data *nmmd)
 		status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
 
 		status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
-		status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
+		status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id,
+		nmmd->afd.afs_status_info
 
 	);
 	free(basename);
@@ -376,13 +377,16 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
 	for (cmd = server_cmds; cmd->name; cmd++)
 		if (!strcmp(cmd->name, name)) {
 			if (handler)
-				*handler = para_strdup("para_server"); /* server commands */
+				*handler = para_strdup("server"); /* server commands */
 			return cmd;
 		}
 	/* not found, look for commands supported by afs */
 	for (cmd = afs_cmds; cmd->name; cmd++)
-		if (!strcmp(cmd->name, name))
+		if (!strcmp(cmd->name, name)) {
+			if (handler)
+				*handler = para_strdup("afs");
 			return cmd;
+		}
 	return NULL;
 }
 
@@ -599,17 +603,12 @@ static struct server_command *parse_cmd(const char *cmdstr)
 	return get_cmd_ptr(buf, NULL);
 }
 
-static long int para_rand(long unsigned max)
-{
-	return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
-}
-
 static void init_rc4_keys(void)
 {
 	int i;
 
 	for (i = 0; i < 2 * RC4_KEY_LEN; i++)
-		rc4_buf[i] = para_rand(256);
+		rc4_buf[i] = para_random(256);
 	PARA_DEBUG_LOG("rc4 keys initialized (%u:%u)\n",
 		(unsigned char) rc4_buf[0],
 		(unsigned char) rc4_buf[RC4_KEY_LEN]);