diff options
| author | Jim Meyering <jim@meyering.net> | 1997-05-27 13:55:23 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1997-05-27 13:55:23 +0000 |
| commit | e4f25ca7b18619c0da81dfb60d18c4952abe3594 (patch) | |
| tree | c591302e34fae54b64268bc14ae465b6ab3b3a01 | |
| parent | dd547a84bf9cf5f444d884ee9910753fec916668 (diff) | |
| download | coreutils-e4f25ca7b18619c0da81dfb60d18c4952abe3594.tar.xz | |
Use base_name, not basename.
| -rw-r--r-- | src/basename.c | 6 | ||||
| -rw-r--r-- | src/su.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/basename.c b/src/basename.c index da4177aed..b1a23e4f0 100644 --- 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]); @@ -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) |