diff options
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 8 | ||||
| -rwxr-xr-x | source3/client/mount.cifs.c | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index b498b5b4a8..690cc99f7f 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -2261,8 +2261,14 @@ static char **remote_completion(const char *text, int len) { pstring dirmask; int i; - completion_remote_t info = { "", NULL, 1, len, text, len }; + completion_remote_t info = { "", NULL, 1, 0, NULL, 0 }; + /* can't have non-static intialisation on Sun CC, so do it + at run time here */ + info.samelen = len; + info.text = text; + info.len = len; + if (len >= PATH_MAX) return(NULL); diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c index 8ba1eff02e..7167859d7b 100755 --- a/source3/client/mount.cifs.c +++ b/source3/client/mount.cifs.c @@ -222,15 +222,15 @@ char * parse_server(char * unc_name) printf(" %s does not begin with \\\\ or //\n",unc_name); return 0; } else { - unc_name[0] = '/'; - unc_name[1] = '/'; + unc_name[0] = '\\'; + unc_name[1] = '\\'; unc_name += 2; if ((share = strchr(unc_name, '/')) || (share = strchr(unc_name,'\\'))) { *share = 0; /* temporarily terminate the string */ share += 1; host_entry = gethostbyname(unc_name); - *(share - 1) = '/'; /* put the slash back */ + *(share - 1) = '\\'; /* put the slash back */ /* rc = getipnodebyname(unc_name, AF_INET, AT_ADDRCONFIG ,&rc);*/ if(host_entry == NULL) { printf("mount error: could not find target server. TCP name %s not found ", unc_name); @@ -300,7 +300,6 @@ int main(int argc, char ** argv) char * uuid = NULL; char * mountpoint; char * options; - char * temp; int rc,i; int rsize = 0; int wsize = 0; @@ -501,13 +500,9 @@ int main(int argc, char ** argv) optlen += strlen(mountpassword) + 6; options = malloc(optlen + 10); - options[0] = 0; + options[0] = 0; strncat(options,"unc=",4); strcat(options,share_name); - /* scan backwards and reverse direction of slash */ - temp = strrchr(options, '/'); - if(temp > options + 6) - *temp = '\\'; if(ipaddr) { strncat(options,",ip=",4); strcat(options,ipaddr); @@ -538,7 +533,7 @@ int main(int argc, char ** argv) printf("mount error: cifs filesystem not supported by the system\n"); break; default: - printf("mount error %d = %s\n",errno,strerror(errno)); + printf("mount error %d = %s",errno,strerror(errno)); } printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n"); return -1; |