X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=f1a0bd186e262d2443f4e34c171335b49f928a64;hb=e63886e85c55c99e9732e5715b7ce641eff09914;hp=57d3917e68c2cd5f5a91de5a668d116e5ac9faed;hpb=e1a71def2832a108ed081b4ad8981cc94e8a1412;p=paraslash.git diff --git a/command.c b/command.c index 57d3917e..f1a0bd18 100644 --- a/command.c +++ b/command.c @@ -97,7 +97,7 @@ static char *vss_get_status_flags(unsigned int flags) static char *get_status(struct misc_meta_data *nmmd) { - char *basename, *ret, mtime[30] = ""; + char *basename, *dirname, *ret, mtime[30] = ""; char *status, *flags; /* vss status info */ char *ut = uptime_str(); long offset = (nmmd->offset + 500) / 1000; @@ -110,12 +110,14 @@ static char *get_status(struct misc_meta_data *nmmd) 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); 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:%s\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:%lu.%lu\n" "%s:%lu.%lu\n" "%s:%s\n" + "%s:%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, @@ -138,10 +140,13 @@ 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_ATTRIBUTES], mmd->afd.attributes_string, + + status_item_list[SI_DIRECTORY], dirname ); free(basename); + free(dirname); free(flags); free(status); free(ut);