Narcissus/nwipe
2
0
Fork 0
mirror of https://github.com/martijnvanbrummelen/nwipe.git synced 2026-02-20 13:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from PartialVolume/fix_endian_model_name

Browse Source 
fix_endian_model_name
This commit is contained in:
PartialVolume
2023-10-02 22:48:45 +01:00
committed by GitHub
parent 948368bc28 59d73107f6
commit c6ff341f7e
4 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/device.c
View File

@@ -200,6 +200,9 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
next_device->device_model = dev->model;
remove_ATA_prefix( next_device->device_model );
/* Some USB adapters have drive model endian swapped, pattern match and fix */
fix_endian_model_names( next_device->device_model );
/* full device name, i.e. /dev/sda */
next_device->device_name = dev->path;

47
src/miscellaneous.c
View File

@@ -617,3 +617,50 @@ int write_system_datetime( char* year, char* month, char* day, char* hours, char
return 0;
}
void fix_endian_model_names( char* model )
{
/* Some IDE USB adapters get the endian wrong, we can't determine the endian from the drive
* as the drive standard doesn't provide that information, so we have to resort to matching
* the model name against known strings with the endian incorrect, then reverse the endian.
*/
int idx = 0;
int idx2 = 0;
unsigned int length = 0;
char* tmp_string;
length = strlen( model );
tmp_string = calloc( length, 1 );
/* "ASSMNU G" = "SAMSUNG ", tested against model Samsung HM160HC so that
* "ASSMNU G MH61H0 C" becomes "SAMSUNG HM160HC ")
*/
if( !( strncmp( model, "ASSMNU G", 8 ) ) )
{
while( model[idx] != 0 )
{
tmp_string[idx2 + 1] = model[idx];
if( model[idx + 1] != 0 )
{
tmp_string[idx2] = model[idx + 1];
}
else
{
break;
}
if( tmp_string[idx2 + 1] == ' ' && model[idx + 2] == ' ' )
{
idx++;
}
idx += 2;
idx2 += 2;
}
tmp_string[idx2 + 1] = 0;
strcpy( model, tmp_string );
}
}

9
src/miscellaneous.h
View File

@@ -120,4 +120,13 @@ int read_system_datetime( char*, char*, char*, char*, char*, char* );
*/
int write_system_datetime( char*, char*, char*, char*, char*, char* );
/**
* Fixes drive model names that have the incorrect endian. This happens
* with some IDE USB adapters.
*
* @param char* pointer to the drive model names
* @return void
*/
void fix_endian_model_names( char* model );
#endif /* HPA_DCO_H_ */

4
src/version.c
View File

@@ -4,7 +4,7 @@
* used by configure to dynamically assign those values
* to documentation files.
*/
const char* version_string = "0.34.91 Development code, not for production use!";
const char* version_string = "0.34.92";
const char* program_name = "nwipe";
const char* author_name = "Martijn van Brummelen";
const char* email_address = "git@brumit.nl";
@@ -14,4 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE.\n";
const char* banner = "nwipe 0.34.91 Development code, not for production use!";
const char* banner = "nwipe 0.34.92";