[BACK]Return to sftp.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sftp.c between version 1.111 and 1.112

version 1.111, 2009/08/18 18:36:21 version 1.112, 2009/11/20 00:54:01
Line 47 
Line 47 
 #include "sftp-common.h"  #include "sftp-common.h"
 #include "sftp-client.h"  #include "sftp-client.h"
   
   #define DEFAULT_COPY_BUFLEN     32768   /* Size of buffer for up/download */
   #define DEFAULT_NUM_REQUESTS    64      /* # concurrent outstanding requests */
   
 /* File to read commands from */  /* File to read commands from */
 FILE* infile;  FILE* infile;
   
 /* Are we in batchfile mode? */  /* Are we in batchfile mode? */
 int batchmode = 0;  int batchmode = 0;
   
 /* Size of buffer used when copying files */  
 size_t copy_buffer_len = 32768;  
   
 /* Number of concurrent outstanding requests */  
 size_t num_requests = 64;  
   
 /* PID of ssh transport process */  /* PID of ssh transport process */
 static pid_t sshpid = -1;  static pid_t sshpid = -1;
   
Line 164 
Line 161 
         { NULL,                 -1}          { NULL,                 -1}
 };  };
   
 int interactive_loop(int fd_in, int fd_out, char *file1, char *file2);  int interactive_loop(struct sftp_conn *, char *file1, char *file2);
   
 /* ARGSUSED */  /* ARGSUSED */
 static void  static void
Line 1447 
Line 1444 
 }  }
   
 int  int
 interactive_loop(int fd_in, int fd_out, char *file1, char *file2)  interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
 {  {
         char *pwd;          char *pwd;
         char *dir = NULL;          char *dir = NULL;
         char cmd[2048];          char cmd[2048];
         struct sftp_conn *conn;  
         int err, interactive;          int err, interactive;
         EditLine *el = NULL;          EditLine *el = NULL;
         History *hl = NULL;          History *hl = NULL;
Line 1474 
Line 1470 
                 el_source(el, NULL);                  el_source(el, NULL);
         }          }
   
         conn = do_init(fd_in, fd_out, copy_buffer_len, num_requests);  
         if (conn == NULL)  
                 fatal("Couldn't initialise connection to server");  
   
         pwd = do_realpath(conn, ".");          pwd = do_realpath(conn, ".");
         if (pwd == NULL)          if (pwd == NULL)
                 fatal("Need cwd");                  fatal("Need cwd");
Line 1646 
Line 1638 
         arglist args;          arglist args;
         extern int optind;          extern int optind;
         extern char *optarg;          extern char *optarg;
           struct sftp_conn *conn;
           size_t copy_buffer_len = DEFAULT_COPY_BUFLEN;
           size_t num_requests = DEFAULT_NUM_REQUESTS;
   
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */          /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();          sanitise_stdfd();
Line 1788 
Line 1783 
                 addargs(&args, "%s", (sftp_server != NULL ?                  addargs(&args, "%s", (sftp_server != NULL ?
                     sftp_server : "sftp"));                      sftp_server : "sftp"));
   
                 if (!batchmode)  
                         fprintf(stderr, "Connecting to %s...\n", host);  
                 connect_to_server(ssh_program, args.list, &in, &out);                  connect_to_server(ssh_program, args.list, &in, &out);
         } else {          } else {
                 args.list = NULL;                  args.list = NULL;
                 addargs(&args, "sftp-server");                  addargs(&args, "sftp-server");
   
                 if (!batchmode)  
                         fprintf(stderr, "Attaching to %s...\n", sftp_direct);  
                 connect_to_server(sftp_direct, args.list, &in, &out);                  connect_to_server(sftp_direct, args.list, &in, &out);
         }          }
         freeargs(&args);          freeargs(&args);
   
         err = interactive_loop(in, out, file1, file2);          conn = do_init(in, out, copy_buffer_len, num_requests);
           if (conn == NULL)
                   fatal("Couldn't initialise connection to server");
   
           if (!batchmode) {
                   if (sftp_direct == NULL)
                           fprintf(stderr, "Connected to %s.\n", host);
                   else
                           fprintf(stderr, "Attached to %s.\n", sftp_direct);
           }
   
           err = interactive_loop(conn, file1, file2);
   
         close(in);          close(in);
         close(out);          close(out);
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.112