Update vis and unvis modules from OpenBSD

diff --git a/src/unvis.c b/src/unvis.c
index 188edca50588d83e0e2b414a4dee1839811a197a..53da64b39e5938bfdbc20bb317f79632d264bbf9 100644 (file)
--- a/src/unvis.c
+++ b/src/unvis.c
@@ -235,7 +235,7 @@ strunvis(char *dst, const char *src)
        char *start = dst;
        int state = 0;
 
-       while ( (c = *src++) ) {
+       while ((c = *src++)) {
        again:
                switch (unvis(dst, c, &state, 0)) {
                case UNVIS_VALID:
@@ -248,6 +248,7 @@ strunvis(char *dst, const char *src)
                case UNVIS_NOCHAR:
                        break;
                default:
+                       *dst = '\0';
                        return (-1);
                }
        }
@@ -304,8 +305,8 @@ strunvisx(char *dst, const char *src, int flag)
        char c;
        char *start = dst;
        int state = 0;
-    
-       while ( (c = *src++) ) {
+
+       while ((c = *src++)) {
        again:
                switch (unvis(dst, c, &state, flag)) {
                case UNVIS_VALID:

diff --git a/src/vis.c b/src/vis.c
index 189fde8f3cda5c1b0bf0c1e73e034f9f91d2417c..6153a7fe10081213e3bf23d7c2950bfebd1ad4ef 100644 (file)
--- a/src/vis.c
+++ b/src/vis.c
@@ -50,10 +50,7 @@
  * vis - visually encode characters
  */
 char *
-vis(dst, c, flag, nextc)
-       char *dst;
-       int c, nextc;
-       int flag;
+vis(char *dst, int c, int flag, int nextc)
 {
        c = (unsigned char)c;
 
@@ -173,10 +170,7 @@ done:
  *     This is useful for encoding a block of data.
  */
 int
-strvis(dst, src, flag)
-       char *dst;
-       const char *src;
-       int flag;
+strvis(char *dst, const char *src, int flag)
 {
        char c;
        char *start;
@@ -231,11 +225,8 @@ strnvis(char *dst, const char *src, size_t siz, int flag)
        return (dst - start);
 }
 
-strvisx(dst, src, len, flag)
-       char *dst;
-       const char *src;
-       size_t len;
-       int flag;
+int
+strvisx(char *dst, const char *src, size_t len, int flag)
 {
        int c;
        char *start;