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

Diff for /src/usr.bin/ssh/scp.c between version 1.258 and 1.259

version 1.258, 2023/09/08 05:56:13 version 1.259, 2023/09/10 23:12:32
Line 158 
Line 158 
 /* Needed for sftp */  /* Needed for sftp */
 volatile sig_atomic_t interrupted = 0;  volatile sig_atomic_t interrupted = 0;
   
 int remote_glob(struct sftp_conn *, const char *, int,  int sftp_glob(struct sftp_conn *, const char *, int,
     int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */      int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
   
 static void  static void
Line 1507 
Line 1507 
         }          }
   
         debug3_f("copying remote %s to local %s", abs_src, dst);          debug3_f("copying remote %s to local %s", abs_src, dst);
         if ((r = remote_glob(conn, abs_src, GLOB_NOCHECK|GLOB_MARK,          if ((r = sftp_glob(conn, abs_src, GLOB_NOCHECK|GLOB_MARK,
             NULL, &g)) != 0) {              NULL, &g)) != 0) {
                 if (r == GLOB_NOSPACE)                  if (r == GLOB_NOSPACE)
                         error("%s: too many glob matches", src);                          error("%s: too many glob matches", src);
Line 1932 
Line 1932 
         }          }
   
         debug3_f("copying remote %s to remote %s", abs_src, target);          debug3_f("copying remote %s to remote %s", abs_src, target);
         if ((r = remote_glob(from, abs_src, GLOB_NOCHECK|GLOB_MARK,          if ((r = sftp_glob(from, abs_src, GLOB_NOCHECK|GLOB_MARK,
             NULL, &g)) != 0) {              NULL, &g)) != 0) {
                 if (r == GLOB_NOSPACE)                  if (r == GLOB_NOSPACE)
                         error("%s: too many glob matches", src);                          error("%s: too many glob matches", src);
Legend:
Removed from v.1.258  
changed lines
  Added in v.1.259