[src/netbsd-1-6]: src/usr.bin/sort Pull up revision 1.21 (requested by enami ...

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

details:   https://anonhg.NetBSD.org/src/rev/42801e4cfff9
branches:  netbsd-1-6
changeset: 529128:42801e4cfff9
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Oct 01 23:53:11 2002 +0000

description:
Pull up revision 1.21 (requested by enami in ticket #883):
Use the right file to output merge result.

diffstat:

 usr.bin/sort/fsort.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 82a330120c2d -r 42801e4cfff9 usr.bin/sort/fsort.c
--- a/usr.bin/sort/fsort.c      Tue Oct 01 23:50:15 2002 +0000
+++ b/usr.bin/sort/fsort.c      Tue Oct 01 23:53:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsort.c,v 1.20 2001/05/15 11:49:25 jdolecek Exp $      */
+/*     $NetBSD: fsort.c,v 1.20.2.1 2002/10/01 23:53:11 lukem Exp $     */
 
 /*-
  * Copyright (c) 1993
@@ -47,7 +47,7 @@
 #include "fsort.h"
 
 #ifndef lint
-__RCSID("$NetBSD: fsort.c,v 1.20 2001/05/15 11:49:25 jdolecek Exp $");
+__RCSID("$NetBSD: fsort.c,v 1.20.2.1 2002/10/01 23:53:11 lukem Exp $");
 __SCCSID("@(#)fsort.c  8.1 (Berkeley) 6/6/93");
 #endif /* not lint */
 
@@ -204,7 +204,8 @@
 
                                        fstack[base + ntfiles].fp = ftmp();
                                        fmerge(0, MSTART, filelist,
-                                           mfct, geteasy, fstack[base].fp,
+                                           mfct, geteasy,
+                                           fstack[base + ntfiles].fp,
                                            putrec, ftbl);
                                        ntfiles++;
                                        mfct = 0;