Changed name to RTFX due to a naming conflict

4 files changed, 20 insertions, 16 deletions

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;