summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-07-16 16:28:10 -0400
committerNeil Brown <neilb@suse.de>2007-07-20 16:09:18 +1000
commit12a09252e2698421fd1c81af9b2e6597966693d3 (patch)
treefece6107f4671011678e97eb2ad20ce0dd1bf5ff
parent8ebf0d12ec1496658d28411f5adb795dda0abaf0 (diff)
downloadnfs-utils-12a09252e2698421fd1c81af9b2e6597966693d3.tar.gz
nfs-utils-12a09252e2698421fd1c81af9b2e6597966693d3.tar.xz
nfs-utils-12a09252e2698421fd1c81af9b2e6597966693d3.zip
mount.nfs: Simplify generation of progname
Use basename() instead of our own majick. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--utils/mount/mount.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 17c79e4..e2d3b53 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -384,15 +384,10 @@ int main(int argc, char *argv[])
{
int c, flags = 0, nfs_mount_vers = 0, mnt_err = 1, fake = 0;
char *spec, *mount_point, *extra_opts = NULL;
- char *mount_opts = NULL, *p;
+ char *mount_opts = NULL;
uid_t uid = getuid();
- progname = argv[0];
- if (!progname)
- exit(2);
-
- if ((p = strrchr(progname, '/')) != NULL)
- progname = p+1;
+ progname = basename(argv[0]);
if(!strncmp(progname, "umount", strlen("umount"))) {
if(argc < 2) {