When pre-sorting a regular file, use lib/arraysort.h on an array of items

[libucw.git] / lib / sorter.c

diff --git a/lib/sorter.c b/lib/sorter.c
index b43672f4b99d10e090a4450e9338fe69c233ea46..bda973e5d7887e8013b8885ea105ac33ba330295 100644 (file)
--- a/lib/sorter.c
+++ b/lib/sorter.c
@@ -1,7 +1,10 @@
 /*
  *     Sherlock Library -- Universal Sorter
  *
- *     (c) 2001 Martin Mares <mj@ucw.cz>
+ *     (c) 2001--2002 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
@@ -17,14 +20,12 @@
 uns sorter_trace;
 uns sorter_presort_bufsize = 65536;
 uns sorter_stream_bufsize = 65536;
-static byte *sorter_template = "/tmp/sort%d.%d";
 
 static struct cfitem sorter_config[] = {
   { "Sorter",          CT_SECTION,     NULL },
   { "Trace",           CT_INT,         &sorter_trace },
   { "PresortBuffer",   CT_INT,         &sorter_presort_bufsize },
   { "StreamBuffer",    CT_INT,         &sorter_stream_bufsize },
-  { "TempLate",                CT_STRING,      &sorter_template },
   { NULL,              CT_STOP,        NULL }
 };
 
@@ -34,16 +35,3 @@ static void CONSTRUCTOR sorter_init_config(void)
 }
 
 uns sorter_pass_counter;
-uns sorter_file_counter;
-
-struct fastbuf *
-sorter_open_tmp(void)
-{
-  byte buf[256];
-  struct fastbuf *f;
-
-  sprintf(buf, sorter_template, (int) getpid(), sorter_file_counter++);
-  f = bopen(buf, O_RDWR | O_CREAT | O_EXCL, sorter_stream_bufsize);
-  f->is_temp_file = 1;
-  return f;
-}