X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=makedoc.c;h=6910e54621beef90b02ee30e96beadba4ecfd45f;hp=c897289e4d2bf34e65156adf8c8c9fdef95b836e;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=4b2f985c0f88249774e03e9e4111b70f3d8d26dc

diff --git a/makedoc.c b/makedoc.c
index c897289..6910e54 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>
@@ -191,7 +192,7 @@ static void add_var (const char *name)
 {
   outbuf = realloc (outbuf, (++outcount) * sizeof (var_t));
   outbuf[outcount - 1].seen = 0;
-  outbuf[outcount - 1].name = strdup (name);
+  outbuf[outcount - 1].name = strdup(name);
   outbuf[outcount - 1].descr = NULL;
 }
 
@@ -207,7 +208,7 @@ static int add_s (const char *s)
   }
 
   if (lold == 0)
-    outbuf[outcount - 1].descr = strdup (s);
+    outbuf[outcount - 1].descr = strdup(s);
   else {
     outbuf[outcount - 1].descr =
       realloc (outbuf[outcount - 1].descr, lold + lnew + 1);
@@ -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,9 +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 id=\"");
-      sgml_id_fputs (varname);
-      add_s ("\" name=\"");
+      add_s ("\n<muttng-doc:vardef name=\"");
       sgml_fputs (varname);
       add_s ("\">\n<para>Type: <literal>");
       add_s (type2human (type));