openpgp: Move ASCII dumping code to the library.

2 files changed, 25 insertions, 16 deletions

diff --git a/openpgp/src/fmt.rs b/openpgp/src/fmt.rs
index 429f2b69..3b79ceba 100644
--- a/openpgp/src/fmt.rs
+++ b/openpgp/src/fmt.rs
@@ -89,6 +89,30 @@ pub mod hex {
             })
         }
 
+        /// Writes a chunk of data with ASCII-representation.
+        ///
+        /// This produces output similar to `hexdump(1)`.
+        pub fn write_ascii<B>(&mut self, buf: B) -> io::Result<()>
+            where B: AsRef<[u8]>,
+        {
+            self.write_labeled(buf, |offset, data| {
+                let mut l = String::new();
+                for _ in 0..offset {
+                    l.push(' ');
+                }
+                for &c in data {
+                    l.push(if c < 32 {
+                        '.'
+                    } else if c < 128 {
+                        c.into()
+                    } else {
+                        '.'
+                    })
+                }
+                Some(l)
+            })
+        }
+
         /// Writes a chunk of data.
         ///
         /// For each line, the given function is called to compute a
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 2ef4f1b0..a76fac27 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -690,22 +690,7 @@ impl PacketDumper {
 
             for field in map.iter() {
                 if field.name() == "body" {
-                    hd.write_labeled(field.data(), |offset, data| {
-                        let mut l = String::new();
-                        for _ in 0..offset {
-                            l.push(' ');
-                        }
-                        for &c in data {
-                            l.push(if c < 32 {
-                                '.'
-                            } else if c < 128 {
-                                c.into()
-                            } else {
-                                '.'
-                            })
-                        }
-                        Some(l)
-                    })?;
+                    hd.write_ascii(field.data())?;
                 } else {
                     hd.write(field.data(), field.name())?;
                 }