From fcd35ea9105d15123887c1da51007096dc3b1df6 Mon Sep 17 00:00:00 2001
From: PartialVolume <nick.craig.law@gmail.com>
Date: Wed, 8 Apr 2020 17:05:06 +0100
Subject: [PATCH] Remove redundant ATA prefix from the model number.

We already determine the bus type,
ATA, USB, NVME, VIRT (loop) etc
and display the bus type on the GUI.
libparted prefixes the model number
with ATA which we don't need, especially
as we try to keep the drive display length
to a maximum of 80 characters.
---
 src/device.c | 19 +++++++++++++++++++
 src/device.h |  1 +
 2 files changed, 20 insertions(+)

diff --git a/src/device.c b/src/device.c
index d9f6e04..b38c9e0 100644
--- a/src/device.c
+++ b/src/device.c
@@ -206,6 +206,7 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
 
     /* Get device information */
     next_device->device_model = dev->model;
+    remove_ATA_prefix( next_device->device_model );
     next_device->device_name = dev->path;
     next_device->device_size = dev->length * dev->sector_size;
     Determine_C_B_nomenclature( next_device->device_size, next_device->device_size_txt, NWIPE_DEVICE_SIZE_TXT_LENGTH );
@@ -683,3 +684,21 @@ void strip_CR_LF( char* str )
         idx++;
     }
 }
+
+void remove_ATA_prefix( char* str )
+{
+    /* Remove "ATA " prefix if present in the model no. string, left justifing string */
+
+    int idx_pre = 4;
+    int idx_post = 0;
+
+    if( !strncmp( str, "ATA ", 4 ) )
+    {
+        while( str[idx_pre] != 0 )
+        {
+            str[idx_post++] = str[idx_pre++];
+        }
+
+        str[idx_post] = 0;
+    }
+}
diff --git a/src/device.h b/src/device.h
index 07b09ba..e6b6d4f 100644
--- a/src/device.h
+++ b/src/device.h
@@ -29,5 +29,6 @@ int nwipe_device_get( nwipe_context_t*** c, char** devnamelist, int ndevnames );
 int nwipe_get_device_bus_type_and_serialno( char*, nwipe_device_t*, char* );
 void strip_CR_LF( char* );
 void determine_disk_capacity_nomenclature( u64, char* );
+void remove_ATA_prefix( char* );
 
 #endif /* DEVICE_H_ */