From: Bastian Dehn <hhaalo@arcor.de>
Date: Wed, 11 Aug 2021 19:20:23 +0000 (+0200)
Subject: change: folder structure build with cmake
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=e90efe3a0aef2ae6de6acea6853a48b8e67add85;p=discspan.git

change: folder structure build with cmake
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e07d1b..507a0a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,14 +10,14 @@ set(HEADERPATH "/usr/local/include")
 project(discspan)
 
 if (SHAREDLIB)
-	set(SOURCES discspan.c help.c)
-	set(SOURCE_LIB logic.c filehandler.c splitter.c)
-	set(PUBLIC_HEADERS discspan.h logic.h filehandler.h splitter.h)
+	file(GLOB SOURCES discspan/*.c)
+	file(GLOB SOURCE_LIB libspandisc/*.c)
+	include_directories(include)
 
 	add_library(spandisc SHARED ${SOURCE_LIB})
-	set_target_properties(spandisc PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 else()
-	set(SOURCES discspan.c help.c logic.c filehandler.c splitter.c)
+	file(GLOB SOURCES discspan/*.c libspandisc/*.c)
+	include_directories(include)
 endif()
 
 add_executable(discspan ${SOURCES})
diff --git a/discspan.c b/discspan.c
deleted file mode 100644
index fce4b6b..0000000
--- a/discspan.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "discspan.h"
-#include "logic.h"
-#include "help.h"
-
-extern void useage();
-extern void (*status_print)(const char *output, medium_t disc);
-extern void run(const char *input,
-		const char *output,
-		unsigned long long split);
-
-typedef struct {
-	char *input;
-	char *output;
-	unsigned long long split;
-} param_t;
-
-param_t readArgument(int argc, char *argv[])
-{
-	param_t parameter = { NULL, NULL, 0 };
-
-	// Medien groessen
-	const unsigned long long bluray = 24159191040;
-	const unsigned long long dvd9 = 8500000000;
-	const unsigned long long dvd5 = 4700000000;
-	const unsigned long long cd = 734003200;
-
-	int c = 0;
-	while ((c = getopt(argc, argv, ":59bcf:hi:o:")) != -1) {
-		switch (c) {
-		case 'i':
-			parameter.input = optarg;
-			break;
-		case 'o':
-			parameter.output = optarg;
-			break;
-		case '5':
-			parameter.split = dvd5;
-			break;
-		case '9':
-			parameter.split = dvd9;
-			break;
-		case 'b':
-			parameter.split = bluray;
-			break;
-		case 'c':
-			parameter.split = cd;
-			break;
-		case 'f':
-			parameter.split = atoll(optarg);
-			break;
-		case 'h':
-			useage();
-			exit(0);
-			break;
-		default:
-			printf("WARNUNG: Parameter -%c unbekannt!\n", optopt);
-			break;
-		}
-	}
-
-	return parameter;
-}
-
-void print_human_read_size(const char *output, medium_t medium)
-{
-	unsigned long long humanread;
-	char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'};
-	int i = 0;
-
-	humanread = medium.freespace;
-	while (humanread >= 1024) {
-		humanread /= 1024;
-		i++;
-	}
-
-	if (i > sizeof(einheit)/sizeof(einheit[0]))
-		i = 0;
-
-	printf("Restlicher Platz in Bytes(%s): %lld (%lld %c)\n", output,
-			medium.freespace, humanread, einheit[i]);
-}
-
-int main(int argc, char *argv[])
-{
-	param_t parameter = readArgument(argc, argv);
-
-	if (parameter.input == NULL
-			|| parameter.output == NULL
-			|| parameter.split < 2048) {
-		useage();
-		exit(1);
-	}
-
-	if (access(parameter.input, F_OK) < 0) {
-		printf("ERROR: %s existiert nicht!\n", parameter.input);
-		exit(1);
-	}
-
-	status_print = print_human_read_size;
-	run(parameter.input, parameter.output, parameter.split);
-
-	return 0;
-}
diff --git a/discspan.h b/discspan.h
deleted file mode 100644
index 611a78d..0000000
--- a/discspan.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _DISCSPAN_H
-#define _DISCSPAN_H
-
-typedef struct {
-	char name[255];
-	unsigned long long fsize;
-	unsigned int type;
-} file_size_t;
-
-typedef struct {
-	int nr;
-	unsigned long long freespace;
-	int length;
-	file_size_t *filearray;
-} medium_t;
-
-typedef struct {
-	int length;
-	medium_t *disc;
-} collection_t;
-
-#endif
diff --git a/discspan/discspan.c b/discspan/discspan.c
new file mode 100644
index 0000000..fce4b6b
--- /dev/null
+++ b/discspan/discspan.c
@@ -0,0 +1,107 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "discspan.h"
+#include "logic.h"
+#include "help.h"
+
+extern void useage();
+extern void (*status_print)(const char *output, medium_t disc);
+extern void run(const char *input,
+		const char *output,
+		unsigned long long split);
+
+typedef struct {
+	char *input;
+	char *output;
+	unsigned long long split;
+} param_t;
+
+param_t readArgument(int argc, char *argv[])
+{
+	param_t parameter = { NULL, NULL, 0 };
+
+	// Medien groessen
+	const unsigned long long bluray = 24159191040;
+	const unsigned long long dvd9 = 8500000000;
+	const unsigned long long dvd5 = 4700000000;
+	const unsigned long long cd = 734003200;
+
+	int c = 0;
+	while ((c = getopt(argc, argv, ":59bcf:hi:o:")) != -1) {
+		switch (c) {
+		case 'i':
+			parameter.input = optarg;
+			break;
+		case 'o':
+			parameter.output = optarg;
+			break;
+		case '5':
+			parameter.split = dvd5;
+			break;
+		case '9':
+			parameter.split = dvd9;
+			break;
+		case 'b':
+			parameter.split = bluray;
+			break;
+		case 'c':
+			parameter.split = cd;
+			break;
+		case 'f':
+			parameter.split = atoll(optarg);
+			break;
+		case 'h':
+			useage();
+			exit(0);
+			break;
+		default:
+			printf("WARNUNG: Parameter -%c unbekannt!\n", optopt);
+			break;
+		}
+	}
+
+	return parameter;
+}
+
+void print_human_read_size(const char *output, medium_t medium)
+{
+	unsigned long long humanread;
+	char einheit[6] = {'B', 'K', 'M', 'G', 'T', 'P'};
+	int i = 0;
+
+	humanread = medium.freespace;
+	while (humanread >= 1024) {
+		humanread /= 1024;
+		i++;
+	}
+
+	if (i > sizeof(einheit)/sizeof(einheit[0]))
+		i = 0;
+
+	printf("Restlicher Platz in Bytes(%s): %lld (%lld %c)\n", output,
+			medium.freespace, humanread, einheit[i]);
+}
+
+int main(int argc, char *argv[])
+{
+	param_t parameter = readArgument(argc, argv);
+
+	if (parameter.input == NULL
+			|| parameter.output == NULL
+			|| parameter.split < 2048) {
+		useage();
+		exit(1);
+	}
+
+	if (access(parameter.input, F_OK) < 0) {
+		printf("ERROR: %s existiert nicht!\n", parameter.input);
+		exit(1);
+	}
+
+	status_print = print_human_read_size;
+	run(parameter.input, parameter.output, parameter.split);
+
+	return 0;
+}
diff --git a/discspan/help.c b/discspan/help.c
new file mode 100644
index 0000000..eb018f0
--- /dev/null
+++ b/discspan/help.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include "help.h"
+
+void useage()
+{
+	printf("\nUsage: discspan <option> -i <source> -o <prefix>\n\n");
+	printf("   -i <source>\tpath to source file\n");
+	printf("   -o <prefix>\tprefix for output files\n\n");
+	printf("Option:\n\n");
+	printf("   -b\t\tsize of Bluray: 25.000.000.000 bytes\n");
+	printf("   -9\t\tsize of double layer DVD 8.500.000.000 bytes\n");
+	printf("   -5\t\tsize of sigle layer DVD: 4.700.000.000 bytes\n");
+	printf("   -c\t\tsize of CD: 734.003.200 bytes\n");
+	printf("   -f <size>\tsize in bytes\n");
+	printf("   -h\t\tshow this help\n\n");
+}
diff --git a/filehandler.c b/filehandler.c
deleted file mode 100644
index 13e8785..0000000
--- a/filehandler.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <sys/stat.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "discspan.h"
-#include "filehandler.h"
-
-void malloc_array_length(FILE *in, medium_t *srcdata)
-{
-	int lines = 0;
-	char pfad[255];
-
-	while (fscanf(in, "%[^\n]\n", pfad) == 1) {
-		lines++;
-	}
-	rewind(in);
-
-	srcdata->length = lines;
-	srcdata->filearray = (file_size_t *)
-		malloc(srcdata->length * sizeof(file_size_t));
-}
-
-void fill_array_from_file(FILE *in, medium_t *srcdata)
-{
-	char pfad[255];
-	struct stat st;
-	int lines = 0;
-
-	while (fscanf(in, "%[^\n]\n", pfad) == 1) {
-		// Lese Dateieigenschaften in st struct
-		stat(pfad, &st);
-		strcpy(srcdata->filearray[lines].name, pfad);
-		srcdata->filearray[lines].type = st.st_mode;
-		srcdata->filearray[lines++].fsize = st.st_size;
-	}
-}
-
-void read_input_file(const char *input, medium_t *srcdata)
-{
-	FILE *in = fopen(input, "r");
-
-	malloc_array_length(in, srcdata);
-	fill_array_from_file(in, srcdata);
-
-	fclose(in);
-}
-
-void write_output_file(const char *output, medium_t disc)
-{
-	FILE *out = fopen(output, "w");
-
-	for (int i = 0; i < disc.length; i++) {
-		fprintf(out, "%s\n", disc.filearray[i].name);
-	}
-
-	fclose(out);
-}
diff --git a/filehandler.h b/filehandler.h
deleted file mode 100644
index 04bd2ee..0000000
--- a/filehandler.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _FILEHANDLER_H
-#define _FILEHANDLER_H
-
-void read_input_file(const char *input, medium_t *srcdata);
-
-void write_output_file(const char *output, medium_t disc);
-
-#endif
diff --git a/help.c b/help.c
deleted file mode 100644
index eb018f0..0000000
--- a/help.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-#include "help.h"
-
-void useage()
-{
-	printf("\nUsage: discspan <option> -i <source> -o <prefix>\n\n");
-	printf("   -i <source>\tpath to source file\n");
-	printf("   -o <prefix>\tprefix for output files\n\n");
-	printf("Option:\n\n");
-	printf("   -b\t\tsize of Bluray: 25.000.000.000 bytes\n");
-	printf("   -9\t\tsize of double layer DVD 8.500.000.000 bytes\n");
-	printf("   -5\t\tsize of sigle layer DVD: 4.700.000.000 bytes\n");
-	printf("   -c\t\tsize of CD: 734.003.200 bytes\n");
-	printf("   -f <size>\tsize in bytes\n");
-	printf("   -h\t\tshow this help\n\n");
-}
diff --git a/help.h b/help.h
deleted file mode 100644
index d88fd30..0000000
--- a/help.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _HELP_H
-#define _HELP_H
-
-void usage();
-
-#endif
diff --git a/include/discspan.h b/include/discspan.h
new file mode 100644
index 0000000..611a78d
--- /dev/null
+++ b/include/discspan.h
@@ -0,0 +1,22 @@
+#ifndef _DISCSPAN_H
+#define _DISCSPAN_H
+
+typedef struct {
+	char name[255];
+	unsigned long long fsize;
+	unsigned int type;
+} file_size_t;
+
+typedef struct {
+	int nr;
+	unsigned long long freespace;
+	int length;
+	file_size_t *filearray;
+} medium_t;
+
+typedef struct {
+	int length;
+	medium_t *disc;
+} collection_t;
+
+#endif
diff --git a/include/filehandler.h b/include/filehandler.h
new file mode 100644
index 0000000..04bd2ee
--- /dev/null
+++ b/include/filehandler.h
@@ -0,0 +1,8 @@
+#ifndef _FILEHANDLER_H
+#define _FILEHANDLER_H
+
+void read_input_file(const char *input, medium_t *srcdata);
+
+void write_output_file(const char *output, medium_t disc);
+
+#endif
diff --git a/include/help.h b/include/help.h
new file mode 100644
index 0000000..d88fd30
--- /dev/null
+++ b/include/help.h
@@ -0,0 +1,6 @@
+#ifndef _HELP_H
+#define _HELP_H
+
+void usage();
+
+#endif
diff --git a/include/logic.h b/include/logic.h
new file mode 100644
index 0000000..9c23e57
--- /dev/null
+++ b/include/logic.h
@@ -0,0 +1,8 @@
+#ifndef _LOGIC_H
+#define _LOGIC_H
+
+void (*status_print)(const char *output, medium_t disc);
+
+void run(const char *input, const char *output, unsigned long long split);
+
+#endif
diff --git a/include/splitter.h b/include/splitter.h
new file mode 100644
index 0000000..3c5c148
--- /dev/null
+++ b/include/splitter.h
@@ -0,0 +1,8 @@
+#ifndef _SPLITTER_H
+#define _SPLITTER_H
+
+medium_t splitter(medium_t *srcdata);
+medium_t ignore(medium_t *srcdata);
+collection_t split_all(medium_t *srcdata);
+
+#endif
diff --git a/libspandisc/filehandler.c b/libspandisc/filehandler.c
new file mode 100644
index 0000000..13e8785
--- /dev/null
+++ b/libspandisc/filehandler.c
@@ -0,0 +1,58 @@
+#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "discspan.h"
+#include "filehandler.h"
+
+void malloc_array_length(FILE *in, medium_t *srcdata)
+{
+	int lines = 0;
+	char pfad[255];
+
+	while (fscanf(in, "%[^\n]\n", pfad) == 1) {
+		lines++;
+	}
+	rewind(in);
+
+	srcdata->length = lines;
+	srcdata->filearray = (file_size_t *)
+		malloc(srcdata->length * sizeof(file_size_t));
+}
+
+void fill_array_from_file(FILE *in, medium_t *srcdata)
+{
+	char pfad[255];
+	struct stat st;
+	int lines = 0;
+
+	while (fscanf(in, "%[^\n]\n", pfad) == 1) {
+		// Lese Dateieigenschaften in st struct
+		stat(pfad, &st);
+		strcpy(srcdata->filearray[lines].name, pfad);
+		srcdata->filearray[lines].type = st.st_mode;
+		srcdata->filearray[lines++].fsize = st.st_size;
+	}
+}
+
+void read_input_file(const char *input, medium_t *srcdata)
+{
+	FILE *in = fopen(input, "r");
+
+	malloc_array_length(in, srcdata);
+	fill_array_from_file(in, srcdata);
+
+	fclose(in);
+}
+
+void write_output_file(const char *output, medium_t disc)
+{
+	FILE *out = fopen(output, "w");
+
+	for (int i = 0; i < disc.length; i++) {
+		fprintf(out, "%s\n", disc.filearray[i].name);
+	}
+
+	fclose(out);
+}
diff --git a/libspandisc/logic.c b/libspandisc/logic.c
new file mode 100644
index 0000000..79da719
--- /dev/null
+++ b/libspandisc/logic.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "discspan.h"
+#include "logic.h"
+#include "splitter.h"
+#include "filehandler.h"
+
+extern void read_input_file(const char *input, medium_t *srcdata);
+extern void write_output_file(const char *output, medium_t disc);
+extern collection_t splitall(medium_t *srcdata);
+
+void on_status_print(const char *output, medium_t disc)
+{
+	if (status_print != NULL)
+		status_print(output, disc);
+}
+
+int cmpfunc(const void *filea, const void *fileb)
+{
+	unsigned long long a = ((const file_size_t*)filea)->fsize;
+	unsigned long long b = ((const file_size_t*)fileb)->fsize;
+
+	if (a < b)
+		return 1;
+	else if (a > b)
+		return -1;
+	else if (a == b)
+		return 0;
+	else
+		return -2;
+}
+
+void run(const char *input, const char *output, unsigned long long split)
+{
+	medium_t srcdata = { 0, split, 0, NULL };
+	read_input_file(input, &srcdata);
+
+	qsort(srcdata.filearray, srcdata.length, sizeof(file_size_t), cmpfunc);
+
+	collection_t col = split_all(&srcdata);
+
+	char outname[strlen(output) + 4];
+	for (int i = 0; i < col.length; i++) {
+		sprintf(outname, "%s%04d", output, col.disc[i].nr);
+		on_status_print(outname, col.disc[i]);
+		write_output_file(outname, col.disc[i]);
+		free(col.disc[i].filearray);
+	}
+
+	free(col.disc);
+}
diff --git a/libspandisc/splitter.c b/libspandisc/splitter.c
new file mode 100644
index 0000000..d057ea9
--- /dev/null
+++ b/libspandisc/splitter.c
@@ -0,0 +1,120 @@
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "discspan.h"
+#include "splitter.h"
+
+#define S_IFREG 0100000 // bitmask for regular file; man inode
+
+medium_t init_empty_medium(medium_t srcdata)
+{
+	medium_t empty;
+	empty.nr = srcdata.nr;
+	empty.freespace = srcdata.freespace;
+	empty.length = 0;
+	empty.filearray = (file_size_t *)
+		malloc(1 * sizeof(file_size_t));
+	return empty;
+}
+
+int can_add_file_to_medium(medium_t *disc, file_size_t file)
+{
+	int retvalue = 0;
+
+	// ISO9660 filesystem overhead
+	unsigned long long filesize = ceil(file.fsize / 2048.0) * 2048;
+
+	if (disc->freespace >= filesize) {
+		disc->freespace -= filesize;
+		retvalue = 1;
+	}
+
+	return retvalue;
+}
+
+int bigger_file_ignore_medium(medium_t *disc, file_size_t file)
+{
+	int retvalue = 0;
+	unsigned long long filesize = ceil(file.fsize /2048.0) * 2048;
+
+	if ((file.type & S_IFREG) != S_IFREG)
+		retvalue = 1;
+
+	if (disc->freespace < filesize)
+		retvalue = 1;
+
+	return retvalue;
+}
+
+void add_item_medium(medium_t *medium, file_size_t item)
+{
+	medium->filearray = (file_size_t *)realloc(medium->filearray,
+			(medium->length + 1) *
+			sizeof(file_size_t));
+	medium->filearray[medium->length] = item;
+	medium->length++;
+}
+
+medium_t splitter_to_disc(medium_t *srcdata,
+		int (*check)(medium_t*, file_size_t))
+{
+	medium_t rest = init_empty_medium(*srcdata);
+	medium_t disc = init_empty_medium(*srcdata);
+
+	for (int i = 0; i < srcdata->length; i++) {
+		if (check(&disc, srcdata->filearray[i]))
+			add_item_medium(&disc, srcdata->filearray[i]);
+		else
+			add_item_medium(&rest, srcdata->filearray[i]);
+	}
+
+	memcpy(srcdata->filearray, rest.filearray,
+			rest.length * sizeof(file_size_t));
+
+	srcdata->length = rest.length;
+	srcdata->filearray = (file_size_t *) realloc(srcdata->filearray,
+					srcdata->length * sizeof(file_size_t));
+
+	free(rest.filearray);
+	return disc;
+}
+
+medium_t splitter(medium_t *srcdata)
+{
+	medium_t disc = splitter_to_disc(srcdata, can_add_file_to_medium);
+	return disc;
+}
+
+medium_t ignore(medium_t *srcdata)
+{
+	medium_t ignore = splitter_to_disc(srcdata, bigger_file_ignore_medium);
+	return ignore;
+}
+
+collection_t split_all(medium_t *srcdata)
+{
+	collection_t col;
+	col.length = 0;
+	col.disc = NULL;
+
+	medium_t ignoredisc;
+	ignoredisc = ignore(srcdata);
+	ignoredisc.freespace = 0;
+	if (ignoredisc.length > 0) {
+		col.disc = (medium_t *)malloc(sizeof(medium_t));
+		col.disc[col.length] = ignoredisc;
+		col.length++;
+	}
+
+	while (srcdata->length > 0) {
+		srcdata->nr++;
+		medium_t disc = splitter(srcdata);
+		col.disc = (medium_t *)
+			realloc(col.disc, (col.length + 1) * sizeof(medium_t));
+		col.disc[col.length] = disc;
+		col.length++;
+	}
+
+	free(srcdata->filearray);
+	return col;
+}
diff --git a/logic.c b/logic.c
deleted file mode 100644
index 79da719..0000000
--- a/logic.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "discspan.h"
-#include "logic.h"
-#include "splitter.h"
-#include "filehandler.h"
-
-extern void read_input_file(const char *input, medium_t *srcdata);
-extern void write_output_file(const char *output, medium_t disc);
-extern collection_t splitall(medium_t *srcdata);
-
-void on_status_print(const char *output, medium_t disc)
-{
-	if (status_print != NULL)
-		status_print(output, disc);
-}
-
-int cmpfunc(const void *filea, const void *fileb)
-{
-	unsigned long long a = ((const file_size_t*)filea)->fsize;
-	unsigned long long b = ((const file_size_t*)fileb)->fsize;
-
-	if (a < b)
-		return 1;
-	else if (a > b)
-		return -1;
-	else if (a == b)
-		return 0;
-	else
-		return -2;
-}
-
-void run(const char *input, const char *output, unsigned long long split)
-{
-	medium_t srcdata = { 0, split, 0, NULL };
-	read_input_file(input, &srcdata);
-
-	qsort(srcdata.filearray, srcdata.length, sizeof(file_size_t), cmpfunc);
-
-	collection_t col = split_all(&srcdata);
-
-	char outname[strlen(output) + 4];
-	for (int i = 0; i < col.length; i++) {
-		sprintf(outname, "%s%04d", output, col.disc[i].nr);
-		on_status_print(outname, col.disc[i]);
-		write_output_file(outname, col.disc[i]);
-		free(col.disc[i].filearray);
-	}
-
-	free(col.disc);
-}
diff --git a/logic.h b/logic.h
deleted file mode 100644
index 9c23e57..0000000
--- a/logic.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LOGIC_H
-#define _LOGIC_H
-
-void (*status_print)(const char *output, medium_t disc);
-
-void run(const char *input, const char *output, unsigned long long split);
-
-#endif
diff --git a/splitter.c b/splitter.c
deleted file mode 100644
index d057ea9..0000000
--- a/splitter.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "discspan.h"
-#include "splitter.h"
-
-#define S_IFREG 0100000 // bitmask for regular file; man inode
-
-medium_t init_empty_medium(medium_t srcdata)
-{
-	medium_t empty;
-	empty.nr = srcdata.nr;
-	empty.freespace = srcdata.freespace;
-	empty.length = 0;
-	empty.filearray = (file_size_t *)
-		malloc(1 * sizeof(file_size_t));
-	return empty;
-}
-
-int can_add_file_to_medium(medium_t *disc, file_size_t file)
-{
-	int retvalue = 0;
-
-	// ISO9660 filesystem overhead
-	unsigned long long filesize = ceil(file.fsize / 2048.0) * 2048;
-
-	if (disc->freespace >= filesize) {
-		disc->freespace -= filesize;
-		retvalue = 1;
-	}
-
-	return retvalue;
-}
-
-int bigger_file_ignore_medium(medium_t *disc, file_size_t file)
-{
-	int retvalue = 0;
-	unsigned long long filesize = ceil(file.fsize /2048.0) * 2048;
-
-	if ((file.type & S_IFREG) != S_IFREG)
-		retvalue = 1;
-
-	if (disc->freespace < filesize)
-		retvalue = 1;
-
-	return retvalue;
-}
-
-void add_item_medium(medium_t *medium, file_size_t item)
-{
-	medium->filearray = (file_size_t *)realloc(medium->filearray,
-			(medium->length + 1) *
-			sizeof(file_size_t));
-	medium->filearray[medium->length] = item;
-	medium->length++;
-}
-
-medium_t splitter_to_disc(medium_t *srcdata,
-		int (*check)(medium_t*, file_size_t))
-{
-	medium_t rest = init_empty_medium(*srcdata);
-	medium_t disc = init_empty_medium(*srcdata);
-
-	for (int i = 0; i < srcdata->length; i++) {
-		if (check(&disc, srcdata->filearray[i]))
-			add_item_medium(&disc, srcdata->filearray[i]);
-		else
-			add_item_medium(&rest, srcdata->filearray[i]);
-	}
-
-	memcpy(srcdata->filearray, rest.filearray,
-			rest.length * sizeof(file_size_t));
-
-	srcdata->length = rest.length;
-	srcdata->filearray = (file_size_t *) realloc(srcdata->filearray,
-					srcdata->length * sizeof(file_size_t));
-
-	free(rest.filearray);
-	return disc;
-}
-
-medium_t splitter(medium_t *srcdata)
-{
-	medium_t disc = splitter_to_disc(srcdata, can_add_file_to_medium);
-	return disc;
-}
-
-medium_t ignore(medium_t *srcdata)
-{
-	medium_t ignore = splitter_to_disc(srcdata, bigger_file_ignore_medium);
-	return ignore;
-}
-
-collection_t split_all(medium_t *srcdata)
-{
-	collection_t col;
-	col.length = 0;
-	col.disc = NULL;
-
-	medium_t ignoredisc;
-	ignoredisc = ignore(srcdata);
-	ignoredisc.freespace = 0;
-	if (ignoredisc.length > 0) {
-		col.disc = (medium_t *)malloc(sizeof(medium_t));
-		col.disc[col.length] = ignoredisc;
-		col.length++;
-	}
-
-	while (srcdata->length > 0) {
-		srcdata->nr++;
-		medium_t disc = splitter(srcdata);
-		col.disc = (medium_t *)
-			realloc(col.disc, (col.length + 1) * sizeof(medium_t));
-		col.disc[col.length] = disc;
-		col.length++;
-	}
-
-	free(srcdata->filearray);
-	return col;
-}
diff --git a/splitter.h b/splitter.h
deleted file mode 100644
index 3c5c148..0000000
--- a/splitter.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SPLITTER_H
-#define _SPLITTER_H
-
-medium_t splitter(medium_t *srcdata);
-medium_t ignore(medium_t *srcdata);
-collection_t split_all(medium_t *srcdata);
-
-#endif