search for: do_upload

...,6 +795,7 @@ offset += len; xfree(data); + statbytes = offset; } status = do_close(fd_in, fd_out, handle, handle_len); @@ -807,15 +818,18 @@ } done: + if (progressbar) + (progressbar)(1); close(local_fd); buffer_free(&msg); xfree(handle); + return status; } int do_upload(int fd_in, int fd_out, char *local_path, char *remote_path, - int pflag) + int pflag, void (*progressbar)(int)) { int local_fd; u_int handle_len, id; @@ -865,6 +879,10 @@ buffer_free(&msg); return(-1); } + totalbytes = a.size; + curfile = local_path; + if (progressbar) + (p...

...tatbytes = offset; } status = do_close(fd_in, fd_out, handle, handle_len); @@ -802,15 +813,21 @@ } done: + if (progressbar) + (progressbar)(1); close(local_fd); buffer_free(&msg); xfree(handle); + statbytes = 0; + totalbytes = 0; + curfile = NULL; + return status; } int do_upload(int fd_in, int fd_out, char *local_path, char *remote_path, - int pflag) + int pflag, void (*progressbar)(int)) { int local_fd; u_int handle_len, id; @@ -860,6 +877,10 @@ buffer_free(&msg); return(-1); } + totalbytes = a.size; + curfile = local_path; + if (progressbar) + (p...

...offset = 0; + +#ifdef REGET + if (rflag) { + long posn; + posn = lseek(local_fd, 0L, SEEK_END); + debug3("reget: restarting at file position %ld\n", posn); + offset = (u_int64_t)posn; + } +#endif + max_req = 1; progress_counter = 0; @@ -969,8 +990,13 @@ } int +#ifdef REGET +do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, + int pflag, int rflag) +#else do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, int pflag) +#endif { int local_fd, status; u_int handle_len, id, type; @@ -1023,6 +1049,13 @@ buffer_put_char(&msg,...

...t; command in a sftp session, as describe in "draft-ietf-secsh-filexfer-01" and further releases. It is for and had been tested on the current version of OpenSSH (the Portable CVS) and it works, also against non patched versions. The patch is "simple" it it just like the "do_upload" function in "sftp-client.c". Pseudo Instruction of the new "do_append" function: 1) stat_remote_file This will return an Attrib struct to know the remote file size. 2) open_remote_file Open the remote file without the "SSH2_FXF_TRUNC" flag...

...stdin /directory/filename') -i ~/.ssh/key user at remote.host sftp> put /dev/stdin /directory/filename /dev/stdin is not a regular file What is a purpose for such a behaviour and limitation? As experiment, I removed following piece of code which is responsible for this check (sftp-client.c, do_upload() function): if (!S_ISREG(sb.st_mode)) { error("%s is not a regular file", local_path); close(local_fd); return(-1); } and nothing bad happened. It was still possible to upload regular files, but additionaly there was an op...

...******** *** 90,97 **** /* Rename 'oldpath' to 'newpath' */ int do_symlink(struct sftp_conn *, char *, char *); /* Return target of symlink 'path' - caller must free result */ ! char *do_readlink(struct sftp_conn *, char *); /* XXX: add callbacks to do_download/do_upload so we can do progress meter */ --- 90,100 ---- /* Rename 'oldpath' to 'newpath' */ int do_symlink(struct sftp_conn *, char *, char *); + /* Download symlink 'path' */ + int do_getlink(struct sftp_conn *, char *); + /* Return target of symlink 'path' - ca...

...+ local_tmp = path_append(local_path, f->d_name); + remote_tmp = path_append(remote_path, f->d_name); + err = do_recursive_upload(conn, local_tmp, remote_tmp, + pflag); + xfree(remote_tmp); + xfree(local_tmp); + if (err == -1) + break; + } + closedir(d); + } else + err = do_upload(conn, local_path, remote_path, pflag); +END: + return err; +} + +static int process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag) { char *abs_src = NULL; @@ -482,7 +588,7 @@ abs_dst = tmp; printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst); - if...

...| ------- Comment #1 from djm at mindrot.org 2007-01-22 18:03 ------- Created an attachment (id=1232) --> (http://bugzilla.mindrot.org/attachment.cgi?id=1232&action=view) propogate error status on upload falure Thanks for the report. This is a bug in sftp-client.c:do_upload(). The error status on a write failure was not being returned to the caller. BTW in interactive mode (the default when sftp is started for a tty), the return value will be zero anyway because the sftp client exits normally. A better demonstration is batch mode, where the sftp client's exit sta...

...le OpenSSH Version: -current Platform: All OS/Version: other Status: NEW Severity: major Priority: P2 Component: sftp AssignedTo: openssh-unix-dev at mindrot.org ReportedBy: chombier at mac.com In sftp_client.c, do_upload() function, the 'id' variable is used for both the sent and the received message ids, this corrupts the id of the messages to send and randomly generates upload failures. The fix is to use another variable to extract the received message id, status_id, as done in do_download() ------...

...- printf("Fetching %s to %s\n", g.gl_pathv[0], abs_dst); err = do_download(in, out, g.gl_pathv[0], abs_dst, pflag); goto out; } @@ -464,7 +463,6 @@ } abs_dst = make_absolute(abs_dst, pwd); } - printf("Uploading %s to %s\n", g.gl_pathv[0], abs_dst); err = do_upload(in, out, g.gl_pathv[0], abs_dst, pflag); goto out; }

A better way to solve this I think. Rich.

...rite at at time during copies */ /* XXX: what should this be? */ -#define COPY_SIZE 8192 +/* MTB: get around the issue by using a dynamic value with the same default. */ +/* #define COPY_SIZE 8129 */ +extern unsigned int COPY_SIZE; /* Message ID */ static u_int msg_id = 1; @@ -870,7 +872,11 @@ do_upload(int fd_in, int fd_out, char *l offset = 0; for(;;) { int len; - char data[COPY_SIZE]; + char *data; + + if ((data = malloc(COPY_SIZE)) == NULL) + fatal("Couldn't allocate %ld bytes for data buffer; %s", + (long)COPY_SIZE, strerror(errno)); /* * Can't use...

Hello all Im using sftp 1:4.7p1-8ubuntu1.2 in a batchjob Ive noticed that sftp needs a long time for sending a filelist. The timespan increases exponential if many files are on the remoteserver. for example "ls -la *.txt" needs 10 seconds for 2000 files but needs 50 seconds for 4000 files. For 150.000 Files i have to wait 15 minutes for example but the

...us messages */ #define SSH2_FX_OK 0 #define SSH2_FX_EOF 1 Index: ssh/sftp-client.c =================================================================== --- ssh.orig/sftp-client.c 2009-02-12 14:11:30.000000000 +0100 +++ ssh/sftp-client.c 2009-02-12 14:11:37.000000000 +0100 @@ -1201,6 +1201,7 @@ do_upload(struct sftp_conn *conn, char * } stat_to_attrib(&sb, &a); + a.ext_flags = 0; a.flags &= ~SSH2_FILEXFER_ATTR_SIZE; a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID; a.perm &= 0777;

If we can get people to test their platforms against the last snapshot/cvs tree I'd be greatful. (http://www.openssh.com/portable.html) I know NeXT platform has problems. I'm going to spend tonight looking at it. Also, take a moment to see what manpage type ./configure decided for your system and if it's 'cat' please let us know. Thanks. - Ben

...ev = STREQLEN (pathordevice, "/dev/", 5); buf = is_dev ? strdup (pathordevice) : sysroot_path (pathordevice); if (buf == NULL) { diff --git a/daemon/upload.c b/daemon/upload.c index da86bd6..7b2ccea 100644 --- a/daemon/upload.c +++ b/daemon/upload.c @@ -40,7 +40,7 @@ do_upload (const char *filename) { int err, fd, r, is_dev; - is_dev = strncmp (filename, "/dev/", 5) == 0; + is_dev = STREQLEN (filename, "/dev/", 5); if (!is_dev) { if (!root_mounted || filename[0] != '/') { cancel_receive (); @@ -93,7 +93,7 @@ do_download (...

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

...rs); \ - } \ - } while (0) + } while (0) /* Is it a device? */ if (len < 5 || STREQLEN (text, "/dev/", 5)) { diff --git a/fish/file-edit.c b/fish/file-edit.c index a703021..3978c1b 100644 --- a/fish/file-edit.c +++ b/fish/file-edit.c @@ -252,7 +252,7 @@ do_upload (guestfs_h *g, const char *fn, const char *tempfile, * file to match the old file (RHBZ#788641). */ if (guestfs_copy_attributes (g, filename, newname, - GUESTFS_COPY_ATTRIBUTES_ALL, 1, -1) == -1) + GUESTFS_COPY_ATTRIBUTES_ALL, 1, -1) == -1) return -1; /* Backup or...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.