[src/trunk]: src/bin/sh PR bin/51114 - print the correct values for >&- and >...

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

details:   https://anonhg.NetBSD.org/src/rev/a9fa3900710a
branches:  trunk
changeset: 345043:a9fa3900710a
user:      kre <kre%NetBSD.org@localhost>
date:      Tue May 03 20:46:35 2016 +0000

description:
PR bin/51114 - print the correct values for >&- and >& N (N > 9)
in output from the "jobs" command (and other places that use the
same routines.)

diffstat:

 bin/sh/jobs.c |  29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diffs (73 lines):

diff -r b40f9b78efdd -r a9fa3900710a bin/sh/jobs.c
--- a/bin/sh/jobs.c     Tue May 03 19:43:45 2016 +0000
+++ b/bin/sh/jobs.c     Tue May 03 20:46:35 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jobs.c,v 1.76 2016/05/02 01:46:31 christos Exp $       */
+/*     $NetBSD: jobs.c,v 1.77 2016/05/03 20:46:35 kre Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)jobs.c     8.5 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: jobs.c,v 1.76 2016/05/02 01:46:31 christos Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.77 2016/05/03 20:46:35 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -102,6 +102,7 @@
 STATIC void cmdtxt(union node *);
 STATIC void cmdlist(union node *, int);
 STATIC void cmdputs(const char *);
+static void inline cmdputi(int);
 
 #ifdef SYSV
 STATIC int onsigchild(void);
@@ -380,6 +381,15 @@
 }
 #endif
 
+static void inline
+cmdputi(int n)
+{
+       char str[20];
+
+       fmtstr(str, sizeof str, "%d", n);
+       cmdputs(str);
+}
+
 static void
 showjob(struct output *out, struct job *jp, int mode)
 {
@@ -1249,7 +1259,6 @@
        struct nodelist *lp;
        const char *p;
        int i;
-       char s[2];
 
        if (n == NULL || cmdnleft <= 0)
                return;
@@ -1354,16 +1363,14 @@
        case NFROMTO:
                p = "<>";  i = 0;  goto redir;
 redir:
-               if (n->nfile.fd != i) {
-                       s[0] = n->nfile.fd + '0';
-                       s[1] = '\0';
-                       cmdputs(s);
-               }
+               if (n->nfile.fd != i)
+                       cmdputi(n->nfile.fd);
                cmdputs(p);
                if (n->type == NTOFD || n->type == NFROMFD) {
-                       s[0] = n->ndup.dupfd + '0';
-                       s[1] = '\0';
-                       cmdputs(s);
+                       if (n->ndup.dupfd < 0)
+                               cmdputs("-");
+                       else
+                               cmdputi(n->ndup.dupfd);
                } else {
                        cmdtxt(n->nfile.fname);
                }