Merge remote-tracking branch 'origin/master' into bug556

5 files changed, 16 insertions, 30 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3bfd690e..717e8d97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,33 +162,16 @@ BUILT_SOURCES += parsedate.c
 endif
 
 
-if LIBRDFA
-libraptor2_la_SOURCES += \
-$(top_srcdir)/librdfa/context.c \
-$(top_srcdir)/librdfa/curie.c \
-$(top_srcdir)/librdfa/iri.c \
-$(top_srcdir)/librdfa/language.c \
-$(top_srcdir)/librdfa/lists.c \
-$(top_srcdir)/librdfa/namespace.c \
-$(top_srcdir)/librdfa/rdfa.c \
-$(top_srcdir)/librdfa/rdfa_utils.c \
-$(top_srcdir)/librdfa/subject.c \
-$(top_srcdir)/librdfa/triple.c \
-$(top_srcdir)/librdfa/rdfa.h \
-$(top_srcdir)/librdfa/rdfa_utils.h 
-
-if NEED_STRTOK_R
-libraptor2_la_SOURCES += \
-$(top_srcdir)/librdfa/strtok_r.c \
-$(top_srcdir)/librdfa/strtok_r.h
-endif
+libraptor2_la_LIBADD = 
 
+if LIBRDFA
 AM_CPPFLAGS += -DLIBRDFA_IN_RAPTOR -I$(top_srcdir)/librdfa
+libraptor2_la_LIBADD += $(top_builddir)/librdfa/librdfa.la
 endif
 
 libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
 @RAPTOR_LDFLAGS@ $(MEM_LIBS)
-libraptor2_la_LIBADD = @LTLIBOBJS@
+libraptor2_la_LIBADD += @LTLIBOBJS@
 
 
 EXTRA_DIST=\
@@ -301,6 +284,9 @@ raptor_permute_test: $(srcdir)/raptor_permute_test.c libraptor2.la
 raptor_snprintf_test: $(srcdir)/snprintf.c libraptor2.la
 	$(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/snprintf.c libraptor2.la $(LIBS)
 
+$(top_builddir)/librdfa/librdfa.la:
+	cd $(top_builddir)/librdfa && $(MAKE) librdfa.la 
+
 # Some people need a little help ;-)
 test: check
 
diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c
index 1c2ec1e6..bbf19d6d 100644
--- a/src/ntriples_parse.c
+++ b/src/ntriples_parse.c
@@ -270,7 +270,7 @@ raptor_ntriples_term(raptor_parser* rdf_parser,
         /* UTF-8 encoding had an error or ended in the middle of a string */
         return 1;
       }
-      memcpy(dest, p-1, unichar_len);
+      memmove(dest, p-1, unichar_len);
       dest += unichar_len;
 
       unichar_len--; /* p, *lenp were moved on by 1 earlier */
@@ -557,7 +557,7 @@ raptor_ntriples_parse_line(raptor_parser* rdf_parser,
             if(ordinal <= 0)
               raptor_parser_error(rdf_parser, "Illegal ordinal value %d in property '%s'.", ordinal, dest);
           }
-          if(raptor_uri_string_is_absolute(dest) <= 0) {
+          if(raptor_uri_uri_string_is_absolute(dest) <= 0) {
             raptor_parser_error(rdf_parser, "URI '%s' is not absolute.", dest);
             goto cleanup;
           }
@@ -663,7 +663,7 @@ raptor_ntriples_parse_line(raptor_parser* rdf_parser,
               goto cleanup;
             }
 
-            if(raptor_uri_string_is_absolute(object_literal_datatype) <= 0) {
+            if(raptor_uri_uri_string_is_absolute(object_literal_datatype) <= 0) {
               raptor_parser_error(rdf_parser, "Datatype URI '%s' is not absolute.", object_literal_datatype);
               rc = 1;
               goto cleanup;
diff --git a/src/raptor2.h.in b/src/raptor2.h.in
index 8265aa2e..f380cbdc 100644
--- a/src/raptor2.h.in
+++ b/src/raptor2.h.in
@@ -1313,8 +1313,6 @@ RAPTOR_API
 int raptor_uri_file_exists(raptor_uri* uri);
 RAPTOR_API
 int raptor_uri_escaped_write(raptor_uri* uri, raptor_uri* base_uri, unsigned int flags, raptor_iostream *iostr);
-RAPTOR_API
-int raptor_uri_string_is_absolute(const unsigned char* uri_string);
 
 /* XML utility functions */
 RAPTOR_API
@@ -1358,6 +1356,8 @@ RAPTOR_API
 int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuffer* sb, const char* string, size_t length, int space_is_plus);
 RAPTOR_API
 char* raptor_uri_uri_string_to_counted_filename_fragment(const unsigned char *uri_string, size_t* len_p, unsigned char **fragment_p, size_t* fragment_len_p);
+RAPTOR_API
+int raptor_uri_uri_string_is_absolute(const unsigned char* uri_string);
 
 
 /**
diff --git a/src/raptor_general.c b/src/raptor_general.c
index ec952ea1..1c8e05a6 100644
--- a/src/raptor_general.c
+++ b/src/raptor_general.c
@@ -48,9 +48,9 @@
 
 /* statics */
 
-const char * const raptor_short_copyright_string = "Copyright 2000-2012 David Beckett. Copyright 2000-2005 University of Bristol";
+const char * const raptor_short_copyright_string = "Copyright 2000-2013 David Beckett. Copyright 2000-2005 University of Bristol";
 
-const char * const raptor_copyright_string = "Copyright (C) 2000-2012 David Beckett - http://www.dajobe.org/\nCopyright (C) 2000-2005 University of Bristol - http://www.bristol.ac.uk/";
+const char * const raptor_copyright_string = "Copyright (C) 2000-2013 David Beckett - http://www.dajobe.org/\nCopyright (C) 2000-2005 University of Bristol - http://www.bristol.ac.uk/";
 
 const char * const raptor_license_string = "LGPL 2.1 or newer, GPL 2 or newer, Apache 2.0 or newer.\nSee http://librdf.org/raptor/LICENSE.html for full terms.";
 
diff --git a/src/raptor_uri.c b/src/raptor_uri.c
index ed9b1ec4..169a6988 100644
--- a/src/raptor_uri.c
+++ b/src/raptor_uri.c
@@ -1707,7 +1707,7 @@ raptor_uri_escaped_write(raptor_uri* uri,
 
 
 /**
- * raptor_uri_string_is_absolute:
+ * raptor_uri_uri_string_is_absolute:
  * @uri_string: uri to check write
  * 
  * Check if a uri string is an absolute URI
@@ -1715,7 +1715,7 @@ raptor_uri_escaped_write(raptor_uri* uri,
  * Return value: >0 if absolute, 0 if not, < 0 on failure
  **/
 int
-raptor_uri_string_is_absolute(const unsigned char* uri_string)
+raptor_uri_uri_string_is_absolute(const unsigned char* uri_string)
 {
   raptor_uri_detail *detail = NULL;
   int rc = -1;