opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Appended a number to undeleted file name to avoid overwriting an existing one 

When an undeleted file name conflicts with an existing one, it is
renamed in order to preserve the existing one.
pull/2/head
Jean-Pierre André 2018-06-01 16:21:33 +02:00
parent a951ed7f61
commit e758709a2c
1 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ntfsprogs/ntfsundelete.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 2004-2005 Holger Ohmacht
* Copyright (c) 2005 Anton Altaparmakov
* Copyright (c) 2007 Yura Pakhuchiy
* Copyright (c) 2013-2014 Jean-Pierre Andre
* Copyright (c) 2013-2018 Jean-Pierre Andre
*
* This utility will recover deleted files from an NTFS volume.
*
@ -392,7 +392,7 @@ static void version(void)
"Copyright (c) 2004-2005 Holger Ohmacht\n"
"Copyright (c) 2005 Anton Altaparmakov\n"
"Copyright (c) 2007 Yura Pakhuchiy\n"
"Copyright (c) 2013-2014 Jean-Pierre Andre\n");
"Copyright (c) 2013-2018 Jean-Pierre Andre\n");
ntfs_log_info("\n%s\n%s%s\n", ntfs_gpl, ntfs_bugs, ntfs_home);
}
@ -1835,19 +1835,49 @@ static unsigned int write_data(int fd, const char *buffer,
static int create_pathname(const char *dir, const char *name,
const char *stream, char *buffer, int bufsize)
{
struct stat st;
int s;
int len;
int suffix;
if (!name)
name = UNKNOWN;
if (dir)
if (dir) {
#ifdef HAVE_WINDOWS_H
if (stream)
snprintf(buffer, bufsize, "%s/%s:%s", dir, name, stream);
snprintf(buffer, bufsize, "%s\\%s:%s", dir, name,
stream);
else
snprintf(buffer, bufsize, "%s\\%s", dir, name);
#else
if (stream)
snprintf(buffer, bufsize, "%s/%s:%s", dir, name,
stream);
else
snprintf(buffer, bufsize, "%s/%s", dir, name);
else
#endif
} else
if (stream)
snprintf(buffer, bufsize, "%s:%s", name, stream);
else
snprintf(buffer, bufsize, "%s", name);
len = strlen(buffer);
suffix = 0;
#ifdef HAVE_WINDOWS_H
s = stat(buffer, &st);
#else
s = lstat(buffer, &st);
#endif
while (!s && (suffix < 999)) {
suffix++;
snprintf(&buffer[len], bufsize - len, ".%d", suffix);
#ifdef HAVE_WINDOWS_H
s = stat(buffer, &st);
#else
s = lstat(buffer, &st);
#endif
}
return strlen(buffer);
}
@ -2012,7 +2042,8 @@ static int undelete_file(ntfs_volume *vol, long long inode)
if (d->resident) {
fd = open_file(pathname);
if (fd < 0) {
ntfs_log_perror("Couldn't create file");
ntfs_log_perror("Couldn't create file %s",
pathname);
goto free;
}
@ -2041,7 +2072,8 @@ static int undelete_file(ntfs_volume *vol, long long inode)
fd = open_file(pathname);
if (fd < 0) {
ntfs_log_perror("Couldn't create output file");
ntfs_log_perror("Couldn't create file %s",
pathname);
goto free;
}
@ -2151,9 +2183,11 @@ static int undelete_file(ntfs_volume *vol, long long inode)
}
set_date(pathname, file->date);
if (d->name)
ntfs_log_quiet("Undeleted '%s:%s' successfully.\n", file->pref_name, d->name);
ntfs_log_quiet("Undeleted '%s:%s' successfully to %s.\n",
file->pref_name, d->name, pathname);
else
ntfs_log_quiet("Undeleted '%s' successfully.\n", file->pref_name);
ntfs_log_quiet("Undeleted '%s' successfully to %s.\n",
file->pref_name, pathname);
}
result = 1;
free:
@ -2348,7 +2382,7 @@ static int copy_mft(ntfs_volume *vol, long long mft_begin, long long mft_end)
create_pathname(opts.dest, name, NULL, pathname, sizeof(pathname));
fd = open_file(pathname);
if (fd < 0) {
ntfs_log_perror("Couldn't open output file '%s'", name);
ntfs_log_perror("Couldn't create output file '%s'", name);
goto attr;
}
@ -2376,6 +2410,7 @@ static int copy_mft(ntfs_volume *vol, long long mft_begin, long long mft_end)
}
ntfs_log_verbose("Read %lld MFT Records\n", mft_end - mft_begin + 1);
ntfs_log_quiet("MFT extracted to file %s\n", pathname);
result = 0;
close:
close(fd);