POSIXized include files.

703d7ec4 · Per Cederqvist · 511dcde5 · 703d7ec4 · 703d7ec4 · 703d7ec4
Commit 703d7ec4 authored Oct 10, 1993 by Per Cederqvist
25 changed files
--- a/src/server/conference.c
+++ b/src/server/conference.c
 /*
- * $Id: conference.c,v 0.19 1993/08/05 00:13:25 ceder Exp $
+ * $Id: conference.c,v 0.20 1993/10/10 17:03:43 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,31 +28,33 @@
 * All atomic calls that deals with conferences.
 */

-static char *rcsid = "$Id: conference.c,v 0.19 1993/08/05 00:13:25 ceder Exp $";
+static char *rcsid = "$Id: conference.c,v 0.20 1993/10/10 17:03:43 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-#include <time.h>
 #include <ctype.h>
-#include <stdlib.h>
-#include "lyskomd.h"
-#include <kom-types.h>
-#include <services.h>
-#include "manipulate.h"
-#include <kom-errno.h>
-#include <server/smalloc.h>
-#include "cache.h"
+#include <stdio.h>
+#include <time.h>
+#include <setjmp.h>
+
+#include "kom-types.h"
 #include "log.h"
-#include <config.h>
+#include "services.h"
+#include "s-string.h"
+#include "cache.h"
+#include "misc-types.h"
+#include "s-collat-tabs.h"
+#include "manipulate.h"
+#include "server/smalloc.h"
+#include "config.h"
+#include "parser.h"
 #include "com.h"
 #include "connections.h"
-#include "send-async.h"
-#include <debug.h>
-#include <parser.h>
 #include "internal-connections.h"
-#include "internal-services.h"
-
+#include "kom-errno.h"
+#include "lyskomd.h"
+#include "debug.h"
+#include "send-async.h"
 /*
 * Defined in conference.c. This will go away when we use regexp-matching.
 * This is only temporary. +++***

--- a/src/server/connections.c
+++ b/src/server/connections.c
 /*
- * $Id: connections.c,v 0.24 1993/08/05 00:14:10 ceder Exp $
+ * $Id: connections.c,v 0.25 1993/10/10 17:03:49 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -30,47 +30,50 @@
 * Created by Willf|r 31/3-90. Mostly written by ceder.
 */

-static char *rcsid = "$Id: connections.c,v 0.24 1993/08/05 00:14:10 ceder Exp $";
+static char *rcsid = "$Id: connections.c,v 0.25 1993/10/10 17:03:49 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
 #include <errno.h>
+#include <stdio.h>
 #include <setjmp.h>
-#include <sys/types.h>
-#include <sys/file.h>
+#include <string.h>
 #include <sys/stat.h>
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
 #include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#include <string.h>
+#else
+#include <time.h>
+#endif
+#endif
+#ifndef HAVE_DIFFTIME
+#  include "tmp-difftime.h"
+#endif

-#include "s-string.h"
-#include <kom-types.h>
-#include "lyskomd.h"
-#include <config.h>
-#include <debug.h>
-#include "end-of-atomic.h"
-#include "log.h"
-#include <services.h>
+#include "misc-types.h"
+#include "kom-types.h"
+#include "debug.h"
 #include "isc-interface.h"
-#include <kom-errno.h>
 #include "com.h"
 #include "connections.h"
-#include "prot-a-parse.h"
-#include "prot-a-output.h"
-#include "prot-a.h"
-#include <server/smalloc.h>
+#include "internal-connections.h"
 #include "prot-a-parse-arg.h"
-#include "isc-parse.h"
-#include "cache.h"
-#include "send-async.h"
+#include "log.h"
+#include "lyskomd.h"
+#include "services.h"
 #include "mux.h"
+#include "isc-parse.h"
+#include "prot-a.h"
+#include "server/smalloc.h"
+#include "end-of-atomic.h"
 #include "mux-parse.h"
-#include "internal-connections.h"
+#include "send-async.h"
+#include "cache.h"
 #include "rfc931.h"

-#include "tmp-difftime.h"
-
 IscMaster      * kom_server_mcb    = NULL;
 Connection     * active_connection = NULL;


--- a/src/server/dbck-cache.c
+++ b/src/server/dbck-cache.c
 /*
- * $Id: dbck-cache.c,v 0.11 1993/01/16 23:16:17 ceder Exp $
+ * $Id: dbck-cache.c,v 0.12 1993/10/10 17:03:55 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -32,47 +32,44 @@
 *   Also save time as a time_t instead of a struct tm.
 */

-static char *rcsid = "$Id: dbck-cache.c,v 0.11 1993/01/16 23:16:17 ceder Exp $";
+static char *rcsid = "$Id: dbck-cache.c,v 0.12 1993/10/10 17:03:55 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-/*
- * All functions that can fail sets kom_errno to a suitable value
- * if they fail.
- */
-
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/file.h>
+#ifndef SEEK_END
+#include <fcntl.h>
+#endif
+#ifndef SEEK_END
 #include <unistd.h>
-#include <errno.h>
+#endif
+#include <stdlib.h>
+#include <time.h>
+#ifndef HAVE_DIFFTIME
+#  include "tmp-difftime.h"
+#endif
+#ifdef TIME_SYNC
+#  include <sys/resource.h>
+#endif

-#include <kom-errno.h>
-#include <kom-types.h>
-#include "s-collat-tabs.h"
-#include <server/smalloc.h>
+#include "exp.h"
+#include "misc-types.h"
+#include "kom-types.h"
+#include "kom-errno.h"
 #include "cache.h"
-#include <debug.h>
+#include "tmp-limits.h"
+#include "debug.h"
+#include "server/smalloc.h"
+#include "log.h"
 #include "lyskomd.h"
-#include <parser.h>
+#include "kom-memory.h"
 #include "ram-parse.h"
-#include "log.h"
 #include "ram-output.h"
-#include "com.h"
-#include "connections.h"
-#include "send-async.h"
-#include "memory.h"
-#include "dbck-cache.h"

-#ifdef TIME_SYNC
-#  include <sys/resource.h>
-#endif
-    
-#define EXPORT
-
-#include "tmp-limits.h"
+/*
+ * All functions that can fail sets kom_errno to a suitable value
+ * if they fail.
+ */

 Person		* pers_arr[ MAX_CONF ];
 Conference 	* conf_arr[ MAX_CONF ];

--- a/src/server/dbck.c
+++ b/src/server/dbck.c
 /*
- * $Id: dbck.c,v 0.12 1993/01/16 23:16:22 ceder Exp $
+ * $Id: dbck.c,v 0.13 1993/10/10 17:04:00 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,24 +28,24 @@
 * Author: Per Cederqvist.
 */

-static char *rcsid = "$Id: dbck.c,v 0.12 1993/01/16 23:16:22 ceder Exp $";
+static char *rcsid = "$Id: dbck.c,v 0.13 1993/10/10 17:04:00 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>

-#include <kom-types.h>
-#include <config.h>
-#include "cache.h"
-#include "log.h"
+#include "misc-types.h"
+#include "kom-types.h"
+#include "tmp-limits.h"
 #include "lyskomd.h"
+#include "log.h"
+#include "server/smalloc.h"
 #include "misc-parser.h"
-#include <server/smalloc.h>
-#include <debug.h>
+#include "cache.h"
+#include "config.h"
+#include "debug.h"
 #include "dbck-cache.h"

 /* This is set to TRUE if init_cache finds out that the last part of the
@@ -74,8 +74,6 @@ typedef struct {

 static const Person_scratchpad   EMPTY_PERSON_SCRATCHPAD = { 0 };

-#include "tmp-limits.h"
-
 static Person_scratchpad *person_scratchpad[MAX_CONF];

 #ifdef DEBUG

--- a/src/server/disk-end-of-atomic.c
+++ b/src/server/disk-end-of-atomic.c
 /*
- * $Id: disk-end-of-atomic.c,v 0.8 1993/01/16 23:16:26 ceder Exp $
+ * $Id: disk-end-of-atomic.c,v 0.9 1993/10/10 17:04:05 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -36,18 +36,20 @@
 * to forget old texts.
 */

-static char *rcsid = "$Id: disk-end-of-atomic.c,v 0.8 1993/01/16 23:16:26 ceder Exp $";
+static char *rcsid = "$Id: disk-end-of-atomic.c,v 0.9 1993/10/10 17:04:05 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

+#include <stddef.h>

-#include <kom-types.h>
-#include <server/smalloc.h>
-#include "text-garb.h"
+#include "misc-types.h"
+#include "kom-types.h"
+#include "end-of-atomic.h"
+#include "cache.h"
+#include "server/smalloc.h"
 #include "config.h"
+#include "text-garb.h"
 #include "disk-cache.h"
-#include "cache.h"
-#include "end-of-atomic.h"

 long
 end_of_atomic( Bool  idle )

--- a/src/server/isc-malloc.c
+++ b/src/server/isc-malloc.c
 /*
- * $Id: isc-malloc.c,v 1.2 1993/01/16 23:16:39 ceder Exp $
+ * $Id: isc-malloc.c,v 1.3 1993/10/10 17:04:10 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -29,17 +29,16 @@
 * how many allocated blocks there are.
 */

-static char *rcsid = "$Id: isc-malloc.c,v 1.2 1993/01/16 23:16:39 ceder Exp $";
+static char *rcsid = "$Id: isc-malloc.c,v 1.3 1993/10/10 17:04:10 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-#include <stdio.h>
 #include <stddef.h>
-#include <server/smalloc.h>
-#include "log.h"
+#include <stdio.h>
+
 #include "exp.h"
 #include "isc-malloc.h"
+#include "server/smalloc.h"

 static int no_of_allocated_blocks = 0;


--- a/src/server/isc-parse.c
+++ b/src/server/isc-parse.c
 /*
- * $Id: isc-parse.c,v 0.4 1993/01/16 23:16:42 ceder Exp $
+ * $Id: isc-parse.c,v 0.5 1993/10/10 17:04:14 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -26,16 +26,14 @@
 * Generic parse routines.
 */

-static char *rcsid = "$Id: isc-parse.c,v 0.4 1993/01/16 23:16:42 ceder Exp $";
+static char *rcsid = "$Id: isc-parse.c,v 0.5 1993/10/10 17:04:14 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-#include <setjmp.h>
 #include <string.h>
-#include <stdio.h>
-#include "lyskomd.h"
-#include <kom-types.h>
+#include <setjmp.h>
+
+#include "kom-types.h"
 #include "com.h"
 #include "connections.h"
 #include "isc-parse.h"

--- a/src/server/kom-types.c
+++ b/src/server/kom-types.c
 /*
- * $Id: kom-types.c,v 0.5 1993/01/16 23:16:48 ceder Exp $
+ * $Id: kom-types.c,v 0.6 1993/10/10 17:04:18 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -43,19 +43,13 @@
 *  email:	bellman@Lysator.LiU.SE
 */

-static char *rcsid = "$Id: kom-types.c,v 0.5 1993/01/16 23:16:48 ceder Exp $";
+static char *rcsid = "$Id: kom-types.c,v 0.6 1993/10/10 17:04:18 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-
-#include <stdio.h>
-
-#include <kom-types.h>
-#include <config.h>
-
-#define	EXPORT
-
+#include "exp.h"
+#include "kom-types.h"
+#include "config.h"

 EXPORT const Conf_list_old	EMPTY_CONF_LIST_OLD = EMPTY_CONF_LIST_OLD_i;


--- a/src/server/log.c
+++ b/src/server/log.c
 /*
- * $Id: log.c,v 0.6 1993/01/16 23:16:52 ceder Exp $
+ * $Id: log.c,v 0.7 1993/10/10 17:04:23 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,15 +28,14 @@
 * File created by ceder 1990-05-25.
 */

-static char *rcsid = "$Id: log.c,v 0.6 1993/01/16 23:16:52 ceder Exp $";
+static char *rcsid = "$Id: log.c,v 0.7 1993/10/10 17:04:23 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
+
 #include "log.h"

 /*

--- a/src/server/logII.c
+++ b/src/server/logII.c
 /*
- * $Id: logII.c,v 0.2 1991/09/15 10:31:29 linus Exp $
+ * $Id: logII.c,v 0.3 1993/10/10 17:04:28 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,10 +28,11 @@
 * File created by ceder 1990-05-25.
 */

-#include <stdarg.h>
 #include <stdio.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>

 enum 
 {

--- a/src/server/membership.c
+++ b/src/server/membership.c
 /*
- * $Id: membership.c,v 0.11 1993/01/16 23:16:57 ceder Exp $
+ * $Id: membership.c,v 0.12 1993/10/10 17:04:34 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -29,39 +29,36 @@
 * (The person/conf relation).
 */

-static char *rcsid = "$Id: membership.c,v 0.11 1993/01/16 23:16:57 ceder Exp $";
+#define DEBUG_MARK_AS_READ
+
+static char *rcsid = "$Id: membership.c,v 0.12 1993/10/10 17:04:34 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

+#include <stdio.h>
+#include <string.h>
 #include <time.h>
-#include <stdlib.h>
+#include <setjmp.h>
+
+#include "misc-types.h"
+#include "kom-types.h"
+#include "services.h"
+#include "server/smalloc.h"
 #include "lyskomd.h"
-#include <kom-types.h>
-#include <services.h>
-#include "manipulate.h"
-#include <server/smalloc.h>
-#include "cache.h"
-#include "log.h"
-#include "minmax.h"
 #include "com.h"
-#include "isc-interface.h"
 #include "connections.h"
-#include "send-async.h"
-#include <kom-errno.h>
 #include "internal-connections.h"
-
-#define DEBUG_MARK_AS_READ
+#include "kom-errno.h"
+#include "manipulate.h"
+#include "cache.h"
+#include "send-async.h"
+#include "minmax.h"

 #ifdef DEBUG_MARK_AS_READ
-#  include <stdio.h>
-#  include <string.h>
-#  include "ram-output.h"
+#include "log.h"
+#include "ram-output.h"
 #endif

-
-
-
-
 /*
 * Copy all information that ACTPERS is authorized to know about ORIG_P's
 * membership in all conferences to CENSOR_P.

--- a/src/server/memory.c
+++ b/src/server/memory.c
 /*
- * $Id: memory.c,v 0.9 1993/01/16 23:17:01 ceder Exp $
+ * $Id: memory.c,v 0.10 1993/10/10 17:04:39 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,24 +28,24 @@
 * These functions should be used instead of smalloc/srealloc.
 */

-static char *rcsid = "$Id: memory.c,v 0.9 1993/01/16 23:17:01 ceder Exp $";
+static char *rcsid = "$Id: memory.c,v 0.10 1993/10/10 17:04:39 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

-
-#include <kom-types.h>
+#include <stdio.h>
 #include <string.h>
-#include <server/smalloc.h>
-#include "memory.h"
+
 #include "exp.h"
-#include "lyskomd.h"
+#include "kom-types.h"
+#include "kom-memory.h"
+#include "server/smalloc.h"
 #include "log.h"
+#include "lyskomd.h"

 static int person_cnt = 0;
 static int conference_cnt = 0;
 static int text_stat_cnt = 0;

-    

 EXPORT Person *
 alloc_person(void)

--- a/src/server/mux-parse.c
+++ b/src/server/mux-parse.c
 /*
- * $Id: mux-parse.c,v 0.9 1993/01/16 23:17:12 ceder Exp $
+ * $Id: mux-parse.c,v 0.10 1993/10/10 17:04:43 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -27,29 +27,23 @@
 * This is a hack. Clean this mess up with lacgen.
 */

-static char *rcsid = "$Id: mux-parse.c,v 0.9 1993/01/16 23:17:12 ceder Exp $";
+static char *rcsid = "$Id: mux-parse.c,v 0.10 1993/10/10 17:04:43 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

- 
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include "lyskomd.h"
+#include <stdio.h>
+#include <setjmp.h>
+
 #include "s-string.h"
-#include <kom-types.h>
+#include "kom-types.h"
 #include "com.h"
 #include "connections.h"
 #include "isc-interface.h"
-#include "mux.h"
-#include <server/smalloc.h>
-#include <setjmp.h>
-#include <string.h>
-#include <stdio.h>
-#include "mux-parse.h"
-#include "minmax.h"
 #include "config.h"
 #include "log.h"
+#include "minmax.h"
+#include "mux.h"
+#include "mux-parse.h"

 jmp_buf mux_parse_env;


--- a/src/server/mux.c
+++ b/src/server/mux.c
 /*
- * $Id: mux.c,v 0.9 1993/01/16 23:17:15 ceder Exp $
+ * $Id: mux.c,v 0.10 1993/10/10 17:04:47 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -26,27 +26,26 @@
 ** mux.c
 */

-static char *rcsid = "$Id: mux.c,v 0.9 1993/01/16 23:17:15 ceder Exp $";
+static char *rcsid = "$Id: mux.c,v 0.10 1993/10/10 17:04:47 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);

- 
-#include <stddef.h>
 #include <stdarg.h>
 #include <string.h>
+#include <setjmp.h>
+
+#include "isc-interface.h"
 #include "s-string.h"
-#include "lyskomd.h"
-#include <kom-types.h>
+#include "misc-types.h"
+#include "kom-types.h"
 #include "com.h"
 #include "connections.h"
-#include "isc-interface.h"
 #include "mux.h"
-#include <server/smalloc.h>
-
+#include "server/smalloc.h"
+#include "lyskomd.h"

 extern _printf( int (*sputc)(int chr), const char *fmt, va_list AP);

-
 /*
 ** MUX support functions
 */

--- a/src/server/prot-a-output.c
+++ b/src/server/prot-a-output.c
 /*
- * $Id: prot-a-output.c,v 0.12 1993/01/16 23:17:23 ceder Exp $
+ * $Id: prot-a-output.c,v 0.13 1993/10/10 17:04:52 ceder Exp $
 * Copyright (C) 1991  Lysator Academic Computer Association.
 *
 * This file is part of the LysKOM server.
@@ -28,21 +28,20 @@
 * Written by ceder 1990-07-13
 */

-static char *rcsid = "$Id: prot-a-output.c,v 0.12 1993/01/16 23:17:23 ceder Exp $";
+static char *rcsid = "$Id: prot-a-output.c,v 0.13 1993/10/10 17:04:52 ceder Exp $";
 #include "rcs.h"
 USE(rcsid);