Fix an off-by-one bug.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index e294e87c9cbbe6e9ce1e2358ceb9b10e30035a09..e5e8e6841e86d4b70150aef46c7d7c1e8a04ec72 100644 (file)
--- a/command.c
+++ b/command.c
@@ -118,8 +118,8 @@ static char *get_status(struct misc_meta_data *nmmd)
                "%s:%zu\n"      "%s:%s\n"               "%s:%lu\n"      "%s:%u\n"
                "%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:%lu.%lu\n"  "%s:%lu.%lu\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,
@@ -144,10 +144,10 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_CURRENT_TIME],
                        (long unsigned)now.tv_sec,
                        (long unsigned)now.tv_usec,
-               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 +376,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;
 }