it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
#include "libsmbclient.h"
#if _FILE_OFFSET_BITS==64
static int nonprompt = 0, quiet = 0, dots = 0, keep_permissions = 0, verbose = 0, send_stdout = 0;
static int blocksize = SMB_DEFAULT_BLOCKSIZE;
-static int smb_download_file(const char *base, const char *name, int recursive, int resume, char *outfile);
+static int smb_download_file(const char *base, const char *name, int recursive,
+ int resume, int toplevel, char *outfile);
static int get_num_cols(void)
{
static void human_readable(off_t s, char *buffer, int l)
{
- if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGb", 1.0 * s / (1024 * 1024 * 1024));
- else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMb", 1.0 * s / (1024 * 1024));
- else if(s > 1024) snprintf(buffer, l, "%.2fkb", 1.0 * s / 1024);
- else snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
+ if (s > 1024 * 1024 * 1024) {
+ snprintf(buffer, l, "%.2fGB", 1.0 * s / (1024 * 1024 * 1024));
+ } else if (s > 1024 * 1024) {
+ snprintf(buffer, l, "%.2fMB", 1.0 * s / (1024 * 1024));
+ } else if (s > 1024) {
+ snprintf(buffer, l, "%.2fkB", 1.0 * s / 1024);
+ } else {
+ snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
+ }
}
static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, char *un, int unlen, char *pw, int pwlen)
if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
return;
}
- if(tmp[strlen(tmp)-1] == '\n')tmp[strlen(tmp)-1] = '\0';
+ if ((strlen(tmp) > 0) && (tmp[strlen(tmp)-1] == '\n')) {
+ tmp[strlen(tmp)-1] = '\0';
+ }
strncpy(un, tmp, unlen-1);
} else if(username) strncpy(un, username, unlen-1);
free(wgtmp); free(usertmp);
}
+/* Return 1 on error, 0 on success. */
+
static int smb_download_dir(const char *base, const char *name, int resume)
{
char path[SMB_MAXPATHLEN];
const char *relname = name;
char *tmpname;
struct stat remotestat;
+ int ret = 0;
+
snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (base[0] && name[0] && name[0] != '/' && base[strlen(base)-1] != '/')?"/":"", name);
/* List files in directory and call smb_download_file on them */
dirhandle = smbc_opendir(path);
if(dirhandle < 1) {
- if(errno == ENOTDIR) return smb_download_file(base, name, 1, resume, NULL);
+ if (errno == ENOTDIR) {
+ return smb_download_file(base, name, 1, resume,
+ 0, NULL);
+ }
fprintf(stderr, "Can't open directory %s: %s\n", path, strerror(errno));
- return 0;
+ return 1;
}
while(*relname == '/')relname++;
mkdir(relname, 0755);
-
+
tmpname = SMB_STRDUP(name);
while((dirent = smbc_readdir(dirhandle))) {
char *newname;
if(!strcmp(dirent->name, ".") || !strcmp(dirent->name, ".."))continue;
if (asprintf(&newname, "%s/%s", tmpname, dirent->name) == -1) {
- return 0;
+ return 1;
}
switch(dirent->smbc_type) {
case SMBC_DIR:
- smb_download_dir(base, newname, resume);
+ ret = smb_download_dir(base, newname, resume);
break;
case SMBC_WORKGROUP:
- smb_download_dir("smb://", dirent->name, resume);
+ ret = smb_download_dir("smb://", dirent->name, resume);
break;
case SMBC_SERVER:
- smb_download_dir("smb://", dirent->name, resume);
+ ret = smb_download_dir("smb://", dirent->name, resume);
break;
case SMBC_FILE:
- smb_download_file(base, newname, 1, resume, NULL);
+ ret = smb_download_file(base, newname, 1, resume, 0,
+ NULL);
break;
case SMBC_FILE_SHARE:
- smb_download_dir(base, newname, resume);
+ ret = smb_download_dir(base, newname, resume);
break;
case SMBC_PRINTER_SHARE:
case SMBC_COMMS_SHARE:
if(!quiet)printf("Ignoring comms share %s\n", dirent->name);
break;
-
+
case SMBC_IPC_SHARE:
if(!quiet)printf("Ignoring ipc$ share %s\n", dirent->name);
break;
if(smbc_fstat(dirhandle, &remotestat) < 0) {
fprintf(stderr, "Unable to get stats on %s on remote server\n", path);
smbc_closedir(dirhandle);
- return 0;
+ return 1;
}
-
+
if(chmod(relname, remotestat.st_mode) < 0) {
fprintf(stderr, "Unable to change mode of local dir %s to %o\n", relname,
(unsigned int)remotestat.st_mode);
smbc_closedir(dirhandle);
- return 0;
+ return 1;
}
}
smbc_closedir(dirhandle);
- return 1;
+ return ret;
}
static char *print_time(long t)
if (len == -1) {
return;
}
-
+
if(columns) {
int required = strlen(name), available = columns - len - strlen("[] ");
if(required > available) {
free(filename); free(status);
}
-static int smb_download_file(const char *base, const char *name, int recursive, int resume, char *outfile) {
+/* Return 1 on error, 0 on success. */
+
+static int smb_download_file(const char *base, const char *name, int recursive,
+ int resume, int toplevel, char *outfile)
+{
int remotehandle, localhandle;
- time_t start_time = time(NULL);
+ time_t start_time = time_mono(NULL);
const char *newpath;
char path[SMB_MAXPATHLEN];
char checkbuf[2][RESUME_CHECK_SIZE];
struct stat localstat, remotestat;
snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (*base && *name && name[0] != '/' && base[strlen(base)-1] != '/')?"/":"", name);
-
+
remotehandle = smbc_open(path, O_RDONLY, 0755);
if(remotehandle < 0) {
case EISDIR:
if(!recursive) {
fprintf(stderr, "%s is a directory. Specify -R to download recursively\n", path);
- return 0;
+ return 1;
}
- smb_download_dir(base, name, resume);
- return 0;
+ return smb_download_dir(base, name, resume);
case ENOENT:
fprintf(stderr, "%s can't be found on the remote server\n", path);
- return 0;
+ return 1;
case ENOMEM:
fprintf(stderr, "Not enough memory\n");
- exit(1);
- return 0;
+ return 1;
case ENODEV:
fprintf(stderr, "The share name used in %s does not exist\n", path);
- return 0;
+ return 1;
case EACCES:
fprintf(stderr, "You don't have enough permissions to access %s\n", path);
- return 0;
+ return 1;
default:
perror("smbc_open");
- return 0;
+ return 1;
}
}
if(smbc_fstat(remotehandle, &remotestat) < 0) {
fprintf(stderr, "Can't stat %s: %s\n", path, strerror(errno));
- return 0;
+ return 1;
}
if(outfile) newpath = outfile;
if(newpath)newpath++; else newpath = base;
} else newpath = name;
- if(newpath[0] == '/')newpath++;
-
+ if (!toplevel && (newpath[0] == '/')) {
+ newpath++;
+ }
+
/* Open local file according to the mode */
if(update) {
/* if it is up-to-date, skip */
fprintf(stderr, "Can't open %s : %s\n", newpath,
strerror(errno));
smbc_close(remotehandle);
- return 0;
+ return 1;
}
/* no offset */
} else if(!send_stdout) {
if(localhandle < 0) {
fprintf(stderr, "Can't open %s: %s\n", newpath, strerror(errno));
smbc_close(remotehandle);
- return 0;
+ return 1;
}
-
+
if (fstat(localhandle, &localstat) != 0) {
fprintf(stderr, "Can't fstat %s: %s\n", newpath, strerror(errno));
smbc_close(remotehandle);
close(localhandle);
- return 0;
+ return 1;
}
start_offset = localstat.st_size;
else if(!quiet)fprintf(stderr, "%s\n", path);
smbc_close(remotehandle);
close(localhandle);
- return 1;
+ return 0;
}
if(localstat.st_size > RESUME_CHECK_OFFSET && remotestat.st_size > RESUME_CHECK_OFFSET) {
fprintf(stderr, "Can't seek to "OFF_T_FORMAT" in local file %s\n",
(OFF_T_FORMAT_CAST)offset_check, newpath);
smbc_close(remotehandle); close(localhandle);
- return 0;
+ return 1;
}
off2 = smbc_lseek(remotehandle, offset_check, SEEK_SET);
fprintf(stderr, "Can't seek to "OFF_T_FORMAT" in remote file %s\n",
(OFF_T_FORMAT_CAST)offset_check, newpath);
smbc_close(remotehandle); close(localhandle);
- return 0;
+ return 1;
}
if(off1 != off2) {
fprintf(stderr, "Offset in local and remote files is different (local: "OFF_T_FORMAT", remote: "OFF_T_FORMAT")\n",
(OFF_T_FORMAT_CAST)off1,
(OFF_T_FORMAT_CAST)off2);
- return 0;
+ smbc_close(remotehandle); close(localhandle);
+ return 1;
}
if(smbc_read(remotehandle, checkbuf[0], RESUME_CHECK_SIZE) != RESUME_CHECK_SIZE) {
fprintf(stderr, "Can't read %d bytes from remote file %s\n", RESUME_CHECK_SIZE, path);
smbc_close(remotehandle); close(localhandle);
- return 0;
+ return 1;
}
if(read(localhandle, checkbuf[1], RESUME_CHECK_SIZE) != RESUME_CHECK_SIZE) {
fprintf(stderr, "Can't read %d bytes from local file %s\n", RESUME_CHECK_SIZE, name);
smbc_close(remotehandle); close(localhandle);
- return 0;
+ return 1;
}
if(memcmp(checkbuf[0], checkbuf[1], RESUME_CHECK_SIZE) == 0) {
} else {
fprintf(stderr, "Local and remote file appear to be different, not doing resume for %s\n", path);
smbc_close(remotehandle); close(localhandle);
- return 0;
+ return 1;
}
}
} else {
}
readbuf = (char *)SMB_MALLOC(blocksize);
+ if (!readbuf) {
+ return 1;
+ }
/* Now, download all bytes from offset_download to the end */
for(curpos = offset_download; curpos < remotestat.st_size; curpos+=blocksize) {
smbc_close(remotehandle);
if (localhandle != STDOUT_FILENO) close(localhandle);
free(readbuf);
- return 0;
+ return 1;
}
total_bytes += bytesread;
free(readbuf);
smbc_close(remotehandle);
if (localhandle != STDOUT_FILENO) close(localhandle);
- return 0;
+ return 1;
}
if(dots)fputc('.', stderr);
else if(!quiet) {
- print_progress(newpath, start_time, time(NULL), start_offset, curpos, remotestat.st_size);
+ print_progress(newpath, start_time, time_mono(NULL),
+ start_offset, curpos, remotestat.st_size);
}
}
(unsigned int)remotestat.st_mode);
smbc_close(remotehandle);
close(localhandle);
- return 0;
+ return 1;
}
}
smbc_close(remotehandle);
if (localhandle != STDOUT_FILENO) close(localhandle);
- return 1;
+ return 0;
}
static void clean_exit(void)
char bs[100];
human_readable(total_bytes, bs, sizeof(bs));
if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs,
- (unsigned long)(time(NULL) - total_start_time));
+ (unsigned long)(time_mono(NULL) - total_start_time));
exit(0);
}
bool smb_encrypt = false;
int resume = 0, recursive = 0;
TALLOC_CTX *frame = talloc_stackframe();
+ int ret = 0;
struct poptOption long_options[] = {
{"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" },
{"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },
{"verbose", 'v', POPT_ARG_NONE, &verbose, 'v', "Be verbose" },
{"keep-permissions", 'P', POPT_ARG_NONE, &keep_permissions, 'P', "Keep permissions" },
{"blocksize", 'b', POPT_ARG_INT, &blocksize, 'b', "Change number of bytes in a block"},
- {"rcfile", 'f', POPT_ARG_STRING, NULL, 0, "Use specified rc file"},
+ {"rcfile", 'f', POPT_ARG_STRING, NULL, 'f', "Use specified rc file"},
POPT_AUTOHELP
POPT_TABLEEND
};
if (smb_encrypt) {
SMBCCTX *smb_ctx = smbc_set_context(NULL);
smbc_option_set(smb_ctx,
- CONST_DISCARD(char *, "smb_encrypt_level"),
+ discard_const_p(char, "smb_encrypt_level"),
"require");
}
-
+
columns = get_num_cols();
- total_start_time = time(NULL);
+ total_start_time = time_mono(NULL);
while ( (file = poptGetArg(pc)) ) {
if (!recursive)
- return smb_download_file(file, "", recursive, resume, outputfile);
+ ret = smb_download_file(file, "", recursive, resume,
+ 1, outputfile);
else
- return smb_download_dir(file, "", resume);
+ ret = smb_download_dir(file, "", resume);
}
- clean_exit();
TALLOC_FREE(frame);
- return 0;
+ if ( ret == 0){
+ clean_exit();
+ }
+ return ret;
}
git.samba.org / ira / wip.git / blobdiff