NEWS: Mention para_fsck.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 71b319981efa16f0a2a0a51aeb1e76e0023bd850..dae21e6d037dda6d920bd4b0ed7e9094cef777f4 100644 (file)
--- a/command.c
+++ b/command.c
@@ -104,20 +104,22 @@ static char *get_status(struct misc_meta_data *nmmd)
        struct timeval now;
        struct tm mtime_tm;
 
-       localtime_r(&nmmd->mtime, &mtime_tm);
-       strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
        /* report real status */
        status = vss_status_tohuman(nmmd->vss_status_flags);
        flags = vss_get_status_flags(nmmd->vss_status_flags);
-       basename = para_basename(nmmd->filename);
-       dirname = para_dirname(nmmd->filename);
+       basename = para_basename(nmmd->afd.path);
+       dirname = para_dirname(nmmd->afd.path);
+       if (basename) {
+               localtime_r(&nmmd->mtime, &mtime_tm);
+               strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+       }
        gettimeofday(&now, NULL);
        ret = make_message(
                "%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:%s\n"       "%s:%u\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,
@@ -129,7 +131,9 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,
 
                status_item_list[SI_OFFSET], offset,
-               status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id),
+               status_item_list[SI_FORMAT], basename?
+                       audio_format_name(nmmd->afd.afsi.audio_format_id)
+                       : "",
                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
                nmmd->afd.afhi.info_string,
 
@@ -142,7 +146,8 @@ static char *get_status(struct misc_meta_data *nmmd)
                        (long unsigned)now.tv_usec,
                status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
 
-               status_item_list[SI_DIRECTORY], dirname
+               status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
+               status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
 
        );
        free(basename);