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

Fix some strcpy compiler warnings

Browse Source 
Replace three strcpy commands with strncpy,
bump minor version ready for more testing.
This commit is contained in:
PartialVolume
2024-02-17 17:00:37 +00:00
parent 2fae6ea5f5
commit 07a7c0ab0c
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([nwipe],[0.35],[git@brumit.nl]) AC_INIT([nwipe],[0.35.9],[git@brumit.nl])
AM_INIT_AUTOMAKE(foreign subdir-objects) AM_INIT_AUTOMAKE(foreign subdir-objects)
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
AC_OUTPUT AC_OUTPUT

2
man/nwipe.1
View File

@@ -1,4 +1,4 @@
.TH NWIPE "24" "October 2023" "nwipe version 0.35" "User Commands" .TH NWIPE "16" "February 2024" "nwipe version 0.35.9" "User Commands"
.SH NAME .SH NAME
nwipe \- securely erase disks nwipe \- securely erase disks
.SH SYNOPSIS .SH SYNOPSIS

9
src/device.c
View File

@@ -283,7 +283,7 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
/* If the serial number hasn't already been populated */ /* If the serial number hasn't already been populated */
if( next_device->device_serial_no[0] == 0 ) if( next_device->device_serial_no[0] == 0 )
{ {
strcpy( next_device->device_serial_no, tmp_serial ); strncpy( next_device->device_serial_no, tmp_serial, NWIPE_SERIALNUMBER_LENGTH );
} }
} }
@@ -292,13 +292,16 @@ int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount )
{ {
if( next_device->device_serial_no[0] == 0 ) if( next_device->device_serial_no[0] == 0 )
{ {
strcpy( next_device->device_serial_no, "???????????????" ); strncpy( next_device->device_serial_no, "????????????????????", NWIPE_SERIALNUMBER_LENGTH + 1 );
} }
else else
{ {
strcpy( next_device->device_serial_no, "XXXXXXXXXXXXXXX" ); strncpy( next_device->device_serial_no, "XXXXXXXXXXXXXXXXXXXX", NWIPE_SERIALNUMBER_LENGTH + 1 );
} }
} }
/* strncpy would have copied the null terminator BUT just to be sure, just in case somebody changes the length
* of those strings we should explicitly terminate the string */
next_device->device_serial_no[NWIPE_SERIALNUMBER_LENGTH] = 0;
/* Initialise the variables that toggle the [size][temp c] with [HPA status] /* Initialise the variables that toggle the [size][temp c] with [HPA status]
* Not currently used, but may be used in the future or for other purposes * Not currently used, but may be used in the future or for other purposes

6
src/version.c
View File

@@ -4,14 +4,14 @@
* used by configure to dynamically assign those values * used by configure to dynamically assign those values
* to documentation files. * to documentation files.
*/ */
const char* version_string = "0.35.8"; const char* version_string = "0.35.9";
const char* program_name = "nwipe"; const char* program_name = "nwipe";
const char* author_name = "Martijn van Brummelen"; const char* author_name = "Martijn van Brummelen";
const char* email_address = "git@brumit.nl"; const char* email_address = "git@brumit.nl";
const char* years = "2023"; const char* years = "2024";
const char* copyright = "Copyright Darik Horn <dajhorn-dban@vanadac.com>\n\ const char* copyright = "Copyright Darik Horn <dajhorn-dban@vanadac.com>\n\
Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
This is free software; see the source for copying conditions.\n\ This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE.\n"; FOR A PARTICULAR PURPOSE.\n";
const char* banner = "nwipe 0.35.8"; const char* banner = "nwipe 0.35.9";