diff -ru sbin/mount_hpfs.orig/mount_hpfs.c sbin/mount_hpfs/mount_hpfs.c
--- sbin/mount_hpfs.orig/mount_hpfs.c	2003-11-01 15:16:00.000000000 -0200
+++ sbin/mount_hpfs/mount_hpfs.c	2004-10-25 20:54:15.000000000 -0200
@@ -122,8 +122,8 @@
 		warnx("\"%s\" is a relative path", dir);
 		if (getcwd(ndir, sizeof(ndir)) == NULL)
 			err(EX_OSERR, "getcwd");
-		strncat(ndir, "/", sizeof(ndir) - strlen(ndir) - 1);
-		strncat(ndir, dir, sizeof(ndir) - strlen(ndir) - 1);
+		strlcat(ndir, "/", sizeof(ndir));
+		strlcat(ndir, dir, sizeof(ndir));
 		dir = ndir;
 		warnx("using \"%s\" instead", dir);
 	}