summaryrefslogtreecommitdiffstats
path: root/src/dir.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2008-06-02 23:41:25 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2008-06-02 23:41:25 +0200
commit35cdeeff7c16480e213dfffaba3f5de8442f1c3e (patch)
tree453f19ad2d80f1dc8e976fa39a5e136c2382762e /src/dir.c
parent3d61b96643f3a52b0403280cb3ead6bcf9ab2c61 (diff)
Fix filenames when copying accentuated filenames from a FAT under MacOSX
Diffstat (limited to 'src/dir.c')
-rw-r--r--src/dir.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/dir.c b/src/dir.c
index af56980..89ee0bd 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -627,13 +627,7 @@ static int copy_dir(disk_t *disk_car, const partition_t *partition, dir_data_t *
int copy_ok=0;
if(dir_data->get_dir==NULL || dir_data->copy_file==NULL)
return -2;
- {
- int l1=strlen(dir_data->local_dir);
- int l2=strlen(dir_data->current_directory);
- dir_name=MALLOC(l1+l2+1);
- memcpy(dir_name,dir_data->local_dir,l1);
- filename_convert(dir_name+l1,dir_data->current_directory,l2+1);
- }
+ dir_name=gen_local_filename(dir_data->local_dir, dir_data->current_directory);
create_dir(dir_name,1);
dir_list=dir_data->get_dir(disk_car, partition,dir_data, (const unsigned long int)dir->filestat.st_ino);
for(current_file=dir_list;current_file!=NULL;current_file=current_file->next)