Skip to content

Commit

Permalink
Merge pull request #42 from uno20001/general_purpose_linked_list
Browse files Browse the repository at this point in the history 
General purpose linked list
  • Loading branch information
@Rudde
Rudde authored Apr 20, 2020
2 parents a0c182f + 5c4c0d4 commit 754793b
Show file tree
Hide file tree
Showing 10 changed files with 445 additions and 134 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ program = mktorrent
version = 1.1

HEADERS = mktorrent.h
SRCS = ftw.c init.c sha1.c hash.c output.c main.c msg.c
SRCS = ftw.c init.c sha1.c hash.c output.c main.c msg.c ll.c
7 changes: 4 additions & 3 deletions hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "mktorrent.h"
#include "hash.h"
#include "msg.h"
#include "ll.h"

#ifndef O_BINARY
#define O_BINARY 0
Expand All @@ -56,7 +57,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
EXPORT unsigned char *make_hash(struct metafile *m)
{
flist_t *f; /* pointer to a place in the file list */
unsigned char *hash_string; /* the hash string */
unsigned char *pos; /* position in the hash string */
unsigned char *read_buf; /* read buffer */
Expand All @@ -83,8 +83,9 @@ EXPORT unsigned char *make_hash(struct metafile *m)
/* and initiate r to 0 since we haven't read anything yet */
r = 0;
/* go through all the files in the file list */
for (f = m->file_list; f; f = f->next) {

LL_FOR(file_node, m->file_list) {
struct file_data *f = LL_DATA_AS(file_node, struct file_data*);

/* open the current file for reading */
FATAL_IF((fd = open(f->path, OPENFLAGS)) == -1,
"cannot open '%s' for reading: %s\n", f->path, strerror(errno));
Expand Down
4 changes: 2 additions & 2 deletions hash_pthreads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ static void *worker(void *data)
static void read_files(struct metafile *m, struct queue *q, unsigned char *pos)
{
int fd; /* file descriptor */
flist_t *f; /* pointer to a place in the file list */
size_t r = 0; /* number of bytes read from file(s)
into the read buffer */
#ifndef NO_HASH_CHECK
Expand All @@ -213,7 +212,8 @@ static void read_files(struct metafile *m, struct queue *q, unsigned char *pos)
struct piece *p = get_free(q, m->piece_length);

/* go through all the files in the file list */
for (f = m->file_list; f; f = f->next) {
LL_FOR(file_node, m->file_list) {
struct file_data *f = LL_DATA_AS(file_node, struct file_data*);

/* open the current file for reading */
FATAL_IF((fd = open(f->path, OPENFLAGS)) == -1,
Expand Down
164 changes: 87 additions & 77 deletions init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,34 +121,28 @@ static void set_absolute_file_path(struct metafile *m)
* parse a comma separated list of strings <str>[,<str>]* and
* return a string list containing the substrings
*/
static slist_t *get_slist(char *s)
static struct ll *get_slist(char *s)
{
slist_t *list, *last;
char *e;

/* allocate memory for the first node in the list */
list = last = malloc(sizeof(slist_t));
/* allocate a new list */
struct ll *list = ll_new();
FATAL_IF0(list == NULL, "out of memory\n");

/* add URLs to the list while there are commas in the string */
while ((e = strchr(s, ','))) {
/* set the commas to \0 so the URLs appear as
* separate strings */
*e = '\0';
last->s = s;

FATAL_IF0(ll_append(list, s, 0) == NULL, "out of memory\n");

/* move s to point to the next URL */
s = e + 1;

/* append another node to the list */
last->next = malloc(sizeof(slist_t));
last = last->next;
FATAL_IF0(last == NULL, "out of memory\n");
}

/* set the last string in the list */
last->s = s;
last->next = NULL;
FATAL_IF0(ll_append(list, s, 0) == NULL, "out of memory\n");

/* return the list */
return list;
Expand Down Expand Up @@ -176,11 +170,15 @@ static int is_dir(struct metafile *m, char *target)

/* since we know the torrent is just a single file and we've
already stat'ed it, we might as well set the file list */
m->file_list = malloc(sizeof(flist_t));
FATAL_IF0(m->file_list == NULL, "out of memory\n");
m->file_list->path = target;
m->file_list->size = s.st_size;
m->file_list->next = NULL;
struct file_data fd = {
strdup(target),
s.st_size
};

FATAL_IF0(
fd.path == NULL || ll_append(m->file_list, &fd, sizeof(fd)) == NULL,
"out of memory\n");

/* ..and size variable */
m->size = s.st_size;

Expand All @@ -195,8 +193,6 @@ static int is_dir(struct metafile *m, char *target)
*/
static int process_node(const char *path, const struct stat *sb, void *data)
{
flist_t **p; /* pointer to a node in the file list */
flist_t *new_node; /* place to store a newly created node */
struct metafile *m = data;

/* skip non-regular files */
Expand All @@ -219,28 +215,17 @@ static int process_node(const char *path, const struct stat *sb, void *data)
/* count the total size of the files */
m->size += sb->st_size;

/* find where to insert the new node so that the file list
remains ordered by the path */
p = &m->file_list;
while (*p && strcmp(path, (*p)->path) > 0)
p = &((*p)->next);

/* create a new file list node for the file */
new_node = malloc(sizeof(flist_t));
if (new_node == NULL ||
(new_node->path = strdup(path)) == NULL) {
struct file_data fd = {
strdup(path),
sb->st_size
};

if (fd.path == NULL || ll_append(m->file_list, &fd, sizeof(fd)) == NULL) {
fprintf(stderr, "fatal error: out of memory\n");
return -1;
}
new_node->size = sb->st_size;

/* now insert the node there */
new_node->next = *p;
*p = new_node;

/* insertion sort is a really stupid way of sorting a list,
but usually a torrent doesn't contain too many files,
so we'll probably be alright ;) */
return 0;
}

Expand Down Expand Up @@ -302,34 +287,41 @@ static void print_help()
/*
* print the full announce list
*/
static void print_announce_list(llist_t *list)
static void print_announce_list(struct ll *list)
{
unsigned int n;

for (n = 1; list; list = list->next, n++) {
slist_t *l = list->l;

printf(" %u : %s\n", n, l->s);
for (l = l->next; l; l = l->next)
printf(" %s\n", l->s);
unsigned int tier = 1;

LL_FOR(node, list) {

struct ll *inner_list = LL_DATA(node);

printf(" %u : %s\n",
tier, LL_DATA_AS(LL_HEAD(inner_list), const char*));

LL_FOR_FROM(inner_node, LL_NEXT(LL_HEAD(inner_list))) {
printf(" %s\n", LL_DATA_AS(inner_node, const char*));
}

tier += 1;
}
}

/*
* print the list of web seed URLs
*/
static void print_web_seed_list(slist_t *list)
static void print_web_seed_list(struct ll *list)
{
printf(" Web Seed URL: ");

if (list == NULL) {
if (LL_IS_EMPTY(list)) {
printf("none\n");
return;
}

printf("%s\n", list->s);
for (list = list->next; list; list = list->next)
printf(" %s\n", list->s);

printf("%s\n", LL_DATA_AS(LL_HEAD(list), const char*));
LL_FOR_FROM(node, LL_NEXT(LL_HEAD(list))) {
printf(" %s\n", LL_DATA_AS(node, const char*));
}
}

/*
Expand Down Expand Up @@ -374,6 +366,24 @@ static void dump_options(struct metafile *m)
printf("\"%s\"\n\n", m->comment);
}

static int file_data_cmp_by_name(const void *a, const void *b)
{
const struct file_data *x = a, *y = b;
return strcmp(x->path, y->path);
}

static void file_data_clear(void *data)
{
struct file_data *fd = data;
free(fd->path);
}

static void free_inner_list(void *data)
{
struct ll *list = data;
ll_free(list, NULL);
}

/*
* parse and check the command line options given
* and fill out the appropriate fields of the
Expand All @@ -382,8 +392,6 @@ static void dump_options(struct metafile *m)
EXPORT void init(struct metafile *m, int argc, char *argv[])
{
int c; /* return value of getopt() */
llist_t *announce_last = NULL;
slist_t *web_seed_last = NULL;
#ifdef USE_LONG_OPTIONS
/* the option structure to pass to getopt_long() */
static struct option long_options[] = {
Expand All @@ -405,6 +413,15 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
};
#endif

m->announce_list = ll_new();
FATAL_IF0(m->announce_list == NULL, "out of memory\n");

m->web_seed_list = ll_new();
FATAL_IF0(m->web_seed_list == NULL, "out of memory\n");

m->file_list = ll_new();
FATAL_IF0(m->file_list == NULL, "out of memory\n");

/* now parse the command line options given */
#ifdef USE_PTHREADS
#define OPT_STRING "a:c:dhl:n:o:ps:t:vw:"
Expand All @@ -420,17 +437,9 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
#undef OPT_STRING
switch (c) {
case 'a':
if (announce_last == NULL) {
m->announce_list = announce_last =
malloc(sizeof(llist_t));
} else {
announce_last->next =
malloc(sizeof(llist_t));
announce_last = announce_last->next;

}
FATAL_IF0(announce_last == NULL, "out of memory\n");
announce_last->l = get_slist(optarg);
FATAL_IF0(
ll_append(m->announce_list, get_slist(optarg), 0) == NULL,
"out of memory\n");
break;
case 'c':
m->comment = optarg;
Expand Down Expand Up @@ -465,16 +474,7 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
m->verbose = 1;
break;
case 'w':
if (web_seed_last == NULL) {
m->web_seed_list = web_seed_last =
get_slist(optarg);
} else {
web_seed_last->next =
get_slist(optarg);
web_seed_last = web_seed_last->next;
}
while (web_seed_last->next)
web_seed_last = web_seed_last->next;
ll_extend(m->web_seed_list, get_slist(optarg));
break;
case '?':
fatal("use -h for help.\n");
Expand All @@ -487,9 +487,6 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
"the piece length must be a number between 15 and 28.\n");
m->piece_length = 1 << m->piece_length;

if (announce_last != NULL)
announce_last->next = NULL;

/* ..and a file or directory from which to create the torrent */
FATAL_IF0(optind >= argc,
"must specify the contents, use -h for help\n");
Expand Down Expand Up @@ -533,6 +530,8 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
if (file_tree_walk("." DIRSEP, MAX_OPENFD, process_node, m))
exit(EXIT_FAILURE);
}

ll_sort(m->file_list, file_data_cmp_by_name);

/* calculate the number of pieces
pieces = ceil( size / piece_length ) */
Expand All @@ -544,3 +543,14 @@ EXPORT void init(struct metafile *m, int argc, char *argv[])
"That's %u pieces of %u bytes each.\n\n",
m->size, m->pieces, m->piece_length);
}

EXPORT void cleanup_metafile(struct metafile *m)
{
ll_free(m->announce_list, free_inner_list);

ll_free(m->file_list, file_data_clear);

ll_free(m->web_seed_list, NULL);

free(m->metainfo_file_path);
}
1 change: 1 addition & 0 deletions init.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
#include "mktorrent.h" /* struct metafile */

EXPORT void init(struct metafile *m, int argc, char *argv[]);
EXPORT void cleanup_metafile(struct metafile *m);

#endif /* MKTORRENT_INIT_H */
Loading

0 comments on commit 754793b

Please sign in to comment.