=================================================================== RCS file: /cvs/mandoc/Attic/ml.c,v retrieving revision 1.5 retrieving revision 1.8 diff -u -p -r1.5 -r1.8 --- mandoc/Attic/ml.c 2008/12/04 19:31:57 1.5 +++ mandoc/Attic/ml.c 2008/12/09 17:09:12 1.8 @@ -1,4 +1,4 @@ -/* $Id: ml.c,v 1.5 2008/12/04 19:31:57 kristaps Exp $ */ +/* $Id: ml.c,v 1.8 2008/12/09 17:09:12 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -20,7 +20,6 @@ #include #include -#include "libmdocml.h" #include "private.h" #include "ml.h" @@ -31,6 +30,14 @@ extern size_t strlcpy(char *, const char *, size_t) int +ml_putstring(struct md_mbuf *p, const char *buf, size_t *pos) +{ + + return(ml_nputstring(p, buf, strlen(buf), pos)); +} + + +int ml_nputstring(struct md_mbuf *p, const char *buf, size_t sz, size_t *pos) { @@ -43,10 +50,8 @@ ml_nputstring(struct md_mbuf *p, /* Escaped value. */ case ('\\'): - if (-1 == (v = rofftok_scan(buf, &i))) { - /* TODO: error. */ + if (-1 == (v = rofftok_scan(buf, &i))) return(0); - } switch (v) { case (ROFFTok_Sp_A): @@ -170,8 +175,7 @@ ml_nputstring(struct md_mbuf *p, ssz = 0; break; default: - /* TODO: print error. */ - return(-1); + return(0); } break; @@ -222,7 +226,8 @@ ml_nputs(struct md_mbuf *p, const char *buf, size_t sz if ( ! md_buf_puts(p, buf, sz)) return(0); - *pos += sz; + if (pos) + *pos += sz; return(1); } @@ -237,7 +242,9 @@ ml_puts(struct md_mbuf *p, const char *buf, size_t *po if ( ! md_buf_puts(p, buf, sz)) return(0); - *pos += sz; + + if (pos) + *pos += sz; return(1); }