svn commit: r262946 - head/sbin/kldconfig

[Jilles Tjoelker]

Author: jilles
Date: Sun Mar  9 13:19:37 2014
New Revision: 262946
URL: http://svnweb.freebsd.org/changeset/base/262946

Log:
  kldconfig: Remove some code for compatibility with FreeBSD 4.x.
  
  Verified using md5(1).

Modified:
  head/sbin/kldconfig/kldconfig.c

Modified: head/sbin/kldconfig/kldconfig.c
==============================================================================
--- head/sbin/kldconfig/kldconfig.c	Sun Mar  9 07:45:59 2014	(r262945)
+++ head/sbin/kldconfig/kldconfig.c	Sun Mar  9 13:19:37 2014	(r262946)
@@ -40,15 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__FreeBSD_version)
-#if __FreeBSD_version < 500000
-#define NEED_SLASHTERM
-#endif /* < 500000 */
-#else  /* defined(__FreeBSD_version) */
-/* just in case.. */
-#define NEED_SLASHTERM
-#endif /* defined(__FreeBSD_version) */
-
 /* the default sysctl name */
 #define PATHCTL	"kern.module_path"
 
@@ -163,18 +154,9 @@ addpath(struct pathhead *pathq, char *pa
 		strlcpy(pathbuf, path, sizeof(pathbuf));
 
 	len = strlen(pathbuf);
-#ifdef NEED_SLASHTERM
-	/* slash-terminate, because the kernel linker said so. */
-	if ((len == 0) || (pathbuf[len-1] != '/')) {
-		if (len == sizeof(pathbuf) - 1)
-			errx(1, "path too long: %s", pathbuf);
-		pathbuf[len] = '/';
-	}
-#else  /* NEED_SLASHTERM */
 	/* remove a terminating slash if present */
 	if ((len > 0) && (pathbuf[len-1] == '/'))
 		pathbuf[--len] = '\0';
-#endif /* NEED_SLASHTERM */
 
 	/* is it already in there? */
 	TAILQ_FOREACH(pe, pathq, next)
@@ -219,18 +201,9 @@ rempath(struct pathhead *pathq, char *pa
 		strlcpy(pathbuf, path, sizeof(pathbuf));
 
 	len = strlen(pathbuf);
-#ifdef NEED_SLASHTERM
-	/* slash-terminate, because the kernel linker said so. */
-	if ((len == 0) || (pathbuf[len-1] != '/')) {
-		if (len == sizeof(pathbuf) - 1)
-			errx(1, "path too long: %s", pathbuf);
-		pathbuf[len] = '/';
-	}
-#else  /* NEED_SLASHTERM */
 	/* remove a terminating slash if present */
 	if ((len > 0) && (pathbuf[len-1] == '/'))
 		pathbuf[--len] = '\0';
-#endif /* NEED_SLASHTERM */
 
 	/* Is it in there? */
 	TAILQ_FOREACH(pe, pathq, next)