summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-16 13:29:42 -0800
committerJeremy Allison <jra@samba.org>2007-11-16 13:29:42 -0800
commit1e03d348ca6f37847c9861aec90a85a586844723 (patch)
tree04aab2f79b30bcb85a341176ad7a3826dfae0e57
parent6ff701e695e847414afb0320a6701fe252d3f311 (diff)
parent5267c9d2e6ff95687a7121e91496da3ae742d282 (diff)
downloadsamba-1e03d348ca6f37847c9861aec90a85a586844723.tar.gz
samba-1e03d348ca6f37847c9861aec90a85a586844723.tar.bz2
samba-1e03d348ca6f37847c9861aec90a85a586844723.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 01e85f146b32d3ec91f2affb070bfd3516a28333)
-rw-r--r--source3/client/umount.cifs.c7
-rw-r--r--source3/lib/readline.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/source3/client/umount.cifs.c b/source3/client/umount.cifs.c
index d1195755ca..ab94a20c60 100644
--- a/source3/client/umount.cifs.c
+++ b/source3/client/umount.cifs.c
@@ -341,6 +341,13 @@ int main(int argc, char ** argv)
/* fixup path if needed */
+ /* Trim any trailing slashes */
+ while ((strlen(mountpoint) > 1) &&
+ (mountpoint[strlen(mountpoint)-1] == '/'))
+ {
+ mountpoint[strlen(mountpoint)-1] = '\0';
+ }
+
/* make sure that this is a cifs filesystem */
rc = statfs(mountpoint, &statbuf);
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 6fed929be0..7c127817be 100644
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -65,7 +65,7 @@ static char *smb_readline_replacement(const char *prompt, void (*callback)(void)
}
if (line == NULL) {
- line = SMB_MALLOC(BUFSIZ);
+ line = (char *)SMB_MALLOC(BUFSIZ);
if (!line) {
return NULL;
}