X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=makedoc.c;h=df72d5d1dfd9f915f2121c91daf600fddfc3710a;hp=4829215364295c680419f4b29ee2bd236d73752d;hb=fd25c07c1e9e19606b1b6d5533df1f6239455036;hpb=9e6ab0152703ad301042ce8810859f41fbee405a

diff --git a/makedoc.c b/makedoc.c
index 4829215..df72d5d 100644
--- a/makedoc.c
+++ b/makedoc.c
@@ -31,6 +31,7 @@
 #include <ctype.h>
 
 #include <errno.h>
+#include <lib-lib/str.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -513,13 +514,13 @@ static void handle_confline (char *s)
       return;
   }
 
-  memset (val, 0, sizeof (val));
+  memset(val, 0, sizeof(val));
 
   do {
     if (!strcmp (buff, "}"))
       break;
 
-    strncpy (val + STRLEN (val), buff, sizeof (val) - STRLEN (val));
+    m_strcat(val, sizeof(val), buff);
   }
   while ((s = get_token (buff, sizeof (buff), s)));
 
@@ -737,7 +738,7 @@ static void print_confline (const char *varname, int type, const char *val)
     /* SGML based manual */
   case F_SGML:
     {
-      add_s ("\n<muttng-doc:vardef name=\"");
+      add_s ("\n<madmutt-doc:vardef name=\"");
       sgml_fputs (varname);
       add_s ("\">\n<para>Type: <literal>");
       add_s (type2human (type));
@@ -1163,7 +1164,7 @@ static int print_it (int special, char *str, int docstat)
         }
       case SP_END_SECT:
         {
-          add_s ("</muttng-doc:vardef>\n");
+          add_s ("</madmutt-doc:vardef>\n");
           break;
         }
       case SP_STR: