diff --git a/src/server/conference.c b/src/server/conference.c index 5abc96d59bf94b6fb41eacdacdd9ee6585c079a5..348227ca42fc9fa20b3d022b6d994a2036f1775f 100644 --- a/src/server/conference.c +++ b/src/server/conference.c @@ -1,5 +1,5 @@ /* - * $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. +++*** diff --git a/src/server/connections.c b/src/server/connections.c index 24a193b919d41aeefa3b271ac49a1eeea5806b89..c7d1fbc0fcc46410212fcfeec6f2292dcdb57747 100644 --- a/src/server/connections.c +++ b/src/server/connections.c @@ -1,5 +1,5 @@ /* - * $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; diff --git a/src/server/dbck-cache.c b/src/server/dbck-cache.c index 918943b1240e527b57298481c4d9790425c91ac0..1aa9f72b1866a2eab59fbfe480344dd9aa21533c 100644 --- a/src/server/dbck-cache.c +++ b/src/server/dbck-cache.c @@ -1,5 +1,5 @@ /* - * $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 ]; diff --git a/src/server/dbck.c b/src/server/dbck.c index 19d12cae8ea5ea73805c1a8d8e8bde1a91fe4a46..993a69bcb4b65e63b1a1ab611bd408b9d93fc5fa 100644 --- a/src/server/dbck.c +++ b/src/server/dbck.c @@ -1,5 +1,5 @@ /* - * $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 diff --git a/src/server/disk-end-of-atomic.c b/src/server/disk-end-of-atomic.c index 144d9ffef8e89508c8e98fe6b6a6ca7c4e58e2df..bd1b222ffdad16f79993f6d4ce1bac7449ce757b 100644 --- a/src/server/disk-end-of-atomic.c +++ b/src/server/disk-end-of-atomic.c @@ -1,5 +1,5 @@ /* - * $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 ) diff --git a/src/server/isc-malloc.c b/src/server/isc-malloc.c index 309c142f4a11aa6692376d06f659e4a422d67f4b..93ad1c6e4e8b8f0b2406100b6a700b38ec1e459f 100644 --- a/src/server/isc-malloc.c +++ b/src/server/isc-malloc.c @@ -1,5 +1,5 @@ /* - * $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; diff --git a/src/server/isc-parse.c b/src/server/isc-parse.c index da9041f03022738648e311a8881f0efd70b93aa6..f347163a4a43f50a9a90a614ccf6d2079e874bc0 100644 --- a/src/server/isc-parse.c +++ b/src/server/isc-parse.c @@ -1,5 +1,5 @@ /* - * $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" diff --git a/src/server/kom-types.c b/src/server/kom-types.c index 500aec8a22367b96d5f6b8019256f96182b484d3..cfaa54387dd9c1affd8c898404627a6930702e56 100644 --- a/src/server/kom-types.c +++ b/src/server/kom-types.c @@ -1,5 +1,5 @@ /* - * $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; diff --git a/src/server/log.c b/src/server/log.c index 47263ab9ea26041bf959d9e012fcc8d8d291583e..c573f6749d0451b02aefa6f2ebce9de98f8efa8e 100644 --- a/src/server/log.c +++ b/src/server/log.c @@ -1,5 +1,5 @@ /* - * $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" /* diff --git a/src/server/logII.c b/src/server/logII.c index b463100d8235f4a74e6734f5780a401a63d713dd..19d4e3f69681021247504c36755c3fad01a3a8fb 100644 --- a/src/server/logII.c +++ b/src/server/logII.c @@ -1,5 +1,5 @@ /* - * $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 { diff --git a/src/server/membership.c b/src/server/membership.c index 9653a838e7e819b6b88a3b17e40691f71bc28b31..abc9234a3aedfcac483dc3311c0b28da96955a23 100644 --- a/src/server/membership.c +++ b/src/server/membership.c @@ -1,5 +1,5 @@ /* - * $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. diff --git a/src/server/memory.c b/src/server/memory.c index 2e5eaaa69bda221e89acd7b7e50c2afa5cd2d8de..6a2099ff3061d328575d30722266af39a377a977 100644 --- a/src/server/memory.c +++ b/src/server/memory.c @@ -1,5 +1,5 @@ /* - * $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) diff --git a/src/server/mux-parse.c b/src/server/mux-parse.c index dfc9daa9bee5db2c72eea99814de14bb0b783aaf..bc46d59ae95495e2dbbd3001e5889cea0b510136 100644 --- a/src/server/mux-parse.c +++ b/src/server/mux-parse.c @@ -1,5 +1,5 @@ /* - * $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; diff --git a/src/server/mux.c b/src/server/mux.c index b3ed45f3a3069f540348b70f5c93b49809ffa056..6e8a988faed84e4ebf6c5f78d075dffec6273574 100644 --- a/src/server/mux.c +++ b/src/server/mux.c @@ -1,5 +1,5 @@ /* - * $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 */ diff --git a/src/server/prot-a-output.c b/src/server/prot-a-output.c index 4362e0971982e8ad53decba0e7982378e837b6fb..a0fa857edcf8c1c0f620cba9e6237fffb8e64c61 100644 --- a/src/server/prot-a-output.c +++ b/src/server/prot-a-output.c @@ -1,5 +1,5 @@ /* - * $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); - -#include <kom-types.h> -#include <stdio.h> -#include <sys/file.h> #include <time.h> -#include "lyskomd.h" +#include <setjmp.h> + +#include "kom-types.h" +#include "isc-interface.h" #include "com.h" #include "connections.h" -#include "prot-a-output.h" -#include "isc-interface.h" #include "mux.h" +#include "prot-a-output.h" +#include "lyskomd.h" void prot_a_output_person (Connection *fp, diff --git a/src/server/prot-a-parse.c b/src/server/prot-a-parse.c index 84ac2cdd01546f28851445991da44afc4afc2961..3b08b65221a9af382fdc179129c52085e5f218ee 100644 --- a/src/server/prot-a-parse.c +++ b/src/server/prot-a-parse.c @@ -1,5 +1,5 @@ /* - * $Id: prot-a-parse.c,v 0.11 1993/01/16 23:17:31 ceder Exp $ + * $Id: prot-a-parse.c,v 0.12 1993/10/10 17:04:58 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -28,27 +28,23 @@ * BUG: Not all functions are used, I think. /ceder */ -static char *rcsid = "$Id: prot-a-parse.c,v 0.11 1993/01/16 23:17:31 ceder Exp $"; +static char *rcsid = "$Id: prot-a-parse.c,v 0.12 1993/10/10 17:04:58 ceder Exp $"; #include "rcs.h" USE(rcsid); - +#include <stdio.h> #include <setjmp.h> -#include <string.h> +#include <time.h> #include "s-string.h" -#include <kom-types.h> -#include "lyskomd.h" +#include "kom-types.h" #include "com.h" #include "connections.h" #include "prot-a-parse.h" #include "isc-parse.h" -#include <server/smalloc.h> -#include "minmax.h" -#include "prot-a.h" #include "config.h" #include "log.h" - +#include "minmax.h" /* * Return next token from the input stream. Note that the String returned diff --git a/src/server/ram-output.c b/src/server/ram-output.c index d215b3589813d858a7e3e28a13b027ea61d04a6b..725d397df5fe3f2bb4978adf16ce650e3be0a683 100644 --- a/src/server/ram-output.c +++ b/src/server/ram-output.c @@ -1,5 +1,5 @@ /* - * $Id: ram-output.c,v 0.6 1993/01/16 23:17:43 ceder Exp $ + * $Id: ram-output.c,v 0.7 1993/10/10 17:05:02 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -33,21 +33,16 @@ * (It worked - now saving is twice as fast.) */ -static char *rcsid = "$Id: ram-output.c,v 0.6 1993/01/16 23:17:43 ceder Exp $"; +static char *rcsid = "$Id: ram-output.c,v 0.7 1993/10/10 17:05:02 ceder Exp $"; #include "rcs.h" USE(rcsid); - -#include <kom-types.h> #include <stdio.h> -#include <sys/file.h> #include <time.h> -#include "lyskomd.h" + +#include "kom-types.h" #include "ram-output.h" -#include "com.h" -#include "isc-interface.h" -#include "connections.h" -#include "prot-a-output.h" +#include "lyskomd.h" #include "log.h" void diff --git a/src/server/ram-parse.c b/src/server/ram-parse.c index 41f1d3d8c69486a9489347c75dcd3a61cf6cd2a3..9f962a0ea6f806840c435e7b9466ea9b480cd682 100644 --- a/src/server/ram-parse.c +++ b/src/server/ram-parse.c @@ -1,5 +1,5 @@ /* - * $Id: ram-parse.c,v 0.10 1993/01/16 23:17:49 ceder Exp $ + * $Id: ram-parse.c,v 0.11 1993/10/10 17:05:08 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -29,36 +29,26 @@ * ram-parse.c -- parse objects from disk file. */ -static char *rcsid = "$Id: ram-parse.c,v 0.10 1993/01/16 23:17:49 ceder Exp $"; +static char *rcsid = "$Id: ram-parse.c,v 0.11 1993/10/10 17:05:08 ceder Exp $"; #include "rcs.h" USE(rcsid); +#include <ctype.h> +#include <stdio.h> +#include <string.h> +#include <time.h> + +#include "kom-types.h" +#include "ram-parse.h" +#include "log.h" +#include "server/smalloc.h" +#include "kom-errno.h" /* * BUGS: Not all functions are needed. * The method for checking errors in fparse_long is ugly. * Errors in fparse_long are not always checked for. */ -#include <stdio.h> -#include <ctype.h> -#include <sys/types.h> -#include <sys/file.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include "lyskomd.h" -#include "s-string.h" -#include <kom-types.h> -#include <kom-errno.h> -#include <services.h> -#include "ram-parse.h" -#include "log.h" -#include <server/smalloc.h> -#include "com.h" -#include "connections.h" -#ifdef DISKERR -#include "string-malloc.h" -#endif #define REALLOC(ptr, size) srealloc(ptr, size) diff --git a/src/server/regex-match.c b/src/server/regex-match.c index c446010f3b7d49efd66eeb5ad59fe47581cc1569..2f941a9419896fa5c0fd9c6ff95a04a8cf287c63 100644 --- a/src/server/regex-match.c +++ b/src/server/regex-match.c @@ -1,5 +1,5 @@ /* - * $Id: regex-match.c,v 1.4 1993/08/05 01:09:59 ceder Exp $ + * $Id: regex-match.c,v 1.5 1993/10/10 17:05:14 ceder Exp $ * Copyright (C) 1992 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -27,24 +27,25 @@ * Regexp matching */ -static char *rcsid = "$Id: regex-match.c,v 1.4 1993/08/05 01:09:59 ceder Exp $"; +static char *rcsid = "$Id: regex-match.c,v 1.5 1993/10/10 17:05:14 ceder Exp $"; #include "rcs.h" USE(rcsid); -#include <sys/types.h> -#include <regex.h> +#include <stdio.h> +#include <setjmp.h> -#include <kom-errno.h> -#include <kom-types.h> #include "s-string.h" -#include "s-collat-tabs.h" -#include <services.h> -#include <server/smalloc.h> +#include "misc-types.h" +#include "kom-types.h" +#include "services.h" +#include "regex.h" +#include "server/smalloc.h" #include "cache.h" -#include "log.h" -#include "manipulate.h" +#include "kom-errno.h" #include "com.h" #include "connections.h" +#include "manipulate.h" +#include "log.h" static Success lookup_regexp (const String regexp, diff --git a/src/server/send-async.c b/src/server/send-async.c index feead05ff993861d4b11d065546c11a472949a4f..6771848b2bfc7d10a75997a0fa5819eb7d1e5197 100644 --- a/src/server/send-async.c +++ b/src/server/send-async.c @@ -1,5 +1,5 @@ /* - * $Id: send-async.c,v 0.6 1993/08/05 01:09:21 ceder Exp $ + * $Id: send-async.c,v 0.7 1993/10/10 17:05:18 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -28,25 +28,22 @@ * Written by Per Cederqvist 1990-07-22--23 */ -static char *rcsid = "$Id: send-async.c,v 0.6 1993/08/05 01:09:21 ceder Exp $"; +static char *rcsid = "$Id: send-async.c,v 0.7 1993/10/10 17:05:18 ceder Exp $"; #include "rcs.h" USE(rcsid); - #include <stdio.h> -#include "lyskomd.h" -#include <kom-types.h> -#include <services.h> -#include "async.h" -#include "manipulate.h" +#include <setjmp.h> + +#include "misc-types.h" +#include "kom-types.h" #include "com.h" #include "connections.h" +#include "internal-connections.h" #include "send-async.h" #include "prot-a-send-async.h" -#include "prot-a-output.h" +#include "lyskomd.h" #include "log.h" -#include "internal-connections.h" - extern Bool send_async_messages; diff --git a/src/server/session.c b/src/server/session.c index 0a27864b8aa338195ab1b35a8387b61620a3bf89..5f6af57b31fe619dc47ee28571cfb3d40b0bcccc 100644 --- a/src/server/session.c +++ b/src/server/session.c @@ -1,5 +1,5 @@ /* - * $Id: session.c,v 0.14 1993/08/05 01:08:43 ceder Exp $ + * $Id: session.c,v 0.15 1993/10/10 17:05:22 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -28,28 +28,31 @@ * Session control and miscellaneous. */ -static char *rcsid = "$Id: session.c,v 0.14 1993/08/05 01:08:43 ceder Exp $"; +static char *rcsid = "$Id: session.c,v 0.15 1993/10/10 17:05:22 ceder Exp $"; #include "rcs.h" USE(rcsid); - +#include <stdio.h> +#include <setjmp.h> #include <time.h> -#include <stdlib.h> -#include "lyskomd.h" -#include <kom-types.h> -#include <services.h> -#include "manipulate.h" -#include "cache.h" +#ifndef HAVE_DIFFTIME +# include "tmp-difftime.h" +#endif + +#include "s-string.h" +#include "kom-types.h" +#include "services.h" #include "com.h" #include "connections.h" -#include "send-async.h" -#include <server/smalloc.h> +#include "internal-connections.h" +#include "manipulate.h" +#include "lyskomd.h" +#include "kom-errno.h" #include "log.h" -#include <kom-errno.h> +#include "cache.h" +#include "send-async.h" #include "config.h" -#include "internal-connections.h" - -#include "tmp-difftime.h" +#include "server/smalloc.h" /* * Create an oldstyle username, user%host.domain@host.domain. diff --git a/src/server/simple-cache.c b/src/server/simple-cache.c index 284ca202b04241c512ac0ad5bc4ce6b84febebbc..a76860d74d31f0fc04531125b98a99e3285aa290 100644 --- a/src/server/simple-cache.c +++ b/src/server/simple-cache.c @@ -1,5 +1,5 @@ /* - * $Id: simple-cache.c,v 0.33 1993/08/13 14:17:29 ceder Exp $ + * $Id: simple-cache.c,v 0.34 1993/10/10 17:05:28 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -33,10 +33,42 @@ * New save algorithm by ceder. */ -static char *rcsid = "$Id: simple-cache.c,v 0.33 1993/08/13 14:17:29 ceder Exp $"; +static char *rcsid = "$Id: simple-cache.c,v 0.34 1993/10/10 17:05:28 ceder Exp $"; #include "rcs.h" USE(rcsid); +#include <errno.h> +#include <stdio.h> +#ifndef SEEK_END +# include <fcntl.h> +#endif +#ifndef SEEK_END +# include <unistd.h> +#endif +#include <time.h> +#ifndef HAVE_DIFFTIME +# include "tmp-difftime.h" +#endif +#include <setjmp.h> + +#include "exp.h" +#include "misc-types.h" +#include "kom-types.h" +#include "tmp-limits.h" +#include "cache-node.h" +#include "cache.h" +#include "parser.h" +#include "ram-parse.h" +#include "ram-output.h" +#include "server/smalloc.h" +#include "kom-memory.h" +#include "lyskomd.h" +#include "debug.h" +#include "kom-errno.h" +#include "log.h" +#include "com.h" +#include "connections.h" +#include "send-async.h" /* * Possible improvements: +++ @@ -51,37 +83,6 @@ USE(rcsid); * if they fail. */ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <sys/file.h> -#include <unistd.h> -#include <errno.h> - -#include <kom-errno.h> -#include <kom-types.h> -#include "s-collat-tabs.h" -#include <server/smalloc.h> -#include <parser.h> -#include "cache.h" -#include <debug.h> -#include "lyskomd.h" -#include "ram-parse.h" -#include "log.h" -#include "com.h" -#include "isc-interface.h" -#include "ram-output.h" -#include "connections.h" -#include "prot-a-output.h" -#include "send-async.h" -#include "memory.h" -#include "exp.h" - -#include "tmp-difftime.h" - -#include "tmp-limits.h" -#include "cache-node.h" -#include "disk-cache.h" static Small_conf * small_conf_arr[ MAX_CONF ]; static Cache_node_mcb * pers_mcb; static Cache_node_mcb * conf_mcb; diff --git a/src/server/string-malloc.c b/src/server/string-malloc.c index 55660456696f9d7d5e6a5ea9f64fd51349923458..e60c755bf95894fe5eeb2533b6248d7c29a8643f 100644 --- a/src/server/string-malloc.c +++ b/src/server/string-malloc.c @@ -1,5 +1,5 @@ /* - * $Id: string-malloc.c,v 0.6 1993/01/16 23:18:29 ceder Exp $ + * $Id: string-malloc.c,v 0.7 1993/10/10 17:05:34 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -29,16 +29,15 @@ * how many allocated strings there are. */ -static char *rcsid = "$Id: string-malloc.c,v 0.6 1993/01/16 23:18:29 ceder Exp $"; +static char *rcsid = "$Id: string-malloc.c,v 0.7 1993/10/10 17:05:34 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 "server/smalloc.h" #include "string-malloc.h" static int no_of_allocated_blocks = 0; diff --git a/src/server/text-garb.c b/src/server/text-garb.c index 92577183b32bab98f7e6c1900db14014be353d1c..98719de6eb325f1f76ef66a9823346811a8bf16c 100644 --- a/src/server/text-garb.c +++ b/src/server/text-garb.c @@ -1,5 +1,5 @@ /* - * $Id: text-garb.c,v 0.10 1993/08/05 00:57:30 ceder Exp $ + * $Id: text-garb.c,v 0.11 1993/10/10 17:05:38 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -28,20 +28,24 @@ * Author: Per Cederqvist. */ -static char *rcsid = "$Id: text-garb.c,v 0.10 1993/08/05 00:57:30 ceder Exp $"; +static char *rcsid = "$Id: text-garb.c,v 0.11 1993/10/10 17:05:38 ceder Exp $"; #include "rcs.h" USE(rcsid); - +#include <stdio.h> #include <time.h> -#include <kom-types.h> +#ifndef HAVE_DIFFTIME +# include "tmp-difftime.h" +#endif + +#include "kom-types.h" +#include "text-garb.h" +#include "misc-types.h" +#include "debug.h" #include "cache.h" +#include "lyskomd.h" #include "log.h" #include "internal-services.h" -#include "lyskomd.h" -#include "text-garb.h" -#include <debug.h> -#include "tmp-difftime.h" /* * This comment is a description of how this _could_ be done in a more diff --git a/src/server/text.c b/src/server/text.c index 487c87a2923d1b79d1f09d309578d78a85de631d..cb598239c152cfa147f8e84421f69fd2978b6d24 100644 --- a/src/server/text.c +++ b/src/server/text.c @@ -1,5 +1,5 @@ /* - * $Id: text.c,v 0.19 1993/08/05 01:00:36 ceder Exp $ + * $Id: text.c,v 0.20 1993/10/10 17:05:44 ceder Exp $ * Copyright (C) 1991 Lysator Academic Computer Association. * * This file is part of the LysKOM server. @@ -28,29 +28,30 @@ * All atomic calls that deals with texts. */ -static char *rcsid = "$Id: text.c,v 0.19 1993/08/05 01:00:36 ceder Exp $"; +static char *rcsid = "$Id: text.c,v 0.20 1993/10/10 17:05:44 ceder Exp $"; #include "rcs.h" USE(rcsid); +#include <errno.h> +#include <stdio.h> #include <time.h> -#include <stdlib.h> -#include "lyskomd.h" -#include <kom-types.h> -#include <services.h> +#include <setjmp.h> + +#include "server/smalloc.h" +#include "kom-types.h" +#include "services.h" #include "manipulate.h" -#include <kom-errno.h> -#include <server/smalloc.h> +#include "lyskomd.h" +#include "kom-errno.h" +#include "config.h" +#include "com.h" +#include "connections.h" +#include "internal-connections.h" #include "cache.h" #include "log.h" #include "minmax.h" -#include <config.h> -#include "com.h" -#include "isc-interface.h" -#include "connections.h" -#include "send-async.h" #include "admin.h" -#include "internal-connections.h" -#include "internal-services.h" +#include "send-async.h" /* * Static functions