summaryrefslogtreecommitdiff
path: root/source4/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 06:36:30 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:39 -0500
commit35537c1255e9508b77fd9d9def1ac96e423bee46 (patch)
treef140c802a98188f13c891c02332d7604a71f45e3 /source4/client
parentf9529111af758191c0c3ad5794ea9a5fe1e2a59b (diff)
downloadsamba-35537c1255e9508b77fd9d9def1ac96e423bee46.tar.gz
samba-35537c1255e9508b77fd9d9def1ac96e423bee46.tar.bz2
samba-35537c1255e9508b77fd9d9def1ac96e423bee46.zip
r5302: fixed a compilation problem on solaris caused by the recent include
changes (This used to be commit e7e015f79b10c353848a17f31c91a0593790a560)
Diffstat (limited to 'source4/client')
-rw-r--r--source4/client/client.c19
-rw-r--r--source4/client/smbmount.c2
2 files changed, 8 insertions, 13 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 5413beb3ba..986f35b971 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -929,7 +929,7 @@ static void do_mget(struct clilist_file_info *finfo)
strlower(discard_const_p(char, finfo->name));
}
- if (!directory_exist(finfo->name,NULL) &&
+ if (!directory_exist(finfo->name) &&
mkdir(finfo->name,0777) != 0) {
d_printf("failed to create directory %s\n",finfo->name);
pstrcpy(cur_dir,saved_curdir);
@@ -1301,15 +1301,11 @@ static int cmd_put(const char **cmd_ptr)
dos_clean_name(rname);
- {
- struct stat st;
- /* allow '-' to represent stdin
- jdblair, 24.jun.98 */
- if (!file_exist(lname,&st) &&
- (strcmp(lname,"-"))) {
- d_printf("%s does not exist\n",lname);
- return 1;
- }
+ /* allow '-' to represent stdin
+ jdblair, 24.jun.98 */
+ if (!file_exist(lname) && (strcmp(lname,"-"))) {
+ d_printf("%s does not exist\n",lname);
+ return 1;
}
return do_put(rname, lname, False);
@@ -2479,7 +2475,6 @@ static int cmd_reput(const char **cmd_ptr)
pstring remote_name;
fstring buf;
char *p = buf;
- struct stat st;
pstrcpy(remote_name, cur_dir);
pstrcat(remote_name, "\\");
@@ -2490,7 +2485,7 @@ static int cmd_reput(const char **cmd_ptr)
}
pstrcpy(local_name, p);
- if (!file_exist(local_name, &st)) {
+ if (!file_exist(local_name)) {
d_printf("%s does not exist\n", local_name);
return 1;
}
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index e18fb311aa..7f73807ec6 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -496,7 +496,7 @@ static void init_mount(void)
asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR);
- if (file_exist(smbmnt_path, NULL)) {
+ if (file_exist(smbmnt_path)) {
execv(smbmnt_path, args);
fprintf(stderr,
"smbfs/init_mount: execv of %s failed. Error was %s.",