d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an overflow or two and replace a while with a for.

Browse Source 
Submitted by:	Martin Blapp <mbr@imp.ch>
This commit is contained in:
Brian Feldman 1999-10-30 17:56:47 +00:00
parent cf96af72d5
commit 66a84ea766
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=52679
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sbin/mount_nfs/mount_nfs.c
View File

@ -662,6 +662,7 @@ getnfsargs(spec, nfsargsp)
char *cp;
#endif
u_short tport;
size_t len;
static struct nfhret nfhret;
static char nam[MNAMELEN + 1];
@ -685,21 +686,22 @@ getnfsargs(spec, nfsargsp)
* that some mountd implementations fail to remove the mount
* entries from their mountlist while unmounting.
*/
speclen = strlen(spec);
while (speclen > 1 && spec[speclen - 1] == '/') {
for (speclen = strlen(spec);
speclen > 1 && spec[speclen - 1] == '/';
speclen--)
spec[speclen - 1] = '\0';
speclen--;
}
if (strlen(hostp) + strlen(spec) + 1 > MNAMELEN) {
warnx("%s:%s: %s", hostp, spec, strerror(ENAMETOOLONG));
return (0);
}
/* Make both '@' and ':' notations equal */
strcat(nam, hostp);
strcat(nam, ":");
strcat(nam, spec);
if (*hostp != '\0') {
len = strlen(hostp);
memmove(nam, hostp, len);
nam[len] = ':';
memmove(nam + len + 1, spec, speclen);
nam[len + speclen + 1] = '\0';
}
/*
* DUMB!! Until the mount protocol works on iso transport, we must
* supply both an iso and an inet address for the host.