Rename dirname variable to pathname to eliminate namespace conflict.

author: Matt Kraai <kraai@debian.org> 2001-07-26 14:26:53 +0000
committer: Matt Kraai <kraai@debian.org> 2001-07-26 14:26:53 +0000
commit: f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532 (patch)
tree: 2513f0eea5dc1493cd3bcfd3b67c975b7f83dca4
parent: 4db35647dd88d2a640396770ede7754e1200c395 (diff)
download: busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.gz
busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.bz2
busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.zip
2 files changed, 14 insertions, 14 deletions
diff --git a/nfsmount.c b/nfsmount.c
index 90cf9fb1b..cd722acc3 100644
--- a/nfsmount.c
+++ b/nfsmount.c
@@ -262,7 +262,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        char hostdir[1024];
        CLIENT *mclient;
        char *hostname;
-        char *dirname;
+        char *pathname;
        char *old_opts;
        char *mounthost=NULL;
        char new_opts[1024];
@@ -316,7 +316,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        strcpy(hostdir, spec);
        if ((s = strchr(hostdir, ':'))) {
                hostname = hostdir;
-                dirname = s + 1;
+                pathname = s + 1;
                *s = '\0';
                /* Ignore all but first hostname in replicated mounts
                   until they can be fully supported. (mack@sgi.com) */
@@ -662,7 +662,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
                        mclient = 0;
                        }
                        if (mclient) {
-                                /* try to mount hostname:dirname */
+                                /* try to mount hostname:pathname */
                                mclient->cl_auth = authunix_create_default();
                        /* make pointers in xdr_mountres3 NULL so
@@ -673,14 +673,14 @@ int nfsmount(const char *spec, const char *node, int *flags,
                        if (pm_mnt->pm_vers == 3)
                                clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
                                                      (xdrproc_t) xdr_dirpath,
-                                                      (caddr_t) &dirname,
+                                                      (caddr_t) &pathname,
                                                      (xdrproc_t) xdr_mountres3,
                                                      (caddr_t) &status,
                                        total_timeout);
                        else
                                clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
                                                      (xdrproc_t) xdr_dirpath,
-                                                      (caddr_t) &dirname,
+                                                      (caddr_t) &pathname,
                                                      (xdrproc_t) xdr_fhstatus,
                                                      (caddr_t) &status,
                                                      total_timeout);
@@ -720,7 +720,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        if (nfsvers == 2) {
                if (status.nfsv2.fhs_status != 0) {
                        error_msg("%s:%s failed, reason given by server: %s",
-                                hostname, dirname,
+                                hostname, pathname,
                                nfs_strerror(status.nfsv2.fhs_status));
                        goto fail;
                }
@@ -738,7 +738,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
                fhandle3 *my_fhandle;
                if (status.nfsv3.fhs_status != 0) {
                        error_msg("%s:%s failed, reason given by server: %s",
-                                hostname, dirname,
+                                hostname, pathname,
                                nfs_strerror(status.nfsv3.fhs_status));
                        goto fail;
                }
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index 90cf9fb1b..cd722acc3 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -262,7 +262,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        char hostdir[1024];
        CLIENT *mclient;
        char *hostname;
-        char *dirname;
+        char *pathname;
        char *old_opts;
        char *mounthost=NULL;
        char new_opts[1024];
@@ -316,7 +316,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        strcpy(hostdir, spec);
        if ((s = strchr(hostdir, ':'))) {
                hostname = hostdir;
-                dirname = s + 1;
+                pathname = s + 1;
                *s = '\0';
                /* Ignore all but first hostname in replicated mounts
                   until they can be fully supported. (mack@sgi.com) */
@@ -662,7 +662,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
                        mclient = 0;
                        }
                        if (mclient) {
-                                /* try to mount hostname:dirname */
+                                /* try to mount hostname:pathname */
                                mclient->cl_auth = authunix_create_default();
                        /* make pointers in xdr_mountres3 NULL so
@@ -673,14 +673,14 @@ int nfsmount(const char *spec, const char *node, int *flags,
                        if (pm_mnt->pm_vers == 3)
                                clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
                                                      (xdrproc_t) xdr_dirpath,
-                                                      (caddr_t) &dirname,
+                                                      (caddr_t) &pathname,
                                                      (xdrproc_t) xdr_mountres3,
                                                      (caddr_t) &status,
                                        total_timeout);
                        else
                                clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
                                                      (xdrproc_t) xdr_dirpath,
-                                                      (caddr_t) &dirname,
+                                                      (caddr_t) &pathname,
                                                      (xdrproc_t) xdr_fhstatus,
                                                      (caddr_t) &status,
                                                      total_timeout);
@@ -720,7 +720,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
        if (nfsvers == 2) {
                if (status.nfsv2.fhs_status != 0) {
                        error_msg("%s:%s failed, reason given by server: %s",
-                                hostname, dirname,
+                                hostname, pathname,
                                nfs_strerror(status.nfsv2.fhs_status));
                        goto fail;
                }
@@ -738,7 +738,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
                fhandle3 *my_fhandle;
                if (status.nfsv3.fhs_status != 0) {
                        error_msg("%s:%s failed, reason given by server: %s",
-                                hostname, dirname,
+                                hostname, pathname,
                                nfs_strerror(status.nfsv3.fhs_status));
                        goto fail;
                }
author	Matt Kraai <kraai@debian.org>	2001-07-26 14:26:53 +0000
committer	Matt Kraai <kraai@debian.org>	2001-07-26 14:26:53 +0000
commit	f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532 (patch)
tree	2513f0eea5dc1493cd3bcfd3b67c975b7f83dca4
parent	4db35647dd88d2a640396770ede7754e1200c395 (diff)
download	busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.gz busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.bz2 busybox-w32-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.zip

diff --git a/nfsmount.c b/nfsmount.c index 90cf9fb1b..cd722acc3 100644 --- a/nfsmount.c +++ b/nfsmount.c
@@ -262,7 +262,7 @@ int nfsmount(const char spec, const char node, int *flags,
262	char hostdir[1024];	262	char hostdir[1024];
263	CLIENT *mclient;	263	CLIENT *mclient;
264	char *hostname;	264	char *hostname;
265	char *dirname;	265	char *pathname;
266	char *old_opts;	266	char *old_opts;
267	char *mounthost=NULL;	267	char *mounthost=NULL;
268	char new_opts[1024];	268	char new_opts[1024];
@@ -316,7 +316,7 @@ int nfsmount(const char spec, const char node, int *flags,
316	strcpy(hostdir, spec);	316	strcpy(hostdir, spec);
317	if ((s = strchr(hostdir, ':'))) {	317	if ((s = strchr(hostdir, ':'))) {
318	hostname = hostdir;	318	hostname = hostdir;
319	dirname = s + 1;	319	pathname = s + 1;
320	*s = '\0';	320	*s = '\0';
321	/* Ignore all but first hostname in replicated mounts	321	/* Ignore all but first hostname in replicated mounts
322	until they can be fully supported. (mack@sgi.com) */	322	until they can be fully supported. (mack@sgi.com) */
@@ -662,7 +662,7 @@ int nfsmount(const char spec, const char node, int *flags,
662	mclient = 0;	662	mclient = 0;
663	}	663	}
664	if (mclient) {	664	if (mclient) {
665	/* try to mount hostname:dirname */	665	/* try to mount hostname:pathname */
666	mclient->cl_auth = authunix_create_default();	666	mclient->cl_auth = authunix_create_default();
667		667
668	/* make pointers in xdr_mountres3 NULL so	668	/* make pointers in xdr_mountres3 NULL so
@@ -673,14 +673,14 @@ int nfsmount(const char spec, const char node, int *flags,
673	if (pm_mnt->pm_vers == 3)	673	if (pm_mnt->pm_vers == 3)
674	clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,	674	clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
675	(xdrproc_t) xdr_dirpath,	675	(xdrproc_t) xdr_dirpath,
676	(caddr_t) &dirname,	676	(caddr_t) &pathname,
677	(xdrproc_t) xdr_mountres3,	677	(xdrproc_t) xdr_mountres3,
678	(caddr_t) &status,	678	(caddr_t) &status,
679	total_timeout);	679	total_timeout);
680	else	680	else
681	clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,	681	clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
682	(xdrproc_t) xdr_dirpath,	682	(xdrproc_t) xdr_dirpath,
683	(caddr_t) &dirname,	683	(caddr_t) &pathname,
684	(xdrproc_t) xdr_fhstatus,	684	(xdrproc_t) xdr_fhstatus,
685	(caddr_t) &status,	685	(caddr_t) &status,
686	total_timeout);	686	total_timeout);
@@ -720,7 +720,7 @@ int nfsmount(const char spec, const char node, int *flags,
720	if (nfsvers == 2) {	720	if (nfsvers == 2) {
721	if (status.nfsv2.fhs_status != 0) {	721	if (status.nfsv2.fhs_status != 0) {
722	error_msg("%s:%s failed, reason given by server: %s",	722	error_msg("%s:%s failed, reason given by server: %s",
723	hostname, dirname,	723	hostname, pathname,
724	nfs_strerror(status.nfsv2.fhs_status));	724	nfs_strerror(status.nfsv2.fhs_status));
725	goto fail;	725	goto fail;
726	}	726	}
@@ -738,7 +738,7 @@ int nfsmount(const char spec, const char node, int *flags,
738	fhandle3 *my_fhandle;	738	fhandle3 *my_fhandle;
739	if (status.nfsv3.fhs_status != 0) {	739	if (status.nfsv3.fhs_status != 0) {
740	error_msg("%s:%s failed, reason given by server: %s",	740	error_msg("%s:%s failed, reason given by server: %s",
741	hostname, dirname,	741	hostname, pathname,
742	nfs_strerror(status.nfsv3.fhs_status));	742	nfs_strerror(status.nfsv3.fhs_status));
743	goto fail;	743	goto fail;
744	}	744	}


diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index 90cf9fb1b..cd722acc3 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c
@@ -262,7 +262,7 @@ int nfsmount(const char spec, const char node, int *flags,
262	char hostdir[1024];	262	char hostdir[1024];
263	CLIENT *mclient;	263	CLIENT *mclient;
264	char *hostname;	264	char *hostname;
265	char *dirname;	265	char *pathname;
266	char *old_opts;	266	char *old_opts;
267	char *mounthost=NULL;	267	char *mounthost=NULL;
268	char new_opts[1024];	268	char new_opts[1024];
@@ -316,7 +316,7 @@ int nfsmount(const char spec, const char node, int *flags,
316	strcpy(hostdir, spec);	316	strcpy(hostdir, spec);
317	if ((s = strchr(hostdir, ':'))) {	317	if ((s = strchr(hostdir, ':'))) {
318	hostname = hostdir;	318	hostname = hostdir;
319	dirname = s + 1;	319	pathname = s + 1;
320	*s = '\0';	320	*s = '\0';
321	/* Ignore all but first hostname in replicated mounts	321	/* Ignore all but first hostname in replicated mounts
322	until they can be fully supported. (mack@sgi.com) */	322	until they can be fully supported. (mack@sgi.com) */
@@ -662,7 +662,7 @@ int nfsmount(const char spec, const char node, int *flags,
662	mclient = 0;	662	mclient = 0;
663	}	663	}
664	if (mclient) {	664	if (mclient) {
665	/* try to mount hostname:dirname */	665	/* try to mount hostname:pathname */
666	mclient->cl_auth = authunix_create_default();	666	mclient->cl_auth = authunix_create_default();
667		667
668	/* make pointers in xdr_mountres3 NULL so	668	/* make pointers in xdr_mountres3 NULL so
@@ -673,14 +673,14 @@ int nfsmount(const char spec, const char node, int *flags,
673	if (pm_mnt->pm_vers == 3)	673	if (pm_mnt->pm_vers == 3)
674	clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,	674	clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
675	(xdrproc_t) xdr_dirpath,	675	(xdrproc_t) xdr_dirpath,
676	(caddr_t) &dirname,	676	(caddr_t) &pathname,
677	(xdrproc_t) xdr_mountres3,	677	(xdrproc_t) xdr_mountres3,
678	(caddr_t) &status,	678	(caddr_t) &status,
679	total_timeout);	679	total_timeout);
680	else	680	else
681	clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,	681	clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
682	(xdrproc_t) xdr_dirpath,	682	(xdrproc_t) xdr_dirpath,
683	(caddr_t) &dirname,	683	(caddr_t) &pathname,
684	(xdrproc_t) xdr_fhstatus,	684	(xdrproc_t) xdr_fhstatus,
685	(caddr_t) &status,	685	(caddr_t) &status,
686	total_timeout);	686	total_timeout);
@@ -720,7 +720,7 @@ int nfsmount(const char spec, const char node, int *flags,
720	if (nfsvers == 2) {	720	if (nfsvers == 2) {
721	if (status.nfsv2.fhs_status != 0) {	721	if (status.nfsv2.fhs_status != 0) {
722	error_msg("%s:%s failed, reason given by server: %s",	722	error_msg("%s:%s failed, reason given by server: %s",
723	hostname, dirname,	723	hostname, pathname,
724	nfs_strerror(status.nfsv2.fhs_status));	724	nfs_strerror(status.nfsv2.fhs_status));
725	goto fail;	725	goto fail;
726	}	726	}
@@ -738,7 +738,7 @@ int nfsmount(const char spec, const char node, int *flags,
738	fhandle3 *my_fhandle;	738	fhandle3 *my_fhandle;
739	if (status.nfsv3.fhs_status != 0) {	739	if (status.nfsv3.fhs_status != 0) {
740	error_msg("%s:%s failed, reason given by server: %s",	740	error_msg("%s:%s failed, reason given by server: %s",
741	hostname, dirname,	741	hostname, pathname,
742	nfs_strerror(status.nfsv3.fhs_status));	742	nfs_strerror(status.nfsv3.fhs_status));
743	goto fail;	743	goto fail;
744	}	744	}