[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.216 and 1.217

version 1.216, 2022/05/13 06:31:50 version 1.217, 2022/06/27 21:41:55
Line 2339 
Line 2339 
 int  int
 main(int argc, char **argv)  main(int argc, char **argv)
 {  {
         int in, out, ch, err, tmp, port = -1, noisy = 0;          int r, in, out, ch, err, tmp, port = -1, noisy = 0;
         char *host = NULL, *user, *cp, *file2 = NULL;          char *host = NULL, *user, *cp, **cpp, *file2 = NULL;
         int debug_level = 0;          int debug_level = 0;
         char *file1 = NULL, *sftp_server = NULL;          char *file1 = NULL, *sftp_server = NULL;
         char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;          char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;
Line 2535 
Line 2535 
   
                 connect_to_server(ssh_program, args.list, &in, &out);                  connect_to_server(ssh_program, args.list, &in, &out);
         } else {          } else {
                 args.list = NULL;                  if ((r = argv_split(sftp_direct, &tmp, &cpp, 1)) != 0)
                 addargs(&args, "sftp-server");                          fatal_r(r, "Parse -D arguments");
                   if (cpp[0] == 0)
                 connect_to_server(sftp_direct, args.list, &in, &out);                          fatal("No sftp server specified via -D");
                   connect_to_server(cpp[0], cpp, &in, &out);
                   argv_free(cpp, tmp);
         }          }
         freeargs(&args);          freeargs(&args);
   

Legend:
Removed from v.1.216  
changed lines
  Added in v.1.217