From: Art Cancro Date: Fri, 5 Jan 2024 20:49:15 +0000 (-0500) Subject: Can you tell I'm REALLY avoiding another task right now? X-Git-Tag: v997~27 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=bcd61e9ff3f718fa315eb370f383800e90e55765 Can you tell I'm REALLY avoiding another task right now? --- diff --git a/citadel/server/domain.h b/citadel/server/domain.h index ba367593d..703d02289 100644 --- a/citadel/server/domain.h +++ b/citadel/server/domain.h @@ -1,14 +1,7 @@ -/* - * Copyright (c) 1987-2012 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ +// Copyright (c) 1987-2024 by the citadel.org team +// +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License version 3. struct mx { int pref; @@ -19,12 +12,12 @@ int getmx(char *mxbuf, char *dest); int get_hosts(char *mxbuf, char *rectype); -/* HP/UX has old include files...these are from arpa/nameser.h */ +// HP/UX has old include files...these are from arpa/nameser.h #include "typesize.h" #ifndef HFIXEDSZ -#define HFIXEDSZ 12 /* I hope! */ +#define HFIXEDSZ 12 // I hope! #endif #ifndef INT16SZ #define INT16SZ sizeof(cit_int16_t) diff --git a/citadel/server/euidindex.h b/citadel/server/euidindex.h index e30f79fd9..4213339c6 100644 --- a/citadel/server/euidindex.h +++ b/citadel/server/euidindex.h @@ -1,9 +1,7 @@ -/* - * Index messages by EUID per room. - */ +// Index messages by EUID per room. int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf); -/* locate_message_by_euid is deprecated. Use CtdlLocateMessageByEuid instead */ +// locate_message_by_euid is deprecated. Use CtdlLocateMessageByEuid instead long locate_message_by_euid(char *euid, struct ctdlroom *qrbuf) __attribute__ ((deprecated)); void index_message_by_euid(char *euid, struct ctdlroom *qrbuf, long msgnum); void rebuild_euid_index(void); diff --git a/citadel/server/ipcdef.h b/citadel/server/ipcdef.h index 47fe98e2c..6f6e9e1fa 100644 --- a/citadel/server/ipcdef.h +++ b/citadel/server/ipcdef.h @@ -1,7 +1,3 @@ -#ifdef __cplusplus -extern "C" { -#endif - #define LISTING_FOLLOWS 100 #define CIT_OK 200 #define MORE_DATA 300 @@ -36,55 +32,51 @@ extern "C" { #define ASYNC_MSG 900 #define ASYNC_GEXP 02 -#define QR_PERMANENT 1 /* Room does not purge */ -#define QR_INUSE 2 /* Set if in use, clear if avail */ -#define QR_PRIVATE 4 /* Set for any type of private room */ -#define QR_PASSWORDED 8 /* Set if there's a password too */ -#define QR_GUESSNAME 16 /* Set if it's a guessname room */ -#define QR_DIRECTORY 32 /* Directory room */ -#define QR_UPLOAD 64 /* Allowed to upload */ -#define QR_DOWNLOAD 128 /* Allowed to download */ -#define QR_VISDIR 256 /* Visible directory */ -#define QR_ANONONLY 512 /* Anonymous-Only room */ -#define QR_ANONOPT 1024 /* Anonymous-Option room */ -#define QR_NETWORK 2048 /* (no longer used) */ -#define QR_PREFONLY 4096 /* Preferred status needed to enter */ -#define QR_READONLY 8192 /* Aide status required to post */ -#define QR_MAILBOX 16384 /* Set if this is a private mailbox */ +#define QR_PERMANENT 1 // Room does not purge +#define QR_INUSE 2 // Set if in use, clear if avail +#define QR_PRIVATE 4 // Set for any type of private room +#define QR_PASSWORDED 8 // Set if there's a password too +#define QR_GUESSNAME 16 // Set if it's a guessname room +#define QR_DIRECTORY 32 // Directory room +#define QR_UPLOAD 64 // Allowed to upload +#define QR_DOWNLOAD 128 // Allowed to download +#define QR_VISDIR 256 // Visible directory +#define QR_ANONONLY 512 // Anonymous-Only room +#define QR_ANONOPT 1024 // Anonymous-Option room +#define QR_NETWORK 2048 // (no longer used) +#define QR_PREFONLY 4096 // Preferred status needed to enter +#define QR_READONLY 8192 // Aide status required to post +#define QR_MAILBOX 16384 // Set if this is a private mailbox -#define QR2_SYSTEM 1 /* System room; hide by default */ -#define QR2_SELFLIST 2 /* Self-service mailing list mgmt */ -#define QR2_COLLABDEL 4 /* Anyone who can post can delete */ -#define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ -#define QR2_SMTP_PUBLIC 16 /* Listservice Subscribers may post */ +#define QR2_SYSTEM 1 // System room; hide by default +#define QR2_SELFLIST 2 // Self-service mailing list mgmt +#define QR2_COLLABDEL 4 // Anyone who can post can delete +#define QR2_SUBJECTREQ 8 // Subject strongly recommended +#define QR2_SMTP_PUBLIC 16 // Listservice Subscribers may post -#define US_NEEDVALID 1 /* User needs to be validated */ -#define US_EXTEDIT 2 /* Always use external editor */ -#define US_PERM 4 /* Permanent user */ -#define US_LASTOLD 16 /* Print last old message with new */ -#define US_EXPERT 32 /* Experienced user */ -#define US_UNLISTED 64 /* Unlisted userlog entry */ -#define US_NOPROMPT 128 /* Don't prompt after each message */ -#define US_PROMPTCTL 256 /* ext & top work at prompt */ -#define US_DISAPPEAR 512 /* Use "disappearing msg prompts" */ -#define US_REGIS 1024 /* Registered user */ -#define US_PAGINATOR 2048 /* Pause after each screen of text */ -#define US_INTERNET 4096 /* Internet mail privileges */ -#define US_FLOORS 8192 /* User wants to see floors */ -#define US_COLOR 16384 /* User wants ANSI color support */ +#define US_NEEDVALID 1 // User needs to be validated +#define US_EXTEDIT 2 // Always use external editor +#define US_PERM 4 // Permanent user +#define US_LASTOLD 16 // Print last old message with new +#define US_EXPERT 32 // Experienced user +#define US_UNLISTED 64 // Unlisted userlog entry +#define US_NOPROMPT 128 // Don't prompt after each message +#define US_PROMPTCTL 256 // ext & top work at prompt +#define US_DISAPPEAR 512 // Use "disappearing msg prompts" +#define US_REGIS 1024 // Registered user +#define US_PAGINATOR 2048 // Pause after each screen of text +#define US_INTERNET 4096 // Internet mail privileges +#define US_FLOORS 8192 // User wants to see floors +#define US_COLOR 16384 // User wants ANSI color support #define US_USER_SET (US_LASTOLD | US_EXPERT | US_UNLISTED | \ US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \ US_FLOORS | US_COLOR | US_PROMPTCTL | US_EXTEDIT) -#define UA_KNOWN 2 /* Room appears in a 'known rooms' list */ -#define UA_GOTOALLOWED 4 /* User may goto this room if specified by exact name */ -#define UA_HASNEWMSGS 8 /* Unread messages exist in this room */ -#define UA_ZAPPED 16 /* User has forgotten (zapped) this room */ -#define UA_POSTALLOWED 32 /* User may post top-level messages here */ -#define UA_ADMINALLOWED 64 /* Aide or Room Aide rights exist here */ -#define UA_DELETEALLOWED 128 /* User is allowed to delete messages from this room */ -#define UA_REPLYALLOWED 256 /* User is allowed to reply to existing messages here */ - -#ifdef __cplusplus -} -#endif +#define UA_KNOWN 2 // Room appears in a 'known rooms' list +#define UA_GOTOALLOWED 4 // User may goto this room if specified by exact name +#define UA_HASNEWMSGS 8 // Unread messages exist in this room +#define UA_ZAPPED 16 // User has forgotten (zapped) this room +#define UA_POSTALLOWED 32 // User may post top-level messages here +#define UA_ADMINALLOWED 64 // Aide or Room Aide rights exist here +#define UA_DELETEALLOWED 128 // User is allowed to delete messages from this room +#define UA_REPLYALLOWED 256 // User is allowed to reply to existing messages here diff --git a/citadel/server/modules/calendar/serv_calendar.h b/citadel/server/modules/calendar/serv_calendar.h index d7a149c53..8f5a06e8e 100644 --- a/citadel/server/modules/calendar/serv_calendar.h +++ b/citadel/server/modules/calendar/serv_calendar.h @@ -1,33 +1,18 @@ -/* - * iCalendar implementation for Citadel - * - * - * Copyright (c) 1987-2012 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3. - * - * - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * - * - * - */ +// iCalendar implementation for Citadel +// +// Copyright (c) 1987-2024 by the citadel.org team +// +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License version 3. + +// "server_generated_invitations" tells the Citadel server that the +// client wants invitations to be generated and sent out by the +// server. Set to 1 to enable this functionality. + +// "avoid_sending_invitations" is a server-internal variable. It is +// set internally during certain transactions and cleared +// automatically. -/* - * "server_generated_invitations" tells the Citadel server that the - * client wants invitations to be generated and sent out by the - * server. Set to 1 to enable this functionality. - * - * "avoid_sending_invitations" is a server-internal variable. It is - * set internally during certain transactions and cleared - * automatically. - */ struct cit_ical { int server_generated_invitations; int avoid_sending_invitations; diff --git a/citadel/server/msgbase.h b/citadel/server/msgbase.h index 2fa5c7414..f432c085e 100644 --- a/citadel/server/msgbase.h +++ b/citadel/server/msgbase.h @@ -22,9 +22,7 @@ enum { MSG_HDRS_THREADS = 9 }; -/* - * Possible return codes from CtdlOutputMsg() - */ +// Possible return codes from CtdlOutputMsg() enum { om_ok, om_not_logged_in, @@ -33,38 +31,33 @@ enum { om_access_denied }; -/* - * Values of "headers_only" when calling message output routines - */ -#define HEADERS_ALL 0 /* Headers and body */ -#define HEADERS_ONLY 1 /* Headers only */ -#define HEADERS_NONE 2 /* Body only */ -#define HEADERS_FAST 3 /* Headers only with no MIME info */ +// Values of "headers_only" when calling message output routines +#define HEADERS_ALL 0 // Headers and body +#define HEADERS_ONLY 1 // Headers only +#define HEADERS_NONE 2 // Body only +#define HEADERS_FAST 3 // Headers only with no MIME info struct ma_info { - int is_ma; /* Set to 1 if we are using this stuff */ - int freeze; /* Freeze the replacement chain because we're - * digging through a subsection */ - int did_print; /* One alternative has been displayed */ - char chosen_part[128]; /* Which part of a m/a did we choose? */ - int chosen_pref; /* Chosen part preference level (lower is better) */ - int use_fo_hooks; /* Use fixed output hooks */ - int dont_decode; /* should we call the decoder or not? */ + int is_ma; // Set to 1 if we are using this stuff + int freeze; // Freeze the replacement chain because we're digging through a subsection + int did_print; // One alternative has been displayed + char chosen_part[128]; // Which part of a m/a did we choose? + int chosen_pref; // Chosen part preference level (lower is better) + int use_fo_hooks; // Use fixed output hooks + int dont_decode; // should we call the decoder or not? }; -struct repl { /* Info for replication checking */ +struct repl { // Info for replication checking char exclusive_id[SIZ]; time_t highest; }; -/* - * This is a list of "harvested" email addresses that we might want to - * stick into someone's address book. But we defer this operaiton so - * it can be done asynchronously. - */ +// This is a list of "harvested" email addresses that we might want to +// stick into someone's address book. But we defer this operaiton so +// it can be done asynchronously. struct addresses_to_be_filed { struct addresses_to_be_filed *next; char *roomname; @@ -96,13 +89,13 @@ int CtdlForEachMessage(int mode, ForEachMsgCallback CallBack, void *userdata); int CtdlDeleteMessages(const char *, long *, int, char *); -long CtdlWriteObject(char *req_room, /* Room to stuff it in */ - char *content_type, /* MIME type of this object */ - char *raw_message, /* Data to be written */ - off_t raw_length, /* Size of raw_message */ - struct ctdluser *is_mailbox, /* Mailbox room? */ - int is_binary, /* Is encoding necessary? */ - unsigned int flags /* Internal save flags */ +long CtdlWriteObject(char *req_room, // Room to stuff it in + char *content_type, // MIME type of this object + char *raw_message, // Data to be written + off_t raw_length, // Size of raw_message + struct ctdluser *is_mailbox, // Mailbox room? + int is_binary, // Is encoding necessary? + unsigned int flags // Internal save flags ); struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body); struct CtdlMessage * CM_Duplicate @@ -137,41 +130,41 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int do_repl_check, stru long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply); char *CtdlReadMessageBody(char *terminator, long tlen, size_t maxlen, StrBuf *exist, int crlf); StrBuf *CtdlReadMessageBodyBuf( - char *terminator, /* token signalling EOT */ + char *terminator, // token signalling EOT long tlen, - size_t maxlen, /* maximum message length */ - StrBuf *exist, /* if non-null, append to it; exist is ALWAYS freed */ - int crlf /* CRLF newlines instead of LF */ + size_t maxlen, // maximum message length + StrBuf *exist, // if non-null, append to it; exist is ALWAYS freed + int crlf // CRLF newlines instead of LF ); -int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ - int mode, /* how would you like that message? */ - int headers_only, /* eschew the message body? */ - int do_proto, /* do Citadel protocol responses? */ - int crlf, /* 0=LF, 1=CRLF */ - char *section, /* output a message/rfc822 section */ - int flags, /* should the bessage be exported clean? */ - char **Author, /* if you want to know the author of the message... */ - char **Address, /* if you want to know the sender address of the message... */ - char **MessageID /* if you want to know the Message-ID of the message... */ +int CtdlOutputMsg(long msg_num, // message number (local) to fetch + int mode, // how would you like that message? + int headers_only, // eschew the message body? + int do_proto, // do Citadel protocol responses? + int crlf, // 0=LF, 1=CRLF + char *section, // output a message/rfc822 section + int flags, // should the bessage be exported clean? + char **Author, // if you want to know the author of the message... + char **Address, // if you want to know the sender address of the message... + char **MessageID // if you want to know the Message-ID of the message... ); -/* Flags which may be passed to CtdlOutputMsg() and CtdlOutputPreLoadedMsg() */ -#define QP_EADDR (1<<0) /* quoted-printable encode email addresses */ +// Flags which may be passed to CtdlOutputMsg() and CtdlOutputPreLoadedMsg() +#define QP_EADDR (1<<0) // quoted-printable encode email addresses #define CRLF (1<<1) -#define ESC_DOT (1<<2) /* output a line containing only "." as ".." instead */ -#define SUPPRESS_ENV_TO (1<<3) /* suppress Envelope-to: header (warning: destructive!) */ +#define ESC_DOT (1<<2) // output a line containing only "." as ".." instead +#define SUPPRESS_ENV_TO (1<<3) // suppress Envelope-to: header (warning: destructive!) int CtdlOutputPreLoadedMsg(struct CtdlMessage *, - int mode, /* how would you like that message? */ - int headers_only, /* eschew the message body? */ - int do_proto, /* do Citadel protocol responses? */ - int crlf, /* 0=LF, 1=CRLF */ - int flags /* should the bessage be exported clean? */ + int mode, // how would you like that message? + int headers_only, // eschew the message body? + int do_proto, // do Citadel protocol responses? + int crlf, // 0=LF, 1=CRLF + int flags // should the bessage be exported clean? ); -/* values for which_set */ +// values for which_set enum { ctdlsetseen_seen, ctdlsetseen_answered @@ -186,44 +179,44 @@ void CtdlGetSeen(char *buf, int which_set); struct CtdlMessage *CtdlMakeMessage( - struct ctdluser *author, /* author's user structure */ - char *recipient, /* NULL if it's not mail */ - char *recp_cc, /* NULL if it's not mail */ - char *room, /* room where it's going */ - int type, /* see MES_ types in header file */ - int format_type, /* variformat, plain text, MIME... */ - char *fake_name, /* who we're masquerading as */ - char *my_email, /* which of my email addresses to use (empty is ok) */ - char *subject, /* Subject (optional) */ - char *supplied_euid, /* ...or NULL if this is irrelevant */ - char *preformatted_text, /* ...or NULL to read text from client */ - char *references /* Thread references */ + struct ctdluser *author, // author's user structure + char *recipient, // NULL if it's not mail + char *recp_cc, // NULL if it's not mail + char *room, // room where it's going + int type, // see MES_ types in header file + int format_type, // variformat, plain text, MIME... + char *fake_name, // who we're masquerading as + char *my_email, // which of my email addresses to use (empty is ok) + char *subject, // Subject (optional) + char *supplied_euid, // ...or NULL if this is irrelevant + char *preformatted_text, // ...or NULL to read text from client + char *references // Thread references ); struct CtdlMessage *CtdlMakeMessageLen( - struct ctdluser *author, /* author's user structure */ - char *recipient, /* NULL if it's not mail */ + struct ctdluser *author, // author's user structure + char *recipient, // NULL if it's not mail long rcplen, - char *recp_cc, /* NULL if it's not mail */ + char *recp_cc, // NULL if it's not mail long cclen, - char *room, /* room where it's going */ + char *room, // room where it's going long roomlen, - int type, /* see MES_ types in header file */ - int format_type, /* variformat, plain text, MIME... */ - char *fake_name, /* who we're masquerading as */ + int type, // see MES_ types in header file + int format_type, // variformat, plain text, MIME... + char *fake_name, // who we're masquerading as long fnlen, - char *my_email, /* which of my email addresses to use (empty is ok) */ + char *my_email, // which of my email addresses to use (empty is ok) long myelen, - char *subject, /* Subject (optional) */ + char *subject, // Subject (optional) long subjlen, - char *supplied_euid, /* ...or NULL if this is irrelevant */ + char *supplied_euid, // ...or NULL if this is irrelevant long euidlen, - char *preformatted_text, /* ...or NULL to read text from client */ + char *preformatted_text, // ...or NULL to read text from client long textlen, - char *references, /* Thread references */ + char *references, // Thread references long reflen ); void AdjRefCountList(long *msgnum, long nmsg, int incr); -#endif /* MSGBASE_H */ +#endif diff --git a/citadel/server/netconfig.c b/citadel/server/netconfig.c index cfb8cc273..f5c0eeb1f 100644 --- a/citadel/server/netconfig.c +++ b/citadel/server/netconfig.c @@ -161,9 +161,7 @@ void convert_legacy_netcfg_files(void) { } -/* - * Module entry point - */ +// Module entry point char *ctdl_module_init_netconfig(void) { if (!threading) { convert_legacy_netcfg_files();