luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PhotoRec: when renaming file, filter out name with too much bad chars

Browse source
This commit is contained in:
Christophe Grenier 2011-09-17 17:08:03 +02:00
parent 6cc686c84a
commit 54897586fd
1 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/filegen.c
View file

@ -382,7 +382,10 @@ void file_rename(const char *old_filename, const unsigned char *buffer, const in
/* Add original filename */
if(offset < buffer_size && buffer!=NULL)
{
char *dst_old=dst;
int off;
int ok=0;
int bad=0;
*dst++ = '_';
for(off=offset; off<buffer_size && buffer[off]!='\0'; off++)
{
@ -393,15 +396,29 @@ void file_rename(const char *old_filename, const unsigned char *buffer, const in
case ':':
case '*':
*dst++ = '_';
bad++;
break;
default:
if(isprint(buffer[off]) && !isspace(buffer[off]))
{
*dst++ = buffer[off];
ok++;
}
else
{
*dst++ = '_';
bad++;
}
break;
}
}
if(ok <= bad)
dst=dst_old;
else
{
while(dst > dst_old && *(dst-1)=='_')
dst--;
}
}
/* Add extension */
if(new_ext!=NULL)
@ -458,7 +475,10 @@ void file_rename_unicode(const char *old_filename, const unsigned char *buffer,
/* Add original filename */
if(offset < buffer_size && buffer!=NULL)
{
char *dst_old=dst;
int off;
int ok=0;
int bad=0;
*dst++ = '_';
for(off=offset; off<buffer_size && buffer[off]!='\0'; off+=2)
{
@ -469,15 +489,29 @@ void file_rename_unicode(const char *old_filename, const unsigned char *buffer,
case ':':
case '*':
*dst++ = '_';
bad++;
break;
default:
if(isprint(buffer[off]) && !isspace(buffer[off]))
{
*dst++ = buffer[off];
ok++;
}
else
{
*dst++ = '_';
bad++;
}
break;
}
}
if(ok <= bad)
dst=dst_old;
else
{
while(dst > dst_old && *(dst-1)=='_')
dst--;
}
}
/* Add extension */
if(new_ext!=NULL)