char *divide = "##############################################################";
#define ML_WID 72
-#define AL_MAX_WID 896
+#define AL_MAX_WID 592
#define FALSE 0
#define TRUE (!FALSE)
EXEC SQL END DECLARE SECTION;
#ifsql INGRES
- EXEC SQL CONNECT sms;
+ EXEC SQL CONNECT moira;
+ EXEC SQL SET LOCKMODE SESSION WHERE LEVEL=TABLE, READLOCK=SHARED;
#endsql
#ifsql INFORMIX
- EXEC SQL DATABASE sms;
+ EXEC SQL DATABASE moira;
#endsql
if (argc == 2) {
struct list {
char *name;
char maillist;
+ char *description;
char acl_t;
int acl_id;
struct member *m;
struct list *l, *memberlist;
register struct member *m;
+ /* The following is declarative, not executed,
+ * and so is dependent on where it is in the file,
+ * not in the order of execution of statements.
+ */
EXEC SQL WHENEVER SQLERROR GOTO sqlerr;
+ /* Get Locks */
+
EXEC SQL SELECT modtime INTO :buf FROM users WHERE users_id = 0;
EXEC SQL SELECT modtime INTO :buf FROM list WHERE list_id = 0;
cnt = 0;
- machines = create_hash(10);
+ machines = create_hash(1000);
EXEC SQL DECLARE m_cursor CURSOR FOR
- SELECT m.mach_id, m.name
- FROM machine m, users u
- WHERE m.mach_id = u.pop_id;
+ SELECT mach_id, name
+ FROM machine
+ WHERE status=1
+ ORDER BY mach_id;
EXEC SQL OPEN m_cursor;
while (1) {
EXEC SQL FETCH m_cursor INTO :id, :name;
fprintf(stderr, "Loaded %d machines\n", cnt);
cnt = 0;
- strings = create_hash(4000);
+ strings = create_hash(11001);
EXEC SQL DECLARE s_cursor CURSOR FOR
- SELECT string_id, string
- FROM strings;
+ SELECT string_id, trim(string)
+ FROM strings
+ ORDER BY string_id;
EXEC SQL OPEN s_cursor;
while (1) {
EXEC SQL FETCH s_cursor INTO :id, :name;
if (sqlca.sqlcode != 0) break;
- if (hash_store(strings, id, pstrsave(strtrim(name))) < 0) {
+ if (hash_store(strings, id, pstrsave(name)) < 0) {
fprintf(stderr, "Out of memory!\n");
exit(MR_NO_MEM);
}
fprintf(stderr, "Loaded %d strings\n", cnt);
cnt = 0;
- users = create_hash(12001);
+ users = create_hash(13001);
EXEC SQL DECLARE u_cursor CURSOR FOR
SELECT users_id, login, first, middle, last, potype, pop_id, box_id
FROM users
- WHERE status != 3;
+ WHERE status != 3
+ ORDER BY users_id;
EXEC SQL OPEN u_cursor;
while (1) {
EXEC SQL FETCH u_cursor INTO :id, :name, :fname, :mname, :lname,
cnt++;
}
EXEC SQL CLOSE u_cursor;
+ EXEC SQL COMMIT;
fprintf(stderr, "Loaded %d users\n", cnt);
cnt = 0;
lists = create_hash(15000);
EXEC SQL DECLARE l_cursor CURSOR FOR
- SELECT list_id, name, maillist, acl_type, acl_id
+ SELECT list_id, name, maillist, description, acl_type, acl_id
FROM list
- WHERE active != 0;
+ WHERE active != 0
+ ORDER BY list_id;
EXEC SQL OPEN l_cursor;
while (1) {
- EXEC SQL FETCH l_cursor INTO :id, :name, :maillistp, :type, :acl;
+ EXEC SQL FETCH l_cursor INTO :id, :name, :maillistp, :buf, :type, :acl;
if (sqlca.sqlcode != 0) break;
l = (struct list *) perm_malloc(sizeof(struct list));
l->name = pstrsave(strtrim(name));
l->maillist = maillistp;
+ l->description = pstrsave(strtrim(buf));
l->acl_t = type[0];
l->acl_id = acl;
l->m = (struct member *) NULL;
cnt++;
}
EXEC SQL CLOSE l_cursor;
+ EXEC SQL COMMIT;
fprintf(stderr, "Loaded %d lists\n", cnt);
cnt = 0;
EXEC SQL DECLARE m_cursor2 CURSOR FOR
SELECT list_id, member_type, member_id
FROM imembers
- WHERE direct = 1;
+ WHERE direct = 1
+ ORDER BY list_id;
EXEC SQL OPEN m_cursor2;
while (1) {
EXEC SQL FETCH m_cursor2 INTO :id, :type, :mid;
return;
sqlerr:
com_err(whoami, MR_INGRES_ERR, " code %d\n", sqlca.sqlcode);
- critical_alert("DCM", "Hesiod build encountered DATABASE ERROR %d",
+ critical_alert("DCM", "Mailhub build encountered DATABASE ERROR %d",
sqlca.sqlcode);
exit(MR_INGRES_ERR);
}
return;
}
l->maillist = 2;
- output_mlist(id, l);
insert_name(l->name, -1, TRUE, FALSE);
+ output_mlist(id, l);
if (l->acl_t == 'L' && (l1 = (struct list *)hash_lookup(lists, l->acl_id)))
save_mlist(0, l1, TRUE);
}
-/* Illegal chars: ! " % ( ) , . / : ; < = > @ [ \ ] ^ { | } */
+/* Illegal chars: ! " % ( ) , / : ; < = > @ [ \ ] ^ { | } */
static int illegalchars[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* ^@ - ^O */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* ^P - ^_ */
- 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, /* SPACE - / */
+ 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1, /* SPACE - / */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, /* 0 - ? */
1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* @ - O */
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, /* P - _ */
register struct member *m;
register struct user *u;
+ put_fill(out, l->description);
if (l->acl_t == 'L' &&
(l1 = (struct list *) hash_lookup(lists, l->acl_id)))
fprintf(out, "owner-%s: %s\n%s: ", l->name, l1->name, l->name);
{
register wwid;
static int cont = 1;
+ char str[8];
wwid = strlen(s);
if (!bol && awid + wwid + 2 > AL_MAX_WID) {
- fprintf(out, ",\n\tcontinuation-%d\ncontinuation-%d: ", cont, cont);
+ sprintf(str, "%c%c%c%c%c%c", random() % 26 + 97, random() % 26 + 97,
+ random() % 26 + 97, random() % 26 + 97,
+ random() % 26 + 97, random() % 26 + 97);
+ str[6] = '\0';
+ fprintf(out, ",\n\tcont%d-%s\ncont%d-%s: ", cont, str, cont, str);
cont++;
awid = lwid = 17 + wwid;
fputs(s, out);
}
+put_fill(aliases, string)
+FILE *aliases;
+register char *string;
+{
+ register char *c;
+ register int lwid;
+ register int wwid;
+
+ if (string == 0 || *string == 0) return;
+ fputs("# ", aliases);
+ lwid = 3;
+
+ while (1) {
+ while (*string && *string == ' ') string++;
+ c = (char *)index(string, ' ');
+ if (c == 0) {
+ wwid = strlen(string);
+ } else {
+ wwid = c - string;
+ *c = 0;
+ }
+
+ if ((lwid + wwid) > ML_WID) {
+ fputs("\n# ", aliases);
+ lwid = 3;
+ fputs(string, aliases);
+ } else {
+ fputs(string, aliases);
+ }
+
+ if (c == (char *)0) break;
+ /* add a space after the word */
+ (void) fputc(' ', aliases);
+ wwid++;
+ lwid += wwid;
+ string += wwid;
+ /* add another if after a period */
+ if (*--c == '.') {
+ (void) fputc(' ', aliases);
+ lwid++;
+ }
+ }
+
+ (void) fputc('\n', aliases);
+}
+
+
do_people()
{
incount = 0;
}
ret = pool;
pool += size;
- pool = (char *)(((unsigned) (pool + 1)) & ~1);
+ pool = (char *)(((unsigned) (pool + 3)) & ~3);
pool_size -= (pool - ret);
return(ret);
}
andersk / moira.git / blobdiff