This commit is contained in:
Christophe Grenier 2017-12-02 18:45:34 +01:00
parent a90561d374
commit b3637b25c9
27 changed files with 44 additions and 44 deletions

5
INFO
View file

@ -1,3 +1,2 @@
TestDisk & PhotoRec , http://www.cgsecurity.org TestDisk & PhotoRec , https://www.cgsecurity.org
Copyright (C) 1998-2016 Christophe GRENIER <grenier@cgsecurity.org> Copyright (C) 1998-2017 Christophe GRENIER <grenier@cgsecurity.org>

View file

@ -68,6 +68,6 @@ Both are under GNU General Public License.
Christophe GRENIER Christophe GRENIER
[grenier@cgsecurity.org](mailto:grenier@cgsecurity.org) [grenier@cgsecurity.org](mailto:grenier@cgsecurity.org)
[http://www.cgsecurity.org/](http://www.cgsecurity.org/) [https://www.cgsecurity.org/](https://www.cgsecurity.org/)
[![Build Status](https://travis-ci.org/cgsecurity/testdisk.svg?branch=master)](https://travis-ci.org/cgsecurity/testdisk) [![Build Status](https://travis-ci.org/cgsecurity/testdisk.svg?branch=master)](https://travis-ci.org/cgsecurity/testdisk)

View file

@ -9,8 +9,8 @@ Summary(fr.UTF8): Outil pour vérifier et restaurer des partitions
Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.cgsecurity.org/wiki/TestDisk URL: https://www.cgsecurity.org/wiki/TestDisk
Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 Source0: https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
BuildArch: noarch BuildArch: noarch
BuildRequires: libtool autoconf automake BuildRequires: libtool autoconf automake

View file

@ -9,8 +9,8 @@ Summary(fr.UTF8): Outil pour vérifier et restaurer des partitions
Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.cgsecurity.org/wiki/TestDisk URL: https://www.cgsecurity.org/wiki/TestDisk
Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 Source0: https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
BuildArch: noarch BuildArch: noarch
BuildRequires: libtool autoconf automake BuildRequires: libtool autoconf automake

View file

@ -7,8 +7,8 @@ Version: 7.1
Release: 0%{?dist} Release: 0%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 Source0: https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
URL: http://www.cgsecurity.org/wiki/TestDisk URL: https://www.cgsecurity.org/wiki/TestDisk
BuildRequires: libtool autoconf automake BuildRequires: libtool autoconf automake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel

View file

@ -2,5 +2,5 @@ This Mac OS X version of TestDisk & PhotoRec should work on Intel processor
(Mac Book, Mac Pro...) (Mac Book, Mac Pro...)
TestDisk & PhotoRec documentation can be found online: TestDisk & PhotoRec documentation can be found online:
- http://www.cgsecurity.org/wiki/TestDisk - https://www.cgsecurity.org/wiki/TestDisk
- http://www.cgsecurity.org/wiki/PhotoRec - https://www.cgsecurity.org/wiki/PhotoRec

View file

@ -3,5 +3,5 @@ This Mac OS X version of TestDisk & PhotoRec should work on
- Intel processor with Rosetta. - Intel processor with Rosetta.
TestDisk & PhotoRec documentation can be found online: TestDisk & PhotoRec documentation can be found online:
- http://www.cgsecurity.org/wiki/TestDisk - https://www.cgsecurity.org/wiki/TestDisk
- http://www.cgsecurity.org/wiki/PhotoRec - https://www.cgsecurity.org/wiki/PhotoRec

View file

@ -8,8 +8,9 @@
<body> <body>
TestDisk &amp; PhotoRec documentation can be found online: TestDisk &amp; PhotoRec documentation can be found online:
<ul> <ul>
<li><a href="http://www.cgsecurity.org/wiki/TestDisk">TestDisk</a></li> <li><a href="https://www.cgsecurity.org/wiki/TestDisk">TestDisk</a></li>
<li><a href="http://www.cgsecurity.org/wiki/PhotoRec">PhotoRec</a></li> <li><a href="https://www.cgsecurity.org/wiki/PhotoRec">PhotoRec</a></li>
<li><a href="https://www.cgsecurity.org/testdisk.pdf">testdisk.pdf</a></li>
</ul> </ul>
</body> </body>
</html> </html>

View file

@ -5,8 +5,8 @@ The DOS version of TestDisk & PhotoRec should work under
- Windows 98 - Windows 98
If you are using NT 4, Windows 2000..., run the Windows version of TestDisk. If you are using NT 4, Windows 2000..., run the Windows version of TestDisk.
You can download it from http://www.cgsecurity.org/wiki/TestDisk_Download You can download it from https://www.cgsecurity.org/wiki/TestDisk_Download
TestDisk & PhotoRec documentation can be found online: TestDisk & PhotoRec documentation can be found online:
- http://www.cgsecurity.org/wiki/TestDisk - https://www.cgsecurity.org/wiki/TestDisk
- http://www.cgsecurity.org/wiki/PhotoRec - https://www.cgsecurity.org/wiki/PhotoRec

View file

@ -11,11 +11,11 @@ Version: @VERSION@
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
Source0: http://www.cgsecurity.org/testdisk-%{version}%{?ver_wip}.tar.bz2 Source0: https://www.cgsecurity.org/testdisk-%{version}%{?ver_wip}.tar.bz2
Source1: progsreiserfs-%ver_progsreiserfs.tar.gz Source1: progsreiserfs-%ver_progsreiserfs.tar.gz
Patch0: progsreiserfs-journal.patch Patch0: progsreiserfs-journal.patch
Patch1: progsreiserfs-file-read.patch Patch1: progsreiserfs-file-read.patch
URL: http://www.cgsecurity.org/wiki/TestDisk URL: https://www.cgsecurity.org/wiki/TestDisk
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: libewf-devel BuildRequires: libewf-devel

View file

@ -24,4 +24,4 @@ PhotoRec @VERSION@, Data Recovery Utility, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -25,4 +25,4 @@ PhotoRec @VERSION@, Data Recovery Utility, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -17,4 +17,4 @@ QPhotoRec @VERSION@, Data Recovery Utility, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -61,4 +61,4 @@ TestDisk @VERSION@, Data Recovery Utility, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -26,4 +26,4 @@ PhotoRec @VERSION@, 数据恢复工具, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -27,5 +27,5 @@ PhotoRec @VERSION@, 数据恢复工具, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -19,5 +19,5 @@ PhotoRec @VERSION@, 数据恢复工具, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -63,4 +63,4 @@ TestDisk @VERSION@, 数据恢复工具, @TESTDISKDATE@
.br .br
Christophe GRENIER <grenier@cgsecurity.org> Christophe GRENIER <grenier@cgsecurity.org>
.br .br
http://www.cgsecurity.org https://www.cgsecurity.org

View file

@ -187,7 +187,7 @@ static void display_help(void)
static void display_version(void) static void display_version(void)
{ {
printf("fidentify %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n",VERSION,TESTDISKDATE); printf("fidentify %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n",VERSION,TESTDISKDATE);
printf("\n"); printf("\n");
printf("Version: %s\n", VERSION); printf("Version: %s\n", VERSION);
printf("Compiler: %s\n", get_compiler()); printf("Compiler: %s\n", get_compiler());
@ -242,7 +242,7 @@ int main(int argc, char **argv)
log_info("\n\n"); log_info("\n\n");
log_flush(); log_flush();
} }
log_info("fidentify %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n", VERSION, TESTDISKDATE); log_info("fidentify %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n", VERSION, TESTDISKDATE);
{ {
/* Enable all file formats */ /* Enable all file formats */
file_enable_t *file_enable; file_enable_t *file_enable;

View file

@ -44,6 +44,6 @@ void aff_copy(WINDOW *window)
wmove(window,1,0); wmove(window,1,0);
wprintw(window, "Christophe GRENIER <grenier@cgsecurity.org>"); wprintw(window, "Christophe GRENIER <grenier@cgsecurity.org>");
wmove(window,2,0); wmove(window,2,0);
wprintw(window, "http://www.cgsecurity.org"); wprintw(window, "https://www.cgsecurity.org");
} }
#endif #endif

View file

@ -169,7 +169,7 @@ int main( int argc, char **argv )
return -1; return -1;
} }
#endif #endif
printf("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n",VERSION,TESTDISKDATE); printf("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n",VERSION,TESTDISKDATE);
for(i=1;i<argc;i++) for(i=1;i<argc;i++)
{ {
if((strcmp(argv[i],"/logname")==0) ||(strcmp(argv[i],"-logname")==0)) if((strcmp(argv[i],"/logname")==0) ||(strcmp(argv[i],"-logname")==0))
@ -319,7 +319,7 @@ int main( int argc, char **argv )
log_info(" %s", argv[i]); log_info(" %s", argv[i]);
log_info("\n\n"); log_info("\n\n");
} }
log_info("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n", VERSION, TESTDISKDATE); log_info("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n", VERSION, TESTDISKDATE);
log_info("OS: %s\n" , get_os()); log_info("OS: %s\n" , get_os());
log_info("Compiler: %s\n", get_compiler()); log_info("Compiler: %s\n", get_compiler());
#ifdef RECORD_COMPILATION_DATE #ifdef RECORD_COMPILATION_DATE

View file

@ -111,7 +111,7 @@ static void recovery_finished(disk_t *disk, const partition_t *partition, const
wmove(stdscr, 12, 0); wmove(stdscr, 12, 0);
wprintw(stdscr, "You are welcome to donate to support and encourage further development"); wprintw(stdscr, "You are welcome to donate to support and encourage further development");
wmove(stdscr, 13, 0); wmove(stdscr, 13, 0);
wprintw(stdscr, "http://www.cgsecurity.org/wiki/Donation"); wprintw(stdscr, "https://www.cgsecurity.org/wiki/Donation");
} }
break; break;
case PSTATUS_STOP: case PSTATUS_STOP:

View file

@ -60,7 +60,7 @@ static void display_help(void)
static void display_version(void) static void display_version(void)
{ {
printf("QPhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n",VERSION,TESTDISKDATE); printf("QPhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n",VERSION,TESTDISKDATE);
printf("\n"); printf("\n");
printf("Version: %s\n", VERSION); printf("Version: %s\n", VERSION);
printf("Compiler: %s\n", get_compiler()); printf("Compiler: %s\n", get_compiler());
@ -126,7 +126,7 @@ int main(int argc, char *argv[])
#endif #endif
my_time=time(NULL); my_time=time(NULL);
log_info("\n\n%s",ctime(&my_time)); log_info("\n\n%s",ctime(&my_time));
log_info("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n", VERSION, TESTDISKDATE); log_info("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n", VERSION, TESTDISKDATE);
log_info("OS: %s\n" , get_os()); log_info("OS: %s\n" , get_os());
log_info("Compiler: %s\n", get_compiler()); log_info("Compiler: %s\n", get_compiler());
#ifdef RECORD_COMPILATION_DATE #ifdef RECORD_COMPILATION_DATE

View file

@ -356,7 +356,7 @@ QWidget *QPhotorec::copyright(QWidget * qwparent)
QLabel *t_copy=new QLabel(C_widget); QLabel *t_copy=new QLabel(C_widget);
t_copy->setText( "PhotoRec " + QString(VERSION) + ", Data Recovery Utility, " + QString(TESTDISKDATE) + "<br>\nCopyright (C) Christophe GRENIER &lt;<a href=\"mailto:grenier@cgsecurity.org\">grenier@cgsecurity.org</a>&gt;<br>\n<a href=\"http://www.cgsecurity.org/\">http://www.cgsecurity.org</a>"); t_copy->setText( "PhotoRec " + QString(VERSION) + ", Data Recovery Utility, " + QString(TESTDISKDATE) + "<br>\nCopyright (C) Christophe GRENIER &lt;<a href=\"mailto:grenier@cgsecurity.org\">grenier@cgsecurity.org</a>&gt;<br>\n<a href=\"https://www.cgsecurity.org/\">https://www.cgsecurity.org</a>");
t_copy->setTextFormat(Qt::RichText); t_copy->setTextFormat(Qt::RichText);
t_copy->setTextInteractionFlags(Qt::TextBrowserInteraction); t_copy->setTextInteractionFlags(Qt::TextBrowserInteraction);
t_copy->setOpenExternalLinks(true); t_copy->setOpenExternalLinks(true);

View file

@ -44,6 +44,6 @@ void aff_copy(WINDOW *window)
wmove(window,1,0); wmove(window,1,0);
wprintw(window,"Christophe GRENIER <grenier@cgsecurity.org>"); wprintw(window,"Christophe GRENIER <grenier@cgsecurity.org>");
wmove(window,2,0); wmove(window,2,0);
wprintw(window,"http://www.cgsecurity.org"); wprintw(window,"https://www.cgsecurity.org");
} }
#endif #endif

View file

@ -244,7 +244,7 @@ int main( int argc, char **argv )
return -1; return -1;
} }
#endif #endif
printf("TestDisk %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n",VERSION,TESTDISKDATE); printf("TestDisk %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n",VERSION,TESTDISKDATE);
for(i=1;i<argc;i++) for(i=1;i<argc;i++)
{ {
if((strcmp(argv[i],"/dump")==0) || (strcmp(argv[i],"-dump")==0)) if((strcmp(argv[i],"/dump")==0) || (strcmp(argv[i],"-dump")==0))
@ -405,7 +405,7 @@ int main( int argc, char **argv )
log_info(" %s", argv[i]); log_info(" %s", argv[i]);
log_info("\n\n"); log_info("\n\n");
} }
log_info("TestDisk %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n", VERSION, TESTDISKDATE); log_info("TestDisk %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttps://www.cgsecurity.org\n", VERSION, TESTDISKDATE);
log_info("OS: %s\n" , get_os()); log_info("OS: %s\n" , get_os());
log_info("Compiler: %s\n", get_compiler()); log_info("Compiler: %s\n", get_compiler());
#ifdef RECORD_COMPILATION_DATE #ifdef RECORD_COMPILATION_DATE

View file

@ -12,12 +12,12 @@ For Windows 64-bit without WoW64, use the Windows 64-bit version of TestDisk
& PhotoRec. & PhotoRec.
If you are using an older version of Windows, run the DOS version of TestDisk. If you are using an older version of Windows, run the DOS version of TestDisk.
You can download it from http://www.cgsecurity.org/wiki/TestDisk_Download You can download it from https://www.cgsecurity.org/wiki/TestDisk_Download
TestDisk doesn't need to be installed, you only need to TestDisk doesn't need to be installed, you only need to
- extract the files - extract the files
- run testdisk_win.exe or photorec_win.exe - run testdisk_win.exe or photorec_win.exe
TestDisk & PhotoRec documentation can be found online: TestDisk & PhotoRec documentation can be found online:
- http://www.cgsecurity.org/wiki/TestDisk - https://www.cgsecurity.org/wiki/TestDisk
- http://www.cgsecurity.org/wiki/PhotoRec - https://www.cgsecurity.org/wiki/PhotoRec