char *strlower(char *str);
char *strtrim(char *);
-char *mkstr (const char *format, ... );
-char *strconcat (const char *str, ...);
+char *strdup_printf(const char *format, ... );
+char *strconcat(const char *str, ...);
int safe_strcmp(const char *s1, const char *s2);
int safe_strcoll(const char *s1, const char *s2);
char *getaline(FILE *f);
+int strwidth(const char *s);
+int bytes2width(const char *s, int width);
+
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif