Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-07 10:28:56 +00:00
Code Issues Projects Releases Wiki Activity

nfsmount: style fix

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-10 18:28:23 +00:00
parent 5983914c1b
commit 2244a21a8e
1 changed files with 105 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
util-linux/nfsmount.c
View File

@ -192,22 +192,22 @@ get_mountport(struct sockaddr_in *server_addr,
long unsigned proto, long unsigned proto,
long unsigned port) long unsigned port)
{ {
struct pmaplist *pmap; struct pmaplist *pmap;
static struct pmap p = {0, 0, 0, 0}; static struct pmap p = {0, 0, 0, 0};
server_addr->sin_port = PMAPPORT; server_addr->sin_port = PMAPPORT;
pmap = pmap_getmaps(server_addr); pmap = pmap_getmaps(server_addr);
if (version > MAX_NFSPROT) if (version > MAX_NFSPROT)
version = MAX_NFSPROT; version = MAX_NFSPROT;
if (!prog) if (!prog)
prog = MOUNTPROG; prog = MOUNTPROG;
p.pm_prog = prog; p.pm_prog = prog;
p.pm_vers = version; p.pm_vers = version;
p.pm_prot = proto; p.pm_prot = proto;
p.pm_port = port; p.pm_port = port;
while (pmap) { while (pmap) {
if (pmap->pml_map.pm_prog != prog) if (pmap->pml_map.pm_prog != prog)
goto next; goto next;
if (!version && p.pm_vers > pmap->pml_map.pm_vers) if (!version && p.pm_vers > pmap->pml_map.pm_vers)
@ -223,14 +223,14 @@ while (pmap) {
memcpy(&p, &pmap->pml_map, sizeof(p)); memcpy(&p, &pmap->pml_map, sizeof(p));
next: next:
pmap = pmap->pml_next; pmap = pmap->pml_next;
} }
if (!p.pm_vers) if (!p.pm_vers)
p.pm_vers = MOUNTVERS; p.pm_vers = MOUNTVERS;
if (!p.pm_port) if (!p.pm_port)
p.pm_port = MOUNTPORT; p.pm_port = MOUNTPORT;
if (!p.pm_prot) if (!p.pm_prot)
p.pm_prot = IPPROTO_TCP; p.pm_prot = IPPROTO_TCP;
return &p; return &p;
} }
int nfsmount(const char *spec, const char *node, int *flags, int nfsmount(const char *spec, const char *node, int *flags,
@ -242,7 +242,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
char *hostname; char *hostname;
char *pathname; char *pathname;
char *old_opts; char *old_opts;
char *mounthost=NULL; char *mounthost = NULL;
char new_opts[1024]; char new_opts[1024];
struct timeval total_timeout; struct timeval total_timeout;
enum clnt_stat clnt_stat; enum clnt_stat clnt_stat;
@ -325,7 +325,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
} }
} }
memcpy (&mount_server_addr, &server_addr, sizeof (mount_server_addr)); memcpy(&mount_server_addr, &server_addr, sizeof (mount_server_addr));
/* add IP address to mtab options for use when unmounting */ /* add IP address to mtab options for use when unmounting */
@ -405,7 +405,7 @@ int nfsmount(const char *spec, const char *node, int *flags,
else if (!strcmp(opt, "mountport")) else if (!strcmp(opt, "mountport"))
mountport = val; mountport = val;
else if (!strcmp(opt, "mounthost")) else if (!strcmp(opt, "mounthost"))
mounthost=xstrndup(opteq+1, mounthost = xstrndup(opteq+1,
strcspn(opteq+1," \t\n\r,")); strcspn(opteq+1," \t\n\r,"));
else if (!strcmp(opt, "mountprog")) else if (!strcmp(opt, "mountprog"))
mountprog = val; mountprog = val;
@ -826,20 +826,20 @@ static char *nfs_strerror(int status)
return buf; return buf;
} }
static bool_t xdr_fhandle (XDR *xdrs, fhandle objp) static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
{ {
if (!xdr_opaque (xdrs, objp, FHSIZE)) if (!xdr_opaque(xdrs, objp, FHSIZE))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool_t xdr_fhstatus (XDR *xdrs, fhstatus *objp) bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
{ {
if (!xdr_u_int (xdrs, &objp->fhs_status)) if (!xdr_u_int(xdrs, &objp->fhs_status))
return FALSE; return FALSE;
switch (objp->fhs_status) { switch (objp->fhs_status) {
case 0: case 0:
if (!xdr_fhandle (xdrs, objp->fhstatus_u.fhs_fhandle)) if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle))
return FALSE; return FALSE;
break; break;
default: default:
@ -848,44 +848,44 @@ bool_t xdr_fhstatus (XDR *xdrs, fhstatus *objp)
return TRUE; return TRUE;
} }
bool_t xdr_dirpath (XDR *xdrs, dirpath *objp) bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
{ {
if (!xdr_string (xdrs, objp, MNTPATHLEN)) if (!xdr_string(xdrs, objp, MNTPATHLEN))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool_t xdr_fhandle3 (XDR *xdrs, fhandle3 *objp) bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
{ {
if (!xdr_bytes (xdrs, (char **)&objp->fhandle3_val, (unsigned int *) &objp->fhandle3_len, FHSIZE3)) if (!xdr_bytes(xdrs, (char **)&objp->fhandle3_val, (unsigned int *) &objp->fhandle3_len, FHSIZE3))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool_t xdr_mountres3_ok (XDR *xdrs, mountres3_ok *objp) bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
{ {
if (!xdr_fhandle3 (xdrs, &objp->fhandle)) if (!xdr_fhandle3(xdrs, &objp->fhandle))
return FALSE; return FALSE;
if (!xdr_array (xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0, if (!xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0,
sizeof (int), (xdrproc_t) xdr_int)) sizeof (int), (xdrproc_t) xdr_int))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool_t xdr_mountstat3 (XDR *xdrs, mountstat3 *objp) bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
{ {
if (!xdr_enum (xdrs, (enum_t *) objp)) if (!xdr_enum(xdrs, (enum_t *) objp))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
bool_t xdr_mountres3 (XDR *xdrs, mountres3 *objp) bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp)
{ {
if (!xdr_mountstat3 (xdrs, &objp->fhs_status)) if (!xdr_mountstat3(xdrs, &objp->fhs_status))
return FALSE; return FALSE;
switch (objp->fhs_status) { switch (objp->fhs_status) {
case MNT_OK: case MNT_OK:
if (!xdr_mountres3_ok (xdrs, &objp->mountres3_u.mountinfo)) if (!xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo))
return FALSE; return FALSE;
break; break;
default: default:
@ -893,4 +893,3 @@ bool_t xdr_mountres3 (XDR *xdrs, mountres3 *objp)
} }
return TRUE; return TRUE;
} }