aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matt Kraai <kraai@debian.org>2001-07-26 14:26:53 +0000
committerGravatar Matt Kraai <kraai@debian.org>2001-07-26 14:26:53 +0000
commitf9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532 (patch)
tree2513f0eea5dc1493cd3bcfd3b67c975b7f83dca4
parent4db35647dd88d2a640396770ede7754e1200c395 (diff)
downloadbusybox-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.gz
busybox-f9d6aa0a86dd9ba3063bdf23319c5f5b86ed1532.tar.bz2
Rename dirname variable to pathname to eliminate namespace conflict.
-rw-r--r--nfsmount.c14
-rw-r--r--util-linux/nfsmount.c14
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;
}