X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fsorter.c;h=20db9ef1974e3b86ea9866b1f303bcad63534df6;hb=55c249f666faddb7d4e999d8a8e3ab66bccfae96;hp=b43672f4b99d10e090a4450e9338fe69c233ea46;hpb=23f2f5abfec1098ce98afa88b8308b869d59216c;p=libucw.git

diff --git a/lib/sorter.c b/lib/sorter.c
index b43672f4..20db9ef1 100644
--- a/lib/sorter.c
+++ b/lib/sorter.c
@@ -1,49 +1,13 @@
 /*
- *	Sherlock Library -- Universal Sorter
+ *	UCW 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"
-#include "lib/conf.h"
-#include "lib/fastbuf.h"
-
-#include <unistd.h>
-#include <sys/fcntl.h>
-
-#define SORT_DECLARE_ONLY
-#include "lib/sorter.h"
-
-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 }
-};
-
-static void CONSTRUCTOR sorter_init_config(void)
-{
-  cf_register(sorter_config);
-}
+#include "lib/sorter-globals.h"
 
 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;
-}