diff --git a/.gitignore b/.gitignore index e389ff3..0167574 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,4 @@ autom4te.cache/ !testing/new/Makefile !unsorted-older/kicker/Makefile !unsorted-older/lastraces/Makefile - +!src/pre/mp3genre diff --git a/src/Makefile.in b/src/Makefile.in index b7954e9..ae7d1f3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -30,6 +30,9 @@ show: foobnc: foobnc (cd bouncer; make foobnc) +foobnc: foobnc + (cd bouncer; make foobnc) + webspy: build (cd who; make webspy) diff --git a/src/pre/foo-pre.c b/src/pre/foo-pre.c index 359f076..9e8555d 100644 --- a/src/pre/foo-pre.c +++ b/src/pre/foo-pre.c @@ -20,7 +20,7 @@ */ /* * foo.Pre [C-version] (c) tanesha team, - slv 20170414 - mp3 genre added to PRE output (instead of in mod_idmp3) + slv 20170414 - mp3 genre added to PRE output (instead of in mod_idmp3) */ #include #include @@ -44,6 +44,8 @@ #include "foo-pre.h" #include "gl_userfile.h" +// slv: makefile already takes care of this dependency +// #include "mp3genre/mp3genre.h" #define VERSION "$Id: foo-pre.c,v 1.21 2020/01/25 07:33:10 sorend, slv Exp $" #define USAGE " * Syntax: SITE PRE [SECTION]\n" @@ -991,7 +993,7 @@ int pre_do_module(char *module, filelist_t *files, char *path, char *argv[], str return 1; } -int pre_do_modules(filelist_t *files, char *path, char *argv[], struct subdir_list *subdirs) { +void pre_do_modules(filelist_t *files, char *path, char *argv[], struct subdir_list *subdirs) { hashtable_t *cfg, *env; stringtokenizer st; char *tmp; @@ -1052,7 +1054,7 @@ int pre(char *section, char *dest, char *src, char *rel, char *group, char *argv //char mp3_genre[40] = "Unknown"; char *tmpf = NULL; - + chown = chowninfo_find_by_group(group); olduid = getuid(); @@ -1474,7 +1476,7 @@ int pre_handler(int argc, char *argv[]) { pre_log("DONE", "\"%s\" \"%s\" \"%s\" \"%s\"", ht_get(env, PROPERTY_USER), group, argv[1], destpath); - + return 0; }