From e00ab993a290ece6a47ea5578881d05b702f24af Mon Sep 17 00:00:00 2001 From: dale Date: Fri, 23 Jun 2023 13:22:41 -0500 Subject: [PATCH] Fixed stray comma in JSON output when selecting a device other than the first. --- src/terminal.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/terminal.c b/src/terminal.c index 5519eb060..1f7e58538 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -1899,14 +1899,18 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx) printf (" \"rejected\": %" PRIu64 ",", hashcat_status->progress_rejected); printf (" \"devices\": ["); - for (int device_id = 0; device_id < hashcat_status->device_info_cnt; device_id++) + for (int device_id = 0, first_dev = 1; device_id < hashcat_status->device_info_cnt; device_id++) { const device_info_t *device_info = hashcat_status->device_info_buf + device_id; if (device_info->skipped_dev == true) continue; if (device_info->skipped_warning_dev == true) continue; - if (device_id != 0) + if (first_dev) + { + first_dev = 0; + } + else { printf (","); }