[src/netbsd-8]: src/usr.bin/printf Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d79c4effdcd
branches:  netbsd-8
changeset: 851859:8d79c4effdcd
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jul 13 15:58:25 2018 +0000

description:
Pull up following revision(s) (requested by kre in ticket #914):

        usr.bin/printf/printf.c: revision 1.38,1.39

>From leot@ on tech-userlevel:
Avoid running off into oblivion when a format string,
or arg to a %b conversion ends in an unescaped backslash.

Patch from Leo slightly modified by me.

Avoid printing error messages twice when an invalid
escape sequence (\ sequence) is present in an arg to a %b
conversion.

diffstat:

 usr.bin/printf/printf.c |  31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diffs (108 lines):

diff -r 0d62a8e58a5c -r 8d79c4effdcd usr.bin/printf/printf.c
--- a/usr.bin/printf/printf.c   Fri Jul 13 15:55:25 2018 +0000
+++ b/usr.bin/printf/printf.c   Fri Jul 13 15:58:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printf.c,v 1.37 2015/06/16 22:54:10 christos Exp $     */
+/*     $NetBSD: printf.c,v 1.37.8.1 2018/07/13 15:58:25 martin Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)printf.c   8.2 (Berkeley) 3/22/95";
 #else
-__RCSID("$NetBSD: printf.c,v 1.37 2015/06/16 22:54:10 christos Exp $");
+__RCSID("$NetBSD: printf.c,v 1.37.8.1 2018/07/13 15:58:25 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -65,8 +65,8 @@
 #define ESCAPE 033
 #endif
 
-static void     conv_escape_str(char *, void (*)(int));
-static char    *conv_escape(char *, char *);
+static void     conv_escape_str(char *, void (*)(int), int);
+static char    *conv_escape(char *, char *, int);
 static char    *conv_expand(const char *);
 static char     getchr(void);
 static double   getdouble(void);
@@ -170,7 +170,7 @@
                for (fmt = format; (ch = *fmt++) != '\0';) {
                        if (ch == '\\') {
                                char c_ch;
-                               fmt = conv_escape(fmt, &c_ch);
+                               fmt = conv_escape(fmt, &c_ch, 0);
                                putchar(c_ch);
                                continue;
                        }
@@ -241,7 +241,7 @@
                                t = NULL;
                                /* Count number of bytes we want to output */
                                b_length = 0;
-                               conv_escape_str(cp, b_count);
+                               conv_escape_str(cp, b_count, 0);
                                t = malloc(b_length + 1);
                                if (t == NULL)
                                        goto out;
@@ -254,7 +254,7 @@
                                        goto out;
                                b_fmt = a;
                                /* Output leading spaces and data bytes */
-                               conv_escape_str(cp, b_output);
+                               conv_escape_str(cp, b_output, 1);
                                /* Add any trailing spaces */
                                printf("%s", b_fmt);
                                break;
@@ -357,7 +357,7 @@
  *     Halts processing string if a \c escape is encountered.
  */
 static void
-conv_escape_str(char *str, void (*do_putchar)(int))
+conv_escape_str(char *str, void (*do_putchar)(int), int quiet)
 {
        int value;
        int ch;
@@ -415,7 +415,7 @@
                }
 
                /* Finally test for sequences valid in the format string */
-               str = conv_escape(str - 1, &c);
+               str = conv_escape(str - 1, &c, quiet);
                do_putchar(c);
        }
 }
@@ -424,7 +424,7 @@
  * Print "standard" escape characters 
  */
 static char *
-conv_escape(char *str, char *conv_ch)
+conv_escape(char *str, char *conv_ch, int quiet)
 {
        char value;
        char ch;
@@ -433,6 +433,14 @@
        ch = *str++;
 
        switch (ch) {
+       case '\0':
+               if (!quiet)
+                       warnx("incomplete escape sequence");
+               rval = 1;
+               value = '\\';
+               --str;
+               break;
+
        case '0': case '1': case '2': case '3':
        case '4': case '5': case '6': case '7':
                num_buf[0] = ch;
@@ -470,7 +478,8 @@
        case 'v':       value = '\v';   break;  /* vertical-tab */
 
        default:
-               warnx("unknown escape sequence `\\%c'", ch);
+               if (!quiet)
+                       warnx("unknown escape sequence `\\%c'", ch);
                rval = 1;
                value = ch;
                break;