[src/netbsd-6]: src/bin/pax Pull up following revision(s) (requested by msait...

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

details:   https://anonhg.NetBSD.org/src/rev/65a5337153e1
branches:  netbsd-6
changeset: 775356:65a5337153e1
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 17 21:50:15 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #586):
        bin/pax/ftree.c: revision 1.42
deal properly with empty lines in spec file

diffstat:

 bin/pax/ftree.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4e2ecc494069 -r 65a5337153e1 bin/pax/ftree.c
--- a/bin/pax/ftree.c   Wed Oct 17 21:48:27 2012 +0000
+++ b/bin/pax/ftree.c   Wed Oct 17 21:50:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftree.c,v 1.40 2009/02/14 08:10:06 lukem Exp $ */
+/*     $NetBSD: ftree.c,v 1.40.8.1 2012/10/17 21:50:15 riz Exp $       */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -71,7 +71,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c    8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ftree.c,v 1.40 2009/02/14 08:10:06 lukem Exp $");
+__RCSID("$NetBSD: ftree.c,v 1.40.8.1 2012/10/17 21:50:15 riz Exp $");
 #endif
 #endif /* not lint */
 
@@ -347,7 +347,7 @@
                         * the user didn't supply any args, get the file trees
                         * to process from stdin;
                         */
-                       for (i = 0; i < PAXPATHLEN + 2; i++) {
+                       for (i = 0; i < PAXPATHLEN + 2;) {
                                c = getchar();
                                if (c == EOF)
                                        break;
@@ -355,7 +355,7 @@
                                        if (i != 0)
                                                break;
                                } else
-                                       farray[0][i] = c;
+                                       farray[0][i++] = c;
                        }
                        if (i == 0)
                                return -1;