Fix fdformat to not use /dev/r* device nodes anymore, this usage

has been made obsolete by the block/char device merging.

Reflect this change in the manual page and fix the usage of a
backslash in ``e.g.''.

Reviewed by:	bright, sheldonh, phk

2 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 3688f98..8f0ab5e 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -51,13 +51,13 @@
 formats a floppy disk at device
 .Ar device_name .
 .Ar Device_name
-should be a character device; it may be given either with a full path
-name of a raw device node for a floppy disk drive
-.Pq e.\ g. Pa /dev/rfd0 ,
-or default name in an abbreviated form
-.Pq e.\ g. Em fd0 .
+may be given either with a full path
+name of a device node for a floppy disk drive
+.Pq e.g. Pa /dev/fd0 ,
+or a default name in an abbreviated form
+.Pq e.g. Em fd0 .
 In the latter case, the name is constructed by prepending
-.Pa /dev/r
+.Pa /dev/
 and appending a
 .Em .capacity
 to the
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 9c12af3..0abf0c7 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -123,14 +123,14 @@ verify_track(int fd, int track, int tracksize)
 static const char *
 makename(const char *arg, const char *suffix)
 {
-	static char namebuff[20];	/* big enough for "/dev/rfd0a"... */
+	static char namebuff[20];	/* big enough for "/dev/fd0a"... */
 
 	memset(namebuff, 0, 20);
 	if(*arg == '\0') /* ??? */
 		return arg;
 	if(*arg == '/')  /* do not convert absolute pathnames */
 		return arg;
-	strcpy(namebuff, "/dev/r");
+	strcpy(namebuff, "/dev/");
 	strncat(namebuff, arg, 3);
 	strcat(namebuff, suffix);
 	return namebuff;