Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-30 11:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Rename dirname variable to pathname to eliminate namespace conflict.

Browse Source
This commit is contained in:
Matt Kraai 2001-07-26 14:26:53 +00:00
parent 4db35647dd
commit f9d6aa0a86
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nfsmount.c
View File

@ -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;
}

14
util-linux/nfsmount.c
View File

@ -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;
}