[gridftp-commit] CVS update: MODIFIED: source, globus_url_copy.c ...

[Mike Link]

  User: mlink   
  Date: 09/07/16 14:20:03

  Modified:    copy/source Tag: globus_4_2_branch globus_gass_copy_glob.c
                        globus_url_copy.c
  Log:
  fix globbing for encoded urls
  accept non-encoded paths if not a url.
  
  Revision  Changes    Path
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gass/copy/source/Tag:
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gass/copy/source/globus_4_2_branch
  1.20.2.1  +3 -0      gass/copy/source/globus_gass_copy_glob.c
  
  http://viewcvs.globus.org/viewcvs.cgi/gass/copy/source/globus_gass_copy_glob.c.diff?r1=1.20&r2=1.20.2.1
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_gass_copy_glob.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/gass/copy/source/globus_gass_copy_glob.c,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -b -r1.20 -r1.20.2.1
  --- globus_gass_copy_glob.c	6 Dec 2007 19:43:21 -0000	1.20
  +++ globus_gass_copy_glob.c	16 Jul 2009 19:20:03 -0000	1.20.2.1
  @@ -281,6 +281,8 @@
       info->base_url = globus_libc_strdup(info->url);
   
       info->glob_pattern = strrchr(info->base_url, '/');
  +    globus_url_string_hex_decode(info->glob_pattern);
  +    
       if(info->glob_pattern == GLOBUS_NULL || *info->glob_pattern == '\0')
       {
           result = globus_error_put(
  @@ -491,6 +493,7 @@
   
       info->base_url = globus_libc_strdup(info->url);
       info->glob_pattern = strrchr(info->base_url, '/');
  +    globus_url_string_hex_decode(info->glob_pattern);
       
       if(info->glob_pattern == GLOBUS_NULL || *info->glob_pattern == '\0')
       {
  
  
  
  1.100.2.6 +11 -5     gass/copy/source/globus_url_copy.c
  
  http://viewcvs.globus.org/viewcvs.cgi/gass/copy/source/globus_url_copy.c.diff?r1=1.100.2.5&r2=1.100.2.6
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_url_copy.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/gass/copy/source/globus_url_copy.c,v
  retrieving revision 1.100.2.5
  retrieving revision 1.100.2.6
  diff -u -b -r1.100.2.5 -r1.100.2.6
  --- globus_url_copy.c	24 Nov 2008 22:49:12 -0000	1.100.2.5
  +++ globus_url_copy.c	16 Jul 2009 19:20:03 -0000	1.100.2.6
  @@ -22,8 +22,8 @@
   CVS Information:
   
       $Source: /home/globdev/CVS/globus-packages/gass/copy/source/globus_url_copy.c,v $
  -    $Date: 2008/11/24 22:49:12 $
  -    $Revision: 1.100.2.5 $
  +    $Date: 2009/07/16 19:20:03 $
  +    $Revision: 1.100.2.6 $
       $Author: mlink $
   ******************************************************************************/
   
  @@ -2314,6 +2314,7 @@
       char *                              in_url)
   {
       char *                              tmp_ptr;
  +    char *                              tmp_path;
       char                                start_dir[PATH_MAX];
       char *                              dir_ptr = "";
   
  @@ -2335,8 +2336,13 @@
           }
           dir_ptr = start_dir;
       }
  -    tmp_ptr = globus_common_create_string("file://%s/%s",
  -        dir_ptr, in_url);
  +    tmp_path = globus_common_create_string("%s/%s", dir_ptr, in_url);
  +    dir_ptr = globus_url_string_hex_encode(tmp_path, "");
  +    
  +    tmp_ptr = globus_common_create_string("file://%s", dir_ptr);
  +    
  +    globus_free(dir_ptr);
  +    globus_free(tmp_path);
   
       return tmp_ptr;
   }