Use base_name, not basename.

diff --git a/src/basename.c b/src/basename.c
index da4177aedfbb371752ad2aa023287c44060b0b61..b1a23e4f0e383934870e0c07f528ce78e6f48384 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -33,8 +33,8 @@
 #include "long-options.h"
 #include "error.h"
 
-extern char *basename ();
-extern void strip_trailing_slashes ();
+char *base_name ();
+void strip_trailing_slashes ();
 
 /* The name this program was run with. */
 char *program_name;
@@ -104,7 +104,7 @@ main (int argc, char **argv)
 
   strip_trailing_slashes (argv[1]);
 
-  name = basename (argv[1]);
+  name = base_name (argv[1]);
 
   if (argc == 3)
     remove_suffix (name, argv[2]);

diff --git a/src/su.c b/src/su.c
index ed0e603e12b92edeafdf43e37e1badb9ec6cf3f7..96b47552d86ecfd9e914fd3a6ef7e425ab3462ff 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -138,7 +138,7 @@ char *getusershell ();
 void endusershell ();
 void setusershell ();
 
-char *basename ();
+char *base_name ();
 char *xmalloc ();
 char *xrealloc ();
 char *xstrdup ();
@@ -241,7 +241,7 @@ log_su (const struct passwd *pw, int successful)
   if (tty == NULL)
     tty = "none";
   /* 4.2BSD openlog doesn't have the third parameter.  */
-  openlog (basename (program_name), 0
+  openlog (base_name (program_name), 0
 # ifdef LOG_AUTH
           , LOG_AUTH
 # endif
@@ -375,14 +375,14 @@ run_shell (const char *shell, const char *command, char **additional_args)
       char *arg0;
       char *shell_basename;
 
-      shell_basename = basename (shell);
+      shell_basename = base_name (shell);
       arg0 = xmalloc (strlen (shell_basename) + 2);
       arg0[0] = '-';
       strcpy (arg0 + 1, shell_basename);
       args[0] = arg0;
     }
   else
-    args[0] = basename (shell);
+    args[0] = base_name (shell);
   if (fast_startup)
     args[argno++] = "-f";
   if (command)