diff options
| author | Rob Landley <rob@landley.net> | 2006-09-05 14:00:21 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-09-05 14:00:21 +0000 |
| commit | 4cb035dd2305e3cc1b817a934df176bf1eee4514 (patch) | |
| tree | 734c0542f589bb0f24be5a85bd7077e002fb9e85 /util-linux/mount.c | |
| parent | 02496aa69e7083aee179ac4d331daf90c838f727 (diff) | |
| download | busybox-w32-4cb035dd2305e3cc1b817a934df176bf1eee4514.tar.gz busybox-w32-4cb035dd2305e3cc1b817a934df176bf1eee4514.tar.bz2 busybox-w32-4cb035dd2305e3cc1b817a934df176bf1eee4514.zip | |
Vladimir Dronnikov (ybrnj80 at yandex dot ru) pointed out that my cleanup of
his code introduced a bug (an extra backslash in the CIFS mount string).
Diffstat (limited to 'util-linux/mount.c')
| -rw-r--r-- | util-linux/mount.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c index 3e2f78192..3b95428a0 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -253,8 +253,8 @@ static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts) | |||
| 253 | return rc; | 253 | return rc; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | // Mount one directory. Handles CIFS, NFS, loopback, autobind, and filesystem type | 256 | // Mount one directory. Handles CIFS, NFS, loopback, autobind, and filesystem |
| 257 | // detection. Returns 0 for success, nonzero for failure. | 257 | // type detection. Returns 0 for success, nonzero for failure. |
| 258 | 258 | ||
| 259 | static int singlemount(struct mntent *mp, int ignore_busy) | 259 | static int singlemount(struct mntent *mp, int ignore_busy) |
| 260 | { | 260 | { |
| @@ -301,7 +301,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) | |||
| 301 | 301 | ||
| 302 | // compose new unc '\\server-ip\share' | 302 | // compose new unc '\\server-ip\share' |
| 303 | 303 | ||
| 304 | s = xasprintf("\\\\%s\\%s",ip+3,strchr(mp->mnt_fsname+2,'\\')); | 304 | s = xasprintf("\\\\%s%s",ip+3,strchr(mp->mnt_fsname+2,'\\')); |
| 305 | if (ENABLE_FEATURE_CLEAN_UP) free(mp->mnt_fsname); | 305 | if (ENABLE_FEATURE_CLEAN_UP) free(mp->mnt_fsname); |
| 306 | mp->mnt_fsname = s; | 306 | mp->mnt_fsname = s; |
| 307 | 307 | ||