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

When removing trailing slashes, don't remove the first character

Browse Source 
of the name if it is '/'. Also fix a comparison between signed and
unsigned quantities (pointed out by trhodes).
This commit is contained in:
Ian Dowse 2003-10-29 17:44:36 +00:00
parent feeac7d216
commit 5fff09147f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/umount/umount.c
View File

@ -249,7 +249,7 @@ checkname(char *name, char **typelist)
*/
if (sfs == NULL) {
len = strlen(name);
while (len > 0 && name[len - 1] == '/')
while (len > 1 && name[len - 1] == '/')
name[--len] = '\0';
sfs = checkmntlist(name);
}
@ -262,7 +262,7 @@ checkname(char *name, char **typelist)
snprintf(buf, sizeof(buf), "%s:%.*s", delimp + 1, delimp - name,
name);
len = strlen(buf);
while (len > 0 && buf[len - 1] == '/')
while (len > 1 && buf[len - 1] == '/')
buf[--len] = '\0';
sfs = checkmntlist(buf);
}
@ -566,7 +566,7 @@ parsehexfsid(const char *hex, fsid_t *fsid)
if (strlen(hex) != sizeof(*fsid) * 2)
return (-1);
hexbuf[2] = '\0';
for (i = 0; i < sizeof(*fsid); i++) {
for (i = 0; i < (int)sizeof(*fsid); i++) {
hexbuf[0] = hex[i * 2];
hexbuf[1] = hex[i * 2 + 1];
if (!isxdigit(hexbuf[0]) || !isxdigit(hexbuf[1]))