12 files changed, 21 insertions, 27 deletions
diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8
index 7176ffac..6a58f297 100644
--- a/disk-utils/blockdev.8
+++ b/disk-utils/blockdev.8
@@ -80,6 +80,6 @@ Set read-write.
 .SH AUTHOR
 blockdev was written by Andries E. Brouwer and rewritten by Karel Zak.
 .SH AVAILABILITY
-The blockdev command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The blockdev command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
 
diff --git a/disk-utils/elvtune.8 b/disk-utils/elvtune.8
index 91cbae89..10a2e382 100644
--- a/disk-utils/elvtune.8
+++ b/disk-utils/elvtune.8
@@ -61,5 +61,5 @@ Ioctls for tuning elevator behaviour were added in Linux 2.3.99-pre1.
 .SH AUTHORS
 Andrea Arcangeli <andrea@suse.de> SuSE
 .SH AVAILABILITY
-The elvtune command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The elvtune command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8
index cbfc00c1..7b6e262d 100644
--- a/disk-utils/fdformat.8
+++ b/disk-utils/fdformat.8
@@ -58,5 +58,5 @@ after the format.
 .SH AUTHOR
 Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
 .SH AVAILABILITY
-The fdformat command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The fdformat command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/fsck.minix.8 b/disk-utils/fsck.minix.8
index 5aeab5cb..f4bb4d0c 100644
--- a/disk-utils/fsck.minix.8
+++ b/disk-utils/fsck.minix.8
@@ -132,5 +132,5 @@ Langfeldt (janl@math.uio.no)
 .br
 Portability patch by Russell King (rmk@ecs.soton.ac.uk).
 .SH AVAILABILITY
-The fsck.minix command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The fsck.minix command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index 1a78b20f..6a396338 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -111,5 +111,5 @@ for the ext2 file system.
 .BR mkfs.xfs (8),
 .BR mkfs.xiafs (8)
 .SH AVAILABILITY
-The mkfs command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The mkfs command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8
index d120506a..741fca9c 100644
--- a/disk-utils/mkfs.bfs.8
+++ b/disk-utils/mkfs.bfs.8
@@ -44,5 +44,5 @@ is 0 when all went well, and 1 when something went wrong.
 .SH "SEE ALSO"
 .BR mkfs (8).
 .SH AVAILABILITY
-The mkfs.bfs command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The mkfs.bfs command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8
index 0261037f..93591060 100644
--- a/disk-utils/mkfs.minix.8
+++ b/disk-utils/mkfs.minix.8
@@ -76,5 +76,5 @@ Usage or syntax error
 .BR fsck (8),
 .BR reboot (8)
 .SH AVAILABILITY
-The mkfs.minix command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The mkfs.minix command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index 283a933d..00c089d8 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -153,5 +153,5 @@ to create the file is not acceptable).
 .BR fdisk (8),
 .BR swapon (8)
 .SH AVAILABILITY
-The mkswap command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The mkswap command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 93378076..3d14a42e 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -48,7 +48,7 @@
 
 #include "linux_version.h"
 #include "swapheader.h"
-#include "xstrncpy.h"
+#include "strutils.h"
 #include "nls.h"
 #include "blkdev.h"
 #include "pathnames.h"
@@ -175,11 +175,6 @@ init_signature_page(void) {
 }
 
 static void
-deinit_signature_page(void) {
-	free(signature_page);
-}
-
-static void
 write_signature(char *sig) {
 	char *sp = (char *) signature_page;
 
@@ -538,7 +533,6 @@ main(int argc, char ** argv) {
 #endif
 
 	init_signature_page();	/* get pagesize */
-	atexit(deinit_signature_page);
 
 	if (!device_name) {
 		fprintf(stderr,
diff --git a/disk-utils/raw.8 b/disk-utils/raw.8
index 72bb17c9..9b4b9573 100644
--- a/disk-utils/raw.8
+++ b/disk-utils/raw.8
@@ -90,5 +90,5 @@ but is regarded either a bug or a feature depending on who you ask!
 .SH AUTHOR
 Stephen Tweedie (sct@redhat.com)
 .SH AVAILABILITY
-The raw command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The raw command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/disk-utils/swaplabel.8 b/disk-utils/swaplabel.8
index 5c8b9e32..35724671 100644
--- a/disk-utils/swaplabel.8
+++ b/disk-utils/swaplabel.8
@@ -59,7 +59,7 @@ must be in the standard 8-4-4-4-12 character format, such as is ouput by
 was written by Jason Borden <jborden@bluehost.com> and Karel Zak <kzak@redhat.com>.
 .SH AVAILABILITY
 .B swaplabel
-is part of the util-linux-ng package and is available from ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+is part of the util-linux package and is available from ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
 .SH SEE ALSO
 .BR mkswap (8),
 .BR swapon (8),
diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 63419722..9dc20b49 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -33,7 +33,7 @@
 #include "c.h"
 #include "writeall.h"
 #include "swapheader.h"
-#include "xstrncpy.h"
+#include "strutils.h"
 #include "nls.h"
 
 #define SWAP_UUID_OFFSET	(offsetof(struct swap_header_v1_2, uuid))