preparation release 0.3.0

7 files changed, 42 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index d61f6bc..e4202b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,15 @@
 		
 		change : Most functions in file_type.c are strongly modified, or completely new;
 			 Many functions in magic_block_scan.c been enhanced for the properties of ext4
+			 filetype sorted file names with file extension in the directory MAGIC-2
 		new dependencies: zlib ; bzlib 
 
 
+0.2.3		temporarily separate development branch
+		BUG : 018244
+		change : filetype sorted file names with file extension in the directory MAGIC-2 
+
+
 0.2.2		new : Option -D (Disaster recovery) recover data from severely damaged file systems (Expert-Mode)
 		move : option -Q has been moved to the expert mode(too much confusion for normal users)
 		BUG : Memory leak fixed (ext4 inode extents)
diff --git a/NEWS b/NEWS
index 177fb66..707edc4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,9 @@
 
 
 ext4magic 0.3.0 pv0	Contains the first experimental version of the magic function for ext4
-			The magic function for ext4 in this version can restore deleted files which
+			The magic function for ext4 can restore deleted files which
 			consisted of more than 4 extents (includes extra large and sparse files)
-			and also files that are unfragmented. (most small and medium-sized files
+			and files that are unfragmented. (most small and medium-sized files
 			and many large files, are often unfragmented)
 
 			This version can not recover files with 2 to 4 extents. But it's prepared and
@@ -13,16 +13,23 @@ ext4magic 0.3.0 pv0	Contains the first experimental version of the magic functio
 			For most file types specific functions have been developed. 
 
 			Supported the most important file formats for:
-			file archivs, compressed file, a lot off video-, audio- and picture formats,
+			file archivs, compressed files, a lot off video-, audio- and picture formats,
 			ELF-binary format, Mail, PDF, a lot of text-based file formats, and much more.
 			
 			Tested are more than 50 file formats and if available, also possible
 			variants and subtypes. 
-			Possible, this version will work well for you, possible also, it does not work.
-			There is a lot of new and experimental code.
+			Possible, this version will work well for you, possible, it does not work.
+			This version includes a lot of new and experimental code.
 
 			The magic-function for ext3 is switched off in this version. For ext3 use
-			ext4magic 0.2.2
+			ext4magic 0.2.3
+
+
+
+
+ext4magic 0.2.3		This version is separated from the main development branch.
+			Version 0.2.3 contains the old version of Magic function only for ext3
+			with some new features and bug fixes.
 
 
 
diff --git a/README b/README
index 59c26c9..4291a63 100644
--- a/README
+++ b/README
@@ -202,8 +202,8 @@ This works only correct for a limited time if you continue to write into the fil
       These magic functions are still under development, the support depends on the ext4magic version
 	
        Version 		0.2.x only ext3 
-       Version 		0.3.0 only ext4 
-       Versions >= 	0.4.0 will support ext3 and ext4
+       Version 		0.3.x only ext4 
+       Versions >= 	0.4.x will support ext3 and ext4
  
 
 
diff --git a/configure b/configure
index 74703f4..862be7f 100755
--- a/configure
+++ b/configure
@@ -2015,6 +2015,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_headers="$ac_config_headers config.h"
 
+
 am__api_version='1.11'
 
 ac_aux_dir=
@@ -4367,13 +4368,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4370: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4371: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4373: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4374: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4376: output\"" >&5)
+  (eval echo "\"\$as_me:4377: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5579,7 +5580,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5582 "configure"' > conftest.$ac_ext
+  echo '#line 5583 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7432,11 +7433,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7435: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7436: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7439: \$? = $ac_status" >&5
+   echo "$as_me:7440: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7771,11 +7772,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7774: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7778: \$? = $ac_status" >&5
+   echo "$as_me:7779: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7876,11 +7877,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7879: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7880: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7883: \$? = $ac_status" >&5
+   echo "$as_me:7884: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7931,11 +7932,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7934: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7935: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7938: \$? = $ac_status" >&5
+   echo "$as_me:7939: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10731,7 +10732,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10734 "configure"
+#line 10735 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10827,7 +10828,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10830 "configure"
+#line 10831 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/src/Makefile.in b/src/Makefile.in
index ba673db..d237f4b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -245,9 +245,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/Makefile
+	  $(AUTOMAKE) --gnu src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/ext4magic.8 b/src/ext4magic.8
index 6558d61..20126d6 100644
--- a/src/ext4magic.8
+++ b/src/ext4magic.8
@@ -1,4 +1,4 @@
-.TH ext4magic 8 "Jun 2011" "version 0.2.2" "Administrations Tool"
+.TH ext4magic 8 "Oct 2011" "version 0.2.3" "Administrations Tool"
 .SH NAME
 ext4magic \- allows to recover deleted files on ext3/4 filesystems
 .SH SYNOPSIS
@@ -32,7 +32,7 @@ extensive information about the filesytem Journal.
 .B
 Magic Options: 
 (new in version 0.2.0) These options are for a mulit-stage recover especially for file restore after a recursiv deletion of parts or the whole file system. 
-(third step currently only available for ext3.)
+(third step currently available for ext3 by versions 0.2.x ; a new experimental function for ext4 is included in version 0.3.0-pv0.)
 
 Umount the file system directly after an accidentally destroy and use these options with the umount file system or with a copy of this file system. 
 The program automatically determines the correct time options if the deletion has only worked a short time (< 5 min) .  For very large deletions, you must use the "
diff --git a/src/file_type.c b/src/file_type.c
index e287fbe..760149f 100644
--- a/src/file_type.c
+++ b/src/file_type.c
@@ -7057,7 +7057,7 @@ void get_file_property(struct found_data_t* this){
 	
 		case 0x0313     :               //x-unknown
 	//              this->func = file_x-unknown ;
-	              strncat(this->name,".x-unknown",7);
+	              strncat(this->name,".unknown",8);
 		break;
 	
 		case 0x0314     :               //x-xcursor
@@ -7353,7 +7353,7 @@ void get_file_property(struct found_data_t* this){
 	
 		case 0x0711     :               //x-unknown
 	//              this->func = file_x-unknown ;
-	              strncat(this->name,".unknown",7);
+	              strncat(this->name,".unknown",8);
 		break;
 
 		case 0x0712     :               //x-ms-asf