Skip to content

Remove amalgamations (irc.mod first) #1877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thommey wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Remove amalgamations (irc.mod first) #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a4faaa
Separate translation unit for irc.mod/mode.c
thommey Feb 16, 2026
dc3d86f
Separate translation units for all irc.mod files
thommey Feb 16, 2026
f944569
More portable version of partial linking
thommey Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 77 additions & 14 deletions src/mod/irc.mod/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

srcdir = .

SRCS = $(wildcard $(srcdir)/*.c)
OBJS = $(notdir $(SRCS:.c=.o))

doofus:
@echo "" && \
Expand All @@ -13,31 +15,92 @@ static: ../irc.o

modules: ../../../irc.$(MOD_EXT)

../irc.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/irc.c && mv -f irc.o ../
../irc.o: $(OBJS) irc.h irc_proto.h
$(CC) -r -nostdlib -o ../irc.o $(OBJS)

%.o: $(srcdir)/%.c irc.h irc_proto.h
$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $<

../../../irc.$(MOD_EXT): ../irc.o
$(LD) $(CFLAGS) -o ../../../irc.$(MOD_EXT) ../irc.o $(XLIBS) $(MODULE_XLIBS) && $(STRIP) ../../../irc.$(MOD_EXT)

depend:
$(CC) $(CFLAGS) -MM $(srcdir)/irc.c -MT ../irc.o > .depend
echo "../irc.o: $(OBJS)" > .depend; \
for src in $(SRCS); do \
obj=$$(basename $$src .c).o; \
$(CC) $(CFLAGS) -MM $$src -MT $$obj >> .depend; \
done

clean:
@rm -f .depend *.o *.$(MOD_EXT) *~

distclean: clean

#safety hash
../irc.o: .././irc.mod/irc.c ../../../src/mod/module.h \
../irc.o: chan.o cmdsirc.o irc.o mode.o msgcmds.o tclirc.o
chan.o: .././irc.mod/chan.c ../../../src/mod/module.h ../../../src/main.h \
../../../config.h ../../../eggint.h ../../../lush.h ../../../src/lang.h \
../../../src/eggdrop.h ../../../src/flags.h ../../../src/cmdt.h \
../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h
cmdsirc.o: .././irc.mod/cmdsirc.c ../../../src/mod/module.h \
../../../src/main.h ../../../config.h ../../../eggint.h ../../../lush.h \
../../../src/lang.h ../../../src/eggdrop.h ../../../src/flags.h \
../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h
irc.o: .././irc.mod/irc.c ../../../src/mod/module.h ../../../src/main.h \
../../../config.h ../../../eggint.h ../../../lush.h ../../../src/lang.h \
../../../src/eggdrop.h ../../../src/flags.h ../../../src/cmdt.h \
../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h
mode.o: .././irc.mod/mode.c ../../../src/mod/module.h ../../../src/main.h \
../../../config.h ../../../eggint.h ../../../lush.h ../../../src/lang.h \
../../../src/eggdrop.h ../../../src/flags.h ../../../src/cmdt.h \
../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h
msgcmds.o: .././irc.mod/msgcmds.c ../../../src/mod/module.h \
../../../src/main.h ../../../config.h ../../../eggint.h ../../../lush.h \
../../../src/lang.h ../../../src/eggdrop.h ../../../src/flags.h \
../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h
tclirc.o: .././irc.mod/tclirc.c ../../../src/mod/module.h \
../../../src/main.h ../../../config.h ../../../eggint.h ../../../lush.h \
../../../src/lang.h ../../../src/eggdrop.h ../../../src/compat/in6.h \
../../../src/flags.h ../../../src/cmdt.h ../../../src/tclegg.h \
../../../src/tclhash.h ../../../src/chan.h ../../../src/users.h \
../../../src/compat/compat.h ../../../src/compat/base64.h \
../../../src/compat/inet_aton.h ../../../src/compat/snprintf.h \
../../../src/compat/explicit_bzero.h ../../../src/compat/strlcpy.h \
../../../src/mod/modvals.h ../../../src/tandem.h .././irc.mod/irc.h \
../../../src/lang.h ../../../src/eggdrop.h ../../../src/flags.h \
../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \
../../../src/chan.h ../../../src/users.h ../../../src/compat/compat.h \
../../../src/compat/base64.h ../../../src/compat/inet_aton.h \
../../../src/compat/snprintf.h ../../../src/compat/explicit_bzero.h \
../../../src/compat/strlcpy.h ../../../src/mod/modvals.h \
../../../src/tandem.h .././irc.mod/irc.h .././irc.mod/irc_proto.h \
../../../src/mod/server.mod/server.h \
../../../src/mod/channels.mod/channels.h .././irc.mod/chan.c \
.././irc.mod/mode.c .././irc.mod/cmdsirc.c .././irc.mod/msgcmds.c \
.././irc.mod/tclirc.c
../../../src/mod/channels.mod/channels.h
45 changes: 26 additions & 19 deletions src/mod/irc.mod/chan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#define MODULE_NAME "irc"
#define MAKING_IRC

#include "src/mod/module.h"
#include "irc.h"
#include "irc_proto.h"
#include "server.mod/server.h"
#include "channels.mod/channels.h"


static time_t last_ctcp = (time_t) 0L;
Expand Down Expand Up @@ -122,7 +129,7 @@ static void setaccount(char *nick, char *account)

/* Returns the current channel mode.
*/
static char *getchanmode(struct chanset_t *chan)
char *getchanmode(struct chanset_t *chan)
{
static char s[121];
int atr, i;
Expand Down Expand Up @@ -176,7 +183,7 @@ static char *getchanmode(struct chanset_t *chan)
return s;
}

static void check_exemptlist(struct chanset_t *chan, char *from)
void check_exemptlist(struct chanset_t *chan, char *from)
{
masklist *e;
int ok = 0;
Expand All @@ -198,7 +205,7 @@ static void check_exemptlist(struct chanset_t *chan, char *from)
* Moved all do_ban(), do_exempt() and do_invite() into this single function
* as the code bloat is starting to get ridiculous <cybah>
*/
static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char mode)
void do_mask(struct chanset_t *chan, masklist *m, char *mask, char mode)
{
for (; m && m->mask[0]; m = m->next)
if (cmp_masks(mask, m->mask) && rfc_casecmp(mask, m->mask))
Expand All @@ -212,8 +219,8 @@ static void do_mask(struct chanset_t *chan, masklist *m, char *mask, char mode)
*
* victim for flood-deop, account for flood-join
*/
static int detect_chan_flood(char *floodnick, char *floodhost, char *from,
struct chanset_t *chan, int which, char *victim_or_account)
int detect_chan_flood(char *floodnick, char *floodhost, char *from,
struct chanset_t *chan, int which, char *victim_or_account)
{
char h[NICKMAX+UHOSTLEN+1], ftype[12], *p;
struct userrec *u;
Expand Down Expand Up @@ -402,7 +409,7 @@ static int detect_chan_flood(char *floodnick, char *floodhost, char *from,

/* Given a [nick!]user@host, place a quick ban on them on a chan.
*/
static char *quickban(struct chanset_t *chan, char *uhost)
char *quickban(struct chanset_t *chan, char *uhost)
{
static char s1[512];

Expand All @@ -414,8 +421,8 @@ static char *quickban(struct chanset_t *chan, char *uhost)
/* Kick any user (except friends/masters) with certain mask from channel
* with a specified comment. Ernst 18/3/1998
*/
static void kick_all(struct chanset_t *chan, char *hostmask, char *comment,
int bantype)
void kick_all(struct chanset_t *chan, char *hostmask, char *comment,
int bantype)
{
memberlist *m;
char kicknick[512], s[NICKMAX+UHOSTLEN+1];
Expand Down Expand Up @@ -500,7 +507,7 @@ static void refresh_ban_kick(struct chanset_t *chan, char *user, char *nick)
/* This is a bit cumbersome at the moment, but it works... Any improvements
* then feel free to have a go.. Jason
*/
static void refresh_exempt(struct chanset_t *chan, char *user)
void refresh_exempt(struct chanset_t *chan, char *user)
{
maskrec *e;
masklist *b;
Expand Down Expand Up @@ -634,8 +641,8 @@ static void recheck_invites(struct chanset_t *chan)

/* Resets the masks on the channel.
*/
static void resetmasks(struct chanset_t *chan, masklist *m, maskrec *mrec,
maskrec *global_masks, char mode)
void resetmasks(struct chanset_t *chan, masklist *m, maskrec *mrec,
maskrec *global_masks, char mode)
{
if (!me_op(chan) && (!me_halfop(chan) ||
(strchr(NOHALFOPS_MODES, 'b') != NULL) ||
Expand Down Expand Up @@ -665,7 +672,7 @@ static void resetmasks(struct chanset_t *chan, masklist *m, maskrec *mrec,
break;
}
}
static void check_this_ban(struct chanset_t *chan, char *banmask, int sticky)
void check_this_ban(struct chanset_t *chan, char *banmask, int sticky)
{
memberlist *m;
char user[NICKMAX+UHOSTLEN+1];
Expand All @@ -685,7 +692,7 @@ static void check_this_ban(struct chanset_t *chan, char *banmask, int sticky)
add_mode(chan, '+', 'b', banmask);
}

static void recheck_channel_modes(struct chanset_t *chan)
void recheck_channel_modes(struct chanset_t *chan)
{
int cur = chan->channel.mode, mns = chan->mode_mns_prot,
pls = chan->mode_pls_prot;
Expand Down Expand Up @@ -879,7 +886,7 @@ static void check_this_member(struct chanset_t *chan, char *nick,
}
}

static void check_this_user(char *hand, int delete, char *host)
void check_this_user(char *hand, int delete, char *host)
{
char s[NICKMAX+UHOSTLEN+1];
memberlist *m;
Expand All @@ -901,7 +908,7 @@ static void check_this_user(char *hand, int delete, char *host)

/* Things to do when i just became a chanop:
*/
static void recheck_channel(struct chanset_t *chan, int dobans)
void recheck_channel(struct chanset_t *chan, int dobans)
{
memberlist *m;
struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
Expand Down Expand Up @@ -1882,7 +1889,7 @@ static int got332(char *from, char *msg)

/* Set delay for +o, +h, or +v channel modes
*/
static void set_delay(struct chanset_t *chan, char *nick)
void set_delay(struct chanset_t *chan, char *nick)
{
time_t a_delay;
int aop_min, aop_max, aop_diff, count = 0;
Expand Down Expand Up @@ -2876,7 +2883,7 @@ static int gotrawt(char *from, char *msg, Tcl_Obj *tags) {
return 0;
}

static cmd_t irc_raw[] = {
cmd_t irc_raw[] = {
{"324", "", (IntFunc) got324, "irc:324"},
{"352", "", (IntFunc) got352, "irc:352"},
{"353", "", (IntFunc) got353, "irc:353"},
Expand Down Expand Up @@ -2915,12 +2922,12 @@ static cmd_t irc_raw[] = {
{NULL, NULL, NULL, NULL}
};

static cmd_t irc_rawt[] = {
cmd_t irc_rawt[] = {
{"*", "", (IntFunc) gotrawt, "irc:rawt"},
{NULL, NULL, NULL, NULL}
};

static cmd_t irc_isupport_binds[] = {
cmd_t irc_isupport_binds[] = {
{"*", "", (IntFunc) irc_isupport, "irc:isupport"},
{NULL, NULL, NULL, NULL}
};
14 changes: 13 additions & 1 deletion src/mod/irc.mod/cmdsirc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#define MODULE_NAME "irc"
#define MAKING_IRC

#include "src/mod/module.h"
#include "irc.h"
#include "irc_proto.h"
#include "server.mod/server.h"
#include "channels.mod/channels.h"

static struct flag_record user = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
static struct flag_record victim = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };

static struct chanset_t *get_channel(int idx, char *chname)
{
struct chanset_t *chan;
Expand Down Expand Up @@ -1128,7 +1140,7 @@ static void cmd_reset(struct userrec *u, int idx, char *par)
}
}

static cmd_t irc_dcc[] = {
cmd_t irc_dcc[] = {
{"adduser", "m|m", (IntFunc) cmd_adduser, NULL},
{"deluser", "m|m", (IntFunc) cmd_deluser, NULL},
{"reset", "m|m", (IntFunc) cmd_reset, NULL},
Expand Down
Loading
Loading