snprintf; drahn ok

5 files changed, 27 insertions, 27 deletions

diff --git a/sbin/pdisk/ATA_media.c b/sbin/pdisk/ATA_media.c
index 5af7ef7ff92..b26ed889cd2 100644
--- a/sbin/pdisk/ATA_media.c
+++ b/sbin/pdisk/ATA_media.c
@@ -1072,6 +1072,7 @@ step_ata_iterator(MEDIA_ITERATOR m)
 {
     ATA_MEDIA_ITERATOR a;
     char *result;
+    size_t len = 20;
 
     a = (ATA_MEDIA_ITERATOR) m;
     if (a == 0) {
@@ -1100,9 +1101,9 @@ step_ata_iterator(MEDIA_ITERATOR m)
 		    continue;   /* try again */
 		}
 		/* generate result */
-		result = (char *) malloc(20);
+		result = (char *) malloc(len);
 		if (result != NULL) {
-		    sprintf(result, "/dev/ata%c.%c", '0'+a->bus, '0'+a->id);
+		    snprintf(result, len, "/dev/ata%c.%c", '0'+a->bus, '0'+a->id);
 		}
 
 		a->id += 1; /* next id */
@@ -1146,13 +1147,14 @@ char *
 mklinux_ata_name(long bus, long id)
 {
     char *result;
+    size_t len = 20;
 
-    result = (char *) malloc(20);
+    result = (char *) malloc(len);
     if (result != NULL) {
     	/* name is hda, hdb, hdc, hdd, ...
     	 * in order (0,0)  (0,1)  (1,0)  (1,1) ...
     	 */
-	sprintf(result, "/dev/hd%c", 'a' + (bus*2 + id));
+	snprintf(result, len, "/dev/hd%c", 'a' + (bus*2 + id));
     }
     return result;
 }
diff --git a/sbin/pdisk/SCSI_media.c b/sbin/pdisk/SCSI_media.c
index cbf7b54797d..61042437b82 100644
--- a/sbin/pdisk/SCSI_media.c
+++ b/sbin/pdisk/SCSI_media.c
@@ -26,9 +26,7 @@
  */
 
 
-// for printf() & sprintf()
 #include <stdio.h>
-// for malloc() & free()
 #include <stdlib.h>
 #include "DoSCSICommand.h"
 #include "SCSI_media.h"
@@ -774,6 +772,7 @@ step_scsi_iterator(MEDIA_ITERATOR m)
 {
     SCSI_MEDIA_ITERATOR a;
     char *result;
+    size_t len = 20;
 
     a = (SCSI_MEDIA_ITERATOR) m;
     if (a == 0) {
@@ -809,13 +808,13 @@ step_scsi_iterator(MEDIA_ITERATOR m)
 		    continue;   /* try again */
 		}
 		/* generate result */
-		result = (char *) malloc(20);
+		result = (char *) malloc(len);
 		if (result != NULL) {
 		    if (a->bus == 0xFF) {
-			sprintf(result, "/dev/scsi%c", '0'+a->id);
+			snprintf(result, len, "/dev/scsi%c", '0'+a->id);
 			probe_scsi_device(a->bus, a->id, 1);
 		    } else {
-			sprintf(result, "/dev/scsi%c.%c", '0'+a->bus, '0'+a->id);
+			snprintf(result, len, "/dev/scsi%c.%c", '0'+a->bus, '0'+a->id);
 			/* only probe out of iterate; so always added in order. */
 			probe_scsi_device(a->bus, a->id, 0);
 		    }
@@ -878,12 +877,13 @@ mklinux_scsi_name(long bus, long id)
     int is_cdrom;
     int unsure;
     char *suffix;
+    size_t len = 20;
 
     /* name is sda, sdb, sdc, ...
      * in order by buses and ids, but only count responding devices ...
      */
     if ((value = lookup_scsi_device(bus, id, &is_cdrom, &unsure)) >= 0) {
-	result = (char *) malloc(20);
+	result = (char *) malloc(len);
 	if (result != NULL) {
 	    if (unsure) {
 		suffix = " ?";
@@ -891,9 +891,9 @@ mklinux_scsi_name(long bus, long id)
 		suffix = "";
 	    }
 	    if (is_cdrom) {
-		sprintf(result, "/dev/scd%c%s", '0' + value, suffix);
+		snprintf(result, len, "/dev/scd%c%s", '0' + value, suffix);
 	    } else {
-		sprintf(result, "/dev/sd%c%s", 'a' + value, suffix);
+		snprintf(result, len, "/dev/sd%c%s", 'a' + value, suffix);
 	    }
 	}
     }
diff --git a/sbin/pdisk/file_media.c b/sbin/pdisk/file_media.c
index d5dd989b52e..0c235e5a249 100644
--- a/sbin/pdisk/file_media.c
+++ b/sbin/pdisk/file_media.c
@@ -450,6 +450,7 @@ step_file_iterator(MEDIA_ITERATOR m)
     FILE_MEDIA_ITERATOR a;
     char *result;
     struct stat info;
+    size_t len = 20;
 
     a = (FILE_MEDIA_ITERATOR) m;
     if (a == 0) {
@@ -478,7 +479,7 @@ step_file_iterator(MEDIA_ITERATOR m)
 		}
 #endif
 		/* generate result */
-		result = (char *) malloc(20);
+		result = (char *) malloc(len);
 		if (result != NULL) {
 		    /*
 		     * for DR3 we should actually iterate through:
@@ -494,23 +495,23 @@ step_file_iterator(MEDIA_ITERATOR m)
 		    switch (a->style) {
 		    case kSCSI_Disks:
 #ifdef __OpenBSD__
-			sprintf(result, "/dev/sd%dc", (int)a->index);
+			snprintf(result, len, "/dev/sd%dc", (int)a->index);
 #else
-			sprintf(result, "/dev/sd%c", 'a'+(int)a->index);
+			snprintf(result, len, "/dev/sd%c", 'a'+(int)a->index);
 #endif
 			break;
 		    case kATA_Devices:
 #ifdef __OpenBSD__
-			sprintf(result, "/dev/wd%dc", (int)a->index);
+			snprintf(result, len, "/dev/wd%dc", (int)a->index);
 #else
-			sprintf(result, "/dev/hd%c", 'a'+(int)a->index);
+			snprintf(result, len, "/dev/hd%c", 'a'+(int)a->index);
 #endif
 			break;
 		    case kSCSI_CDs:
 #ifdef __OpenBSD__
-			sprintf(result, "/dev/cd%dc", (int)a->index);
+			snprintf(result, len, "/dev/cd%dc", (int)a->index);
 #else
-			sprintf(result, "/dev/scd%c", '0'+(int)a->index);
+			snprintf(result, len, "/dev/scd%c", '0'+(int)a->index);
 #endif
 			break;
 		    }
diff --git a/sbin/pdisk/pdisk.c b/sbin/pdisk/pdisk.c
index d3fe0c88b05..ce373b30fc3 100644
--- a/sbin/pdisk/pdisk.c
+++ b/sbin/pdisk/pdisk.c
@@ -1037,8 +1037,7 @@ do_display_block(partition_map_header *map, char *alt_name)
 		return;
 	    }
 	} else {
-	    name = malloc(strlen(alt_name)+1);
-	    strcpy(name, alt_name);
+	    name = strdup(alt_name);
 	}
 	m = open_pathname_as_media(name, O_RDONLY);
 	if (m == 0) {
diff --git a/sbin/pdisk/util.c b/sbin/pdisk/util.c
index c555a510789..120de895bc8 100644
--- a/sbin/pdisk/util.c
+++ b/sbin/pdisk/util.c
@@ -26,9 +26,7 @@
  */
 
 
-// for sprintf()
 #include <stdio.h>
-// for tolower()
 #include <ctype.h>
 
 #include "version.h"
@@ -145,18 +143,18 @@ get_version_string(void)
 
     if (kVersionBugFix != 0) {
 	if (kVersionStage == final) {
-	    sprintf(dynamic_version, "%d.%d.%d",
+	    snprintf(dynamic_version, sizeof dynamic_version, "%d.%d.%d",
 		    kVersionMajor, kVersionMinor, kVersionBugFix);
 	} else {
-	    sprintf(dynamic_version, "%d.%d.%d%c%d",
+	    snprintf(dynamic_version, sizeof dynamic_version, "%d.%d.%d%c%d",
 		    kVersionMajor, kVersionMinor, kVersionBugFix, stage, kVersionDelta);
 	}
     } else {
 	if (kVersionStage == final) {
-	    sprintf(dynamic_version, "%d.%d",
+	    snprintf(dynamic_version, sizeof dynamic_version, "%d.%d",
 		    kVersionMajor, kVersionMinor);
 	} else {
-	    sprintf(dynamic_version, "%d.%d%c%d",
+	    snprintf(dynamic_version, sizeof dynamic_version, "%d.%d%c%d",
 		    kVersionMajor, kVersionMinor, stage, kVersionDelta);
 	}
     }