summaryrefslogtreecommitdiffstats
path: root/src/phmain.c
diff options
context:
space:
mode:
authorChristophe Grenier <grenier@cgsecurity.org>2011-04-23 14:39:51 +0200
committerChristophe Grenier <grenier@cgsecurity.org>2011-04-23 14:39:51 +0200
commitf7a3262623633bc34f3e4cbb4c5153b910491ff6 (patch)
tree1838bfff8752ed8d181926a9320281d14dfaf7fd /src/phmain.c
parent791794a74fdaa10f1acc707b254161b23007ae26 (diff)
Add get_compilation_date() and td_jpeg_version() functions
Diffstat (limited to 'src/phmain.c')
-rw-r--r--src/phmain.c34
1 files changed, 7 insertions, 27 deletions
diff --git a/src/phmain.c b/src/phmain.c
index 341020b..fd3dbec 100644
--- a/src/phmain.c
+++ b/src/phmain.c
@@ -62,9 +62,6 @@
#ifdef HAVE_NCURSES
#include "intrfn.h"
#endif
-#ifdef HAVE_JPEGLIB_H
-#include <jpeglib.h>
-#endif
#include "dir.h"
#include "filegen.h"
#include "photorec.h"
@@ -76,6 +73,7 @@
#include "phcfg.h"
#include "misc.h"
#include "ext2_dir.h"
+#include "file_jpg.h"
#include "ntfs_dir.h"
#include "pdisksel.h"
extern const arch_fnct_t arch_none;
@@ -219,18 +217,9 @@ int main( int argc, char **argv )
printf("\n");
printf("Version: %s\n", VERSION);
printf("Compiler: %s\n", get_compiler());
- printf("ext2fs lib: %s, ntfs lib: %s, ewf lib: %s, libjpeg: ",
- td_ext2fs_version(), td_ntfs_version(), td_ewf_version());
-#if defined(HAVE_LIBJPEG)
-#if defined(JPEG_LIB_VERSION)
- printf("%d", JPEG_LIB_VERSION);
-#else
- printf("yes");
-#endif
-#else
- printf("none");
-#endif
- printf("\n");
+ printf("Compilation date: %s\n", get_compilation_date());
+ printf("ext2fs lib: %s, ntfs lib: %s, ewf lib: %s, libjpeg: %s\n",
+ td_ext2fs_version(), td_ntfs_version(), td_ewf_version(), td_jpeg_version());
printf("OS: %s\n" , get_os());
return 0;
}
@@ -302,18 +291,9 @@ int main( int argc, char **argv )
log_info("PhotoRec %s, Data Recovery Utility, %s\nChristophe GRENIER <grenier@cgsecurity.org>\nhttp://www.cgsecurity.org\n", VERSION, TESTDISKDATE);
log_info("OS: %s\n" , get_os());
log_info("Compiler: %s\n", get_compiler());
- log_info("ext2fs lib: %s, ntfs lib: %s, ewf lib: %s, libjpeg: ",
- td_ext2fs_version(), td_ntfs_version(), td_ewf_version());
-#if defined(HAVE_LIBJPEG)
-#if defined(JPEG_LIB_VERSION)
- log_info("%d", JPEG_LIB_VERSION);
-#else
- log_info("yes");
-#endif
-#else
- log_info("none");
-#endif
- log_info("\n");
+ log_info("Compilation date: %s\n", get_compilation_date());
+ log_info("ext2fs lib: %s, ntfs lib: %s, ewf lib: %s, libjpeg: %s\n",
+ td_ext2fs_version(), td_ntfs_version(), td_ewf_version(), td_jpeg_version());
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(DJGPP)
#else
#ifdef HAVE_GETEUID