svn commit: r298876 - in head: lib/libutil sbin/hastd usr.bin/newgrp

[Ed Schouten]

Author: ed
Date: Sun May  1 08:22:11 2016
New Revision: 298876
URL: https://svnweb.freebsd.org/changeset/base/298876

Log:
  Remove useless calls to basename().
  
  There are a couple of places in the source three where we call
  basename() on constant strings. This is bad, because the prototype
  standardized by POSIX allows the implementation to use its argument as a
  storage buffer.
  
  This change eliminates some of these unportable calls to basename() in
  cases where it was only added for cosmetical reasons, namely to trim
  argv[0]. There's nothing wrong with setting argv[0] to the full path.
  
  Reviewed by:	jilles
  Differential Revision:	https://reviews.freebsd.org/D6093

Modified:
  head/lib/libutil/pw_util.c
  head/sbin/hastd/hooks.c
  head/usr.bin/newgrp/newgrp.c

Modified: head/lib/libutil/pw_util.c
==============================================================================
--- head/lib/libutil/pw_util.c	Sun May  1 05:01:10 2016	(r298875)
+++ head/lib/libutil/pw_util.c	Sun May  1 08:22:11 2016	(r298876)
@@ -58,7 +58,6 @@ static const char rcsid[] =
 #include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libgen.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
@@ -315,7 +314,7 @@ pw_edit(int notsetuid)
 			(void)setuid(getuid());
 		}
 		errno = 0;
-		execlp(editor, basename(editor), tempname, (char *)NULL);
+		execlp(editor, editor, tempname, (char *)NULL);
 		_exit(errno);
 	default:
 		/* parent */

Modified: head/sbin/hastd/hooks.c
==============================================================================
--- head/sbin/hastd/hooks.c	Sun May  1 05:01:10 2016	(r298875)
+++ head/sbin/hastd/hooks.c	Sun May  1 08:22:11 2016	(r298876)
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <fcntl.h>
-#include <libgen.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -352,7 +351,7 @@ hook_execv(const char *path, va_list ap)
 		return;
 
 	memset(args, 0, sizeof(args));
-	args[0] = basename(path);
+	args[0] = __DECONST(char *, path);
 	for (ii = 1; ii < sizeof(args) / sizeof(args[0]); ii++) {
 		args[ii] = va_arg(ap, char *);
 		if (args[ii] == NULL)

Modified: head/usr.bin/newgrp/newgrp.c
==============================================================================
--- head/usr.bin/newgrp/newgrp.c	Sun May  1 05:01:10 2016	(r298875)
+++ head/usr.bin/newgrp/newgrp.c	Sun May  1 08:22:11 2016	(r298876)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <grp.h>
-#include <libgen.h>
 #include <limits.h>
 #include <login_cap.h>
 #include <paths.h>
@@ -290,7 +289,7 @@ loginshell(void)
 	if (ticket != NULL)
 		setenv("KRBTKFILE", ticket, 1);
 
-	if (asprintf(args, "-%s", basename(shell)) < 0)
+	if (asprintf(args, "-%s", shell) < 0)
 		err(1, "asprintf");
 	args[1] = NULL;
 
@@ -306,6 +305,6 @@ doshell(void)
 	shell = pwd->pw_shell;
 	if (*shell == '\0')
 		shell = _PATH_BSHELL;
-	execl(shell, basename(shell), (char *)NULL);
+	execl(shell, shell, (char *)NULL);
 	err(1, "%s", shell);
 }