armor: don't break lines by default

Added a new function that breaks the lines, but by default
don't do it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/common/armor.c b/src/common/armor.c
index 0fd2c918c278bc61fc40def7b16e86464b182f1c..706e01e7f221090baf16d843bf685eefb83e7d3d 100644 (file)
--- a/src/common/armor.c
+++ b/src/common/armor.c
@@ -45,7 +45,7 @@ static int set_str_val(char **pdst, const char *end, char c)
        return 0;
 }
 
-int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
+int ceph_armor_line_break(char *dst, const char *dst_end, const char *src, const char *end, int line_width)
 {
        int olen = 0;
        int line = 0;
@@ -82,7 +82,7 @@ int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
                }
                olen += 4;
                line += 4;
-               if (line == 64) {
+               if (line_width && line == line_width) {
                        line = 0;
                        SET_DST('\n');
                        olen++;
@@ -91,6 +91,11 @@ int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
        return olen;
 }
 
+int ceph_armor(char *dst, const char *dst_end, const char *src, const char *end)
+{
+       return ceph_armor_line_break(dst, dst_end, src, end, 0);
+}
+
 int ceph_unarmor(char *dst, const char *dst_end, const char *src, const char *end)
 {
        int olen = 0;

diff --git a/src/common/armor.h b/src/common/armor.h
index cf9a63aa149745ecec3b1543c6e4aaba5b07880c..340b33aaf57c2b86a7852abc64e3e89375fe0c39 100644 (file)
--- a/src/common/armor.h
+++ b/src/common/armor.h
@@ -7,6 +7,10 @@ extern "C" {
 
 int ceph_armor(char *dst, const char *dst_end,
               const char *src, const char *end);
+
+int ceph_armor_linebreak(char *dst, const char *dst_end,
+              const char *src, const char *end,
+              int line_width);
 int ceph_unarmor(char *dst, const char *dst_end,
                 const char *src, const char *end);
 #ifdef __cplusplus