Changed name to RTFX due to a naming conflict

14 files changed, 64 insertions, 44 deletions

diff --git a/.cvsignore b/.cvsignore
index 8812efc..561f404 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,5 @@ missing
 mkinstalldirs
 stamp-*
 *~
+*.zip
+*.tar.gz
diff --git a/BUGS b/BUGS
index 64014bd..bb2d389 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,2 @@
-RTFM TODOS AND BUGS
-- No font support
-- Doesn't handle crummy RTF files nicely.
+SCROUNGE-NTFS TODOS AND BUGS
+- No support for searching out drive info yet
diff --git a/ChangeLog b/ChangeLog
index 40246ca..5e939b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
-Version 1.0
+Version 0.8.1
+ - Linux/FreeBSD support
+
+Version 0.8
+ -  Support for non-contiguous MFT
+ - Better support for WinXP NTFS
+ - Other bug fixes
+
+
+Version 0.7
  - Initial working release
 
diff --git a/INSTALL b/INSTALL
index e245cd6..e6a2bed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,12 @@
 ======================================================================
-                      RTFM 1.0 INSTALL
+                      RTFX 0.9.1 INSTALL
+
+REQUIREMENTS
+ You'll need to have a version of the sablotron XML library
+ (0.9.6 or later) installed.
 
 QUICK INSTALLATION:
- # tar -zxvf rtfm-1.0.tar.gz
+ # tar -zxvf rtfx-0.9.1.tar.gz
  # ./configure
  # make && make install
 
diff --git a/README b/README
index e5f9d0d..9d48435 100644
--- a/README
+++ b/README
@@ -1,3 +1,3 @@
 =================================================================
-                      RTFM 1.0 README
+                      RTFX 0.9.1 README
 
diff --git a/configure.in b/configure.in
index 95b4440..df8b5df 100644
--- a/configure.in
+++ b/configure.in
@@ -36,8 +36,8 @@ dnl  Nate Nielsen <nielsen@memberwebs.com>
 dnl
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rtfm, 0.9, nielsen@memberwebs.com)
-AM_INIT_AUTOMAKE(rtfm, 0.9)
+AC_INIT(rtfx, 0.9.1, nielsen@memberwebs.com)
+AM_INIT_AUTOMAKE(rtfx, 0.9.1)
 
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
@@ -45,7 +45,7 @@ CFLAGS="$CFLAGS -I/usr/local/include"
 
 AC_LANG_CPLUSPLUS
 
-AC_CONFIG_SRCDIR([src/rtfm.cpp])
+AC_CONFIG_SRCDIR([src/rtfx.cpp])
 AM_CONFIG_HEADER([config.h])
 
 # Checks for programs.
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..52605a3
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,4 @@
+.deps
+Makefile
+Makefile.in
+rtfx
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a7efde..e28b98e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,13 @@
 
-bin_PROGRAMS = rtfm
+bin_PROGRAMS = rtfx
 
-rtfm_SOURCES = rtfm.cpp basehandler.cpp basehandler.h levelhandler.cpp levelhandler.h \
+rtfx_SOURCES = rtfx.cpp basehandler.cpp basehandler.h levelhandler.cpp levelhandler.h \
               reference.h rtfanalyser.cpp rtfanalyser.h rtfparsehelpers.cpp rtfformatting.h \
               rtfparsehelpers.h rtfreader.cpp rtfreader.h sablo.h sablotr.cpp usuals.h
-rtfm_LDADD = -lsablot -lexpat $(LIB_ICONV)
-rtfm_CFLAGS = -O0 -I${top_srcdir} -I/usr/local/include
-rtfm_LDFLAGS = -L/usr/local/lib
-man_MANS = rtfm.1
+rtfx_LDADD = -lsablot -lexpat $(LIB_ICONV)
+rtfx_CFLAGS = -O0 -I${top_srcdir} -I/usr/local/include
+rtfx_LDFLAGS = -L/usr/local/lib
+man_MANS = rtfx.1
 
 EXTRA_DIST = $(man_MANS)
 
diff --git a/src/rtfx.1 b/src/rtfx.1
index ba62097..3ddf4fa 100644
--- a/src/rtfx.1
+++ b/src/rtfx.1
@@ -1,8 +1,8 @@
 .Dd March, 2004
-.Dt RTFM 1
-.Os RTFM 0.9
+.Dt RTFX 1
+.Os RTFX 0.9.1
 .Sh NAME
-.Nm rtfm
+.Nm rtfx
 .Nd converts RTF to a generic XML format
 .Sh SYNOPSIS
 .Nm
@@ -11,10 +11,10 @@
 .Sh DESCRIPTION
 .Nm
 converts RTF files into a generic XML format. It majors on keeping meta data like style names, etc... rather than every bit of formatting. This makes it handy for converting RTF documents into a custom XML format (using XSL or an additional processing step).
-There are no options. To get different output you should use another processing step. RTFM's goal is just to get stuff into a basic XML format.
+There are no options. To get different output you should use another processing step. rtfx's goal is just to get stuff into a basic XML format.
 .Sh BUGS
 Doesn't handle crummy RTF files nicely
 .Sh SEE ALSO
 .Xr sablot 3
 .Sh AUTHOR
-.An Nate Nielsen Aq nielsen@memberwebs.com
\ No newline at end of file
+.An Nate Nielsen Aq nielsen@memberwebs.com
diff --git a/src/rtfx.cpp b/src/rtfx.cpp
index 63c566b..7576d51 100644
--- a/src/rtfx.cpp
+++ b/src/rtfx.cpp
@@ -46,7 +46,7 @@
 
 int usage()
 {
-	fprintf(stderr, "usage: rtfm <inrtf> <outxml>\n");
+	fprintf(stderr, "usage: rtfx <inrtf> <outxml>\n");
 	return 2;
 }
 
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
 
 		if(!file)
 		{
-			fprintf(stderr, "rtfm: couldn't open file: %s: %s\n", argv[1], strerror(errno));
+			fprintf(stderr, "rtfx: couldn't open file: %s: %s\n", argv[1], strerror(errno));
 			return 1;
 		}
 
@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
 
 		if(!ret)
 		{
-			fprintf(stderr, "rtfm: rtf parse failed: %s\n", rtf.getParseErrors().c_str());
+			fprintf(stderr, "rtfx: rtf parse failed: %s\n", rtf.getParseErrors().c_str());
 			return 1;
 		}
 
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
 		FILE* out = fopen(argv[2], "wb");
 		if(!out)
 		{
-			fprintf(stderr, "rtfm: couldn't open file: %s: %s\n", argv[2], strerror(errno));
+			fprintf(stderr, "rtfx: couldn't open file: %s: %s\n", argv[2], strerror(errno));
 			return 1;
 		}
 
@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
 	}
 	catch(DOM::DOMException& e)
 	{
-		fprintf(stderr, "rtfm: xml dom error: %s\n", e.getMessage());
+		fprintf(stderr, "rtfx: xml dom error: %s\n", e.getMessage());
 	}
 
 	return 1;
diff --git a/win32/.cvsignore b/win32/.cvsignore
index 57336c0..fdc9a0c 100644
--- a/win32/.cvsignore
+++ b/win32/.cvsignore
@@ -1,6 +1,8 @@
-rtfm.ncb
-rtfm.plg
-rtfm.opt
-rtfm.ncb
+rtfx.ncb
+rtfx.plg
+rtfx.opt
+rtfx.ncb
 debug
-release
\ No newline at end of file
+release
+Makefile
+Makefile.in
diff --git a/win32/Makefile.am b/win32/Makefile.am
index e46d9af..1ab9118 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -37,5 +37,5 @@
 #
 
 
-EXTRA_DIST=rtfm.dsp rtfm.dsw sablot
+EXTRA_DIST=rtfx.dsp rtfx.dsw sablot
 
diff --git a/win32/rtfx.dsp b/win32/rtfx.dsp
index 9879faf..fabaf9d 100644
--- a/win32/rtfx.dsp
+++ b/win32/rtfx.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="rtfm" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="rtfx" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=rtfm - Win32 Debug
+CFG=rtfx - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "rtfm.mak".
+!MESSAGE NMAKE /f "rtfx.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "rtfm.mak" CFG="rtfm - Win32 Debug"
+!MESSAGE NMAKE /f "rtfx.mak" CFG="rtfx - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "rtfm - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rtfm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "rtfx - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rtfx - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=rtfm - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "rtfm - Win32 Release"
+!IF  "$(CFG)" == "rtfx - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,7 +54,7 @@ LINK32=link.exe
 # ADD LINK32 sablot.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"sablot/lib" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "rtfm - Win32 Debug"
+!ELSEIF  "$(CFG)" == "rtfx - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -83,8 +83,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "rtfm - Win32 Release"
-# Name "rtfm - Win32 Debug"
+# Name "rtfx - Win32 Release"
+# Name "rtfx - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -102,7 +102,7 @@ SOURCE=..\src\rtfanalyser.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\rtfm.cpp
+SOURCE=..\src\rtfx.cpp
 # End Source File
 # Begin Source File
 
diff --git a/win32/rtfx.dsw b/win32/rtfx.dsw
index c65a996..050295c 100644
--- a/win32/rtfx.dsw
+++ b/win32/rtfx.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "rtfm"=.\rtfm.dsp - Package Owner=<4>
+Project: "rtfx"=.\rtfx.dsp - Package Owner=<4>
 
 Package=<5>
 {{{