...

diff --git a/.gitignore b/.gitignore
index 109ba994d6f35cff60bceffdfcb98404e108e25f..f6bc33f1075b907c54f5cbfab3f9241c76fec62b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,9 +18,6 @@ configure.scan
 **/Makefile.in
 stamp-h1
 
-# tags
-tags
-
 # build objects
 *.o
 *.log

diff --git a/Makefile.am b/Makefile.am
index 84b645766fc9c60873cb207bfd0b36f0b7b2f47f..f54c93c82f9da138d90675ff18973d89f82d6d70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,6 @@ seederd_SOURCES = \
        src/bencode/encode.c \
        src/block.c \
        src/default.c \
-       src/feed/entries.c \
-       src/feed/feeds.c \
-       src/feed/gen.c \
-       src/feed/info.c \
-       src/feed/path.c \
        src/file.c \
        src/fs/concat.c \
        src/fs/dir.c \
@@ -48,7 +43,6 @@ seederd_SOURCES = \
        src/net/wait.c \
        src/opt/config.c \
        src/opt/env.c \
-       src/opt/feed.c \
        src/opt/filter.c \
        src/opt/loglevel.c \
        src/opt/out.c \
@@ -74,12 +68,6 @@ seederd_SOURCES = \
        src/peer/request.c \
        src/piece.c \
        src/pqueue.c \
-       src/rss/entry.c \
-       src/rss/footer.c \
-       src/rss/free.c \
-       src/rss/header.c \
-       src/rss/info.c \
-       src/rss/init.c \
        src/session.c \
        src/sighandler.c \
        src/torrent/add.c \
@@ -101,7 +89,6 @@ seederd_SOURCES += \
        inc/bencode.h \
        inc/block.h \
        inc/default.h \
-       inc/feed.h \
        inc/file.h \
        inc/fs.h \
        inc/hash.h \
@@ -114,7 +101,6 @@ seederd_SOURCES += \
        inc/opt.h \
        inc/piece.h \
        inc/pqueue.h \
-       inc/rss.h \
        inc/session.h \
        inc/sighandler.h \
        inc/torrent.h \

diff --git a/src/default.c b/src/default.c
index 3d839e08f000f8f01cce93e9c08f287f34fcecb5..a31fcf95949d259d29d27815c004a5d8d76903a8 100644 (file)
--- a/src/default.c
+++ b/src/default.c
@@ -15,7 +15,6 @@ int defaults() {
        // suppress output temporarily
        opt_set_log_level(LOG_LEVEL_SILENT);
 
-       if(opt_set_feed_url("")<0) { return -1; }
        if(opt_set_file_filter("default")<0) { return -1; }
        if(opt_set_piece_length("16384")<0) { return -1; }
        if(opt_set_port("5150")<0) { return -1; }

diff --git a/src/init.c b/src/init.c
index 86e6a2ff6e7205c44bdaa8ee08a65e7331e639cd..10cf1910f2f542791d7aa15265e42003bbf2ef6d 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -7,7 +7,6 @@
 struct option long_options[] = {
        {"config-file", required_argument, 0, 'c'},
        {"daemon", no_argument, 0, 'd'},
-       {"feed-url", required_argument, 0, 'u'},
        {"file-filter", required_argument, 0, 'f'},
        {"help", no_argument, 0, 'h'},
        {"log-file", required_argument, 0, 'l'},
@@ -68,9 +67,6 @@ int init(int argc, char **argv) {
                        case 'q':
                                opt_set_log_level(LOG_LEVEL_SILENT);
                                break;
-                       case 'u':
-                               if(opt_set_feed_url(optarg)<0) { return -1; }
-                               break;
                        case 'v':
                                opt_set_log_level(LOG_LEVEL_VERBOSE);
                                break;

diff --git a/src/main.c b/src/main.c
index 7aaf5fe7ae17b275ce268279465788e6d1623e68..0c6526ecd3ce01ae19e0b925f5175cbaaa6dd7eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,7 +4,6 @@ int main(int argc, char **argv) {
        if(init(argc,argv)<0) { return EXIT_FAILURE; }
 
        if(add()<0) { return EXIT_FAILURE; }
-       if(feeds()<0) { return EXIT_FAILURE; }
        if(watch()<0) { return EXIT_FAILURE; }
 
        if(net_start()<0) { return EXIT_FAILURE; }

diff --git a/src/opt/env.c b/src/opt/env.c
index f3fcbf631c0662674b59518c17a450792617d399..2374f31ed847f66b27511756b1561d376e92cf9c 100644 (file)
--- a/src/opt/env.c
+++ b/src/opt/env.c
@@ -15,7 +15,6 @@ int opt_load_from_env() {
        log_info(OPT_MESSAGE_ENV_LOADING);
 
        CHECK_ENV("CONFIG",opt_load_config_file);
-       CHECK_ENV("FEED_URL",opt_set_feed_url);
        CHECK_ENV("FILE_FILTER",opt_set_file_filter);
        CHECK_ENV("LOG_FILE",opt_set_out_stream);
        CHECK_ENV("PIECE_LENGTH",opt_set_piece_length);

diff --git a/src/opt/set.c b/src/opt/set.c
index 35fe0cb2306771cb0f09c82e986596ebb576b067..680ce0dfc2ab6e8374ae5b10805ce93c17fcf400 100644 (file)
--- a/src/opt/set.c
+++ b/src/opt/set.c
@@ -9,7 +9,6 @@ struct option_lookup_table_entry {
 // see src/opt/env.c for environmental variables
 
 struct option_lookup_table_entry option_lookup_table[] = {
-       {"feed_url",&opt_set_feed_url},
        {"file_filter",&opt_set_file_filter},
        {"piece_length",&opt_set_piece_length},
        {"port",&opt_set_port},