Experimenting with CSV file format

git-svn-id: https://svn.code.sf.net/p/ssdeep/code/trunk@104 d1b3761f-3242-0410-b1a5-fe525d664610

Author: jessekornblum

ChangeLog

@@ -1,3 +1,16 @@
+2010-07-15 Jesse Kornblum
+
+	* Added quotes and quote escaping to filenames when
+	  displayed in CSV matching mode.
+
+	* Modified FILEFORMAT to reflect quotation marks in filenames.
+	
+
+2010-06-24 Jesse Kornblum
+
+	* Added parameter checking to my_basename.
+	
+
 2010-05-05 Jesse Kornblum
 
 	* Changed logic for reading files of known hashes to look for

FILEFORMAT

@@ -1,30 +1,36 @@
 
-SSDEEP FILE FORMAT VERSION 1.0
+SSDEEP FILE FORMAT VERSION 1.1
 
 1. REVISION HISTORY
 
 14 Aug 2006 - Initial version (jk)
-
+15 Jul 2010 - Adding quotation marks to filenames
 
 
 
 2. FILE HEADER
 
 The first line of the file is a header, like this:
 
-ssdeep,1.0--blocksize:hash:hash,filename
+ssdeep,1.1--blocksize:hash:hash,filename
 
 ssdeep - Identifies the file type
-1.0    - The version of the file format, NOT the version of the program
+1.1    - The version of the file format, NOT the version of the program
 --     - Separator
 
 The remainder of the line identifies the format of the file. 
-Note that for version 1.0 these values must be given EXACTLY as shown above
+Note that for version 1.1 these values must be given EXACTLY as shown above
 
 
 3. FILE DATA
 
 Each line represents the hash of one file as listed in the header.
 Specifically, we have the blocksize used by the program, the hash 
-for this blocksize and twice the blocksize, and the filename. Note that
-there are *no* quotation marks in the file.
+for this blocksize and twice the blocksize, and the filename. Filenames
+are enclosed in quotation marks. Filenames which contain a quotation mark
+will have those quotes slash escaped. For example, the file ma"in.c 
+will be listed as: 
+
+"ma\"in.c"
+
+

Makefile.in

@@ -44,7 +44,10 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
 	install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -219,7 +222,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@

NEWS

@@ -1,3 +1,15 @@
+** Version 2.6 - RBF DATE
+
+* New Features
+
+  - Modified the output file format to allow for proper escaping of
+    filenames with quotation marks in them.
+
+* Bug Fixes
+
+  - Added quotation marks to filenames in CSV matching mode.
+
+
 ** Version 2.5 - 6 May 2010
 
 * New Features