GitLab

	in the link.
	* src/server/text-store.h: New file, currently empty.
	* src/server/text-store.c: New file.  Include text-store.h, but do
	not yet do anything.
	* src/server/Makefile.am (DISKOBJS): Added text-store.c and
	text-store.h.
	(DBCK): Added text-store.c.

	* src/include/kom-types.h (Text_stat): Remove the reclamation
	field.  It was a mistake to add it 2006-11-06.
	* src/server/dbck-cache.c (cached_flush_text): Don't touch
	reclamation.
	* src/server/memory.c (copy_text_stat): Ditto.
	(init_text_stat): Ditto.
	* src/server/ram-output.c (foutput_text_stat_3): Ditto.
	* src/server/ram-parse.c (fparse_text_stat_3): Ditto.
	(fparse_text_stat_2): Ditto.
	(fparse_text_stat_0): Ditto.
	* src/server/simple-cache.c (cached_create_text): Ditto.

Added support for renaming a datafile once it has been completely
written, and to write it using a temporary extension.

* src/server/ram-io.h (struct dbfile): Added fields fn,
tmp_extension and tmp_fn.  Added documentation.
(dbfile_open_write): New argument: tmp_extension.
(dbfile_rename): New function.
(dbfile_abort): New function.
* src/server/ram-io.c (dbfile_new): Initialize fn, tmp_extension
and tmp_fn.
(current_fn): New static function.  Return tmp_fn if non-NULL,
otherwise fn.
(dbfile_delete): Free the new fields fn, tmp_extension and
tmp_fn.
(dbfile_open_write): New argument: tmp_extension.  Store a copy of
the supplied filename.  If tmp_extension is non-NULL, store a copy
of it, and compute the actual file name to open as the filname
followed by the tmp_extension.
(fsync_dirname): New static function.
(dbfile_rename): New function.  Rename the file from tmp_fn to the
wanted final filename, and sync the directory.
(dbfile_abort): New function.
* src/server/dbck-cache.c (cache_sync_all): Pass a NULL pointer as
tmp_extension of dbfile_open_write(), to get the old behavior.
* src/server/simple-cache.c (pre_sync): Ditto.

* src/server/ram-smalloc.c, src/include/server/smalloc.h:
(sstrdup): New function.

* src/server/ram-io.c (dbfile_open_read): New argument:
wanted_magic.  Log a message and return NULL if the file contains
the wrong magic cookie.  All callers updated to supply "CLEAN" as
the magic cookie.

This causes "make check" to fail quickly if running on an expect that
has broken handling of zero-lenght writes, or if expect is really,
really slow due to broken glob gate.

* src/server/testsuite/Makefile.am (check-l2g): Depend on
working-dejagnu.
(check-lyskomd): Ditto.
(check-leaks): Ditto.
(working-dejagnu): New target.
(EXTRA_DIST): Added dejagnu.0/00-zero-length-write.exp and
dejagnu.0/90-slow-glob-gate.exp.

* src/server/testsuite/dejagnu.0/00-zero-length-write.exp: New
test, that fails on known bad versions of expect.

* src/server/testsuite/dejagnu.0/90-slow-glob-gate.exp: New test,
that fails if a simple regexp pattern causes expect to run too
slow, indicating that it is converted to a glob pattern that
causes a lot of backtracking.

* src/server/testsuite/.gitignore: Ignore dejagnu.log and
dejagnu.sum.

* src/server/testsuite/Makefile.am (site.exp): Set use_dns to yes
or no depending on if adnshost can resolve 127.0.0.1 or not.
* src/server/testsuite/config/unix.exp (lyskomd_start): Set the
"Use DNS" configuration depending on the use_dns setting from
site.exp.

* doc/lyskomd.texi (Parameters): DNS has been unblocking since
version 2.1.0, so don't state that it blocks the server.

* doc/Protocol-A.texi: Don't use "@begin tex" instead of "@tex".  That
construct worked in texinfo.tex version 2003-11-16.09, but support was
removed in 2003-11-29.14.

* src/server/testsuite/timeval-overflow.c (main): Now a tiny bit more
portable.  This code still violates the C standard, but at least it
works as intended in gcc 4.4.1 now.  The old code was optimized to an
eternal loop. :-)

* src/server/testsuite/config/unix.exp (lyskomd_start): Turn on the
garb, unless the test case explicitly disables it.

* doc/lyskomd.texi (File Object Types): New node.
(File Types): New node.

* doc/lyskomd.texi (Hacking): Fill in descriptions in the menu.

* src/server/ram-io.c (set_output_format): Handle format 3.

* src/server/simple-cache.c (cached_create_text),
* src/server/text.c (do_create_text),
* src/server/testsuite/get-time-often.c (read_server): Fixed typos
in comments.

* src/server/ram-smalloc.c: Added a missing newline.

* src/server/testsuite/lyskomd.0/03.exp: Fix a race condition by
sleeping one second.

* src/server/ram-parse.c (fskipwhite): Don't unget EOF.

* doc/lyskomd.texi (Parameters): Changed "Garb" from "on" to
"off".
(Administration): Suggest that the administrator may want to turn
on the garb.
* src/server/server-config.c (parameters): Changed "Garb" from
"on" to "off".

* doc/lyskomd.texi (Files): The lyskomd.clients example line was
missing the third field.  Fix.

use them.
* src/server/ram-io.c, src/server/ram-io.h
(dbfile_putc): New function.
(dbfile_fputs): New function.
(dbfile_feof): New function.
(dbfile_ferror): New function.
* src/server/simple-cache.c (save_one_text): Use dbfile_ferror.
(sync_part): Ditto.
* src/server/ram-output.c (foutput_string): Use dbfile_putc.
(foutput_ulong): Ditto.
(foutput_atsign): Ditto.
(foutput_newline): Ditto.
(foutput_space): Ditto.
(foutput_bool): Ditto.
(foutput_array_start): Use dbfile_fputs.
(foutput_array_end): Ditto.
(foutput_array_nodata): Ditto.
* src/server/ram-io.c (dbfile_change_magic): Use dbfile_ferror.
* src/server/local-to-global.c (l2g_write): Use dbfile_putc.
* src/server/dbck-cache.c (init_cache): Use dbfile_feof().

that changes the state to dbfile_change_magic().  Reduce code
duplication by teaching foutput_header() to handle old file
formats.
* src/server/simple-cache.c (pre_sync): Adjusted to new API of
dbfile_open_write(), including removing calls to foutput_header().
(save_one_text): Extracted parts of the functionality to
dbfile_change_magic().
* src/server/ram-output.c (foutput_header): Moved support for file
formats 0, 1 and 2 here from sync_output_header().
* src/server/ram-io.c, src/server/ram-io.h
(dbfile_open_write): New argument: magic.  Write a file header
with the specified state.
(dbfile_change_magic): New function, extracted from
cache_sync_all() in dbck-cache.c and save_one_text().
* src/server/dbck-cache.c (sync_output_header): Removed.
The ability to emit old-style headers moved to foutput_header().
(cache_sync_all): Adjusted to new API of dbfile_open_write,
including removing calls to sync_output_header().  Use
dbfile_change_magic() instead of rewind() and
sync_output_header().
* src/server/Makefile.am (libcheck_a_SOURCES): Added
server-time.c.

* regex.c: Removed local variables setting for Emacs.

* mkmi (WANT_AUTOCONF): Set to 2.5, not 1.5.

* doc/Protocol-A.texi (The Misc-Info List): Document that it is up
to the server to convert bcc-recpt to cc-recpt or to ignore them,
when clients use an old-style request.  This agrees better with
the wordings in get-text-stat-old.

"generation" and "reclamation" fields.
* src/include/kom-types.h (Text_stat): Added fields generation
and reclamation.
* src/server/simple-cache.c (cached_get_text): Handle text file
generation 0 in the old-fashioned way.  Added a #warning about
other generations.  Check return value of fseek.
(cached_create_text): Added a #warning about nonzero generations
of the text file.
(cached_create_text): Initialize generation and reclamation.
(save_one_conf): Do a file copy only if the formats of file A and
B are the same.  Otherwise, parse the object into a temporary
object and re-serialize it.
(save_one_pers): Ditto.
(save_one_text): Ditto.
(init_cache): Handle data file format 3.
* src/server/ram-parse.c (fparse_text_stat_3): New static function.
(fparse_text_stat_2): Set generation and reclamation to 0.
(fparse_text_stat_0): Ditto.
(fparse_info): Handle data file format 3.
(fparse_conference): Ditto.
(fparse_person): Ditto.
(fparse_membership): Ditto.
(fparse_membership_list): Ditto.
(fparse_text_stat): Ditto.
(fparse_member): Ditto.
* src/server/ram-output.c (foutput_info): Handle data file format 3.
(foutput_text_stat_3): New static function.
(foutput_person): Ditto.
(foutput_conference): Ditto.
(foutput_text_stat): Ditto.
(foutput_membership): Ditto.
(foutput_membership_list): Ditto.
(foutput_member): Ditto.
(foutput_conf_type): Ditto.
* src/server/ram-io.c (output_format): Initialize it to 3.
(dbfile_open_read): Handle data file format 3.
* src/server/memory.c (copy_text_stat): Handle generation and
reclamation.
(init_text_stat): Initialize generation and reclamation.
* src/server/membership.c (read_ranges_postcondition): Use data
file format 3 when dumping a membership to stderr.
* src/server/dbck.c (main): Handle data file format 3.
* src/server/dbck-cache.c (cached_get_text): Handle text file
generation 0 in the old-fashioned way.  Added a #warning about
other generations.
(cached_flush_text): Flush a generation 0 text file.  Added a
#warning about other generations.
(sync_output_header): Handle data file format 3.
(cache_sync_all): Ditto.
(init_cache): Ditto.
* src/server/testsuite/test-l2g.c (main): Use data
file format 3 when reading an Local2Global structure from stdin,
or writing it to stdout.

"struct dbfile".  Add a database version field to that struct, and
remove the global database format variables.  This allows lyskomd
to have files in different versions open at the same time, so that
it can convert format X to format X+1 on the fly.  (This is more
preparation for bug 1616.)
* src/server/ram-io.h (struct dbfile): New struct.
(dbfile_delete): New function.
(set_output_format): New function.
(dbfile_open_write): New function.
(dbfile_open_read): New function.
(dump_dbfile_stats): New function.
(dbfile_ftell): The argument is now a struct dbfile*, not FILE*.
(dbfile_getc): Ditto.
(dbfile_ungetc): Ditto.
* src/server/ram-io.c (output_format): Moved from ram-output.c and
made static variable.  This defines the output format of all
struct dbfile objects created after a change to the variable.
(nr_dbfile_objects): New static statistics variable.
(nr_dbfile_files): New static statistics variable.
(dbfile_new): New static function.
(dbfile_delete): New function.
(set_output_format): Moved from ram-output.c.
(get_version): Moved from simple-cache.c.  Changed return type to
int.  The argument is an open dbfile, not a file name.  Use
dbfile_getc() instead of getc().
(dbfile_open_read): New function.
(dbfile_open_write): New function.
(dump_dbfile_stats): New function.
(dbfile_ftell): The argument is now a struct dbfile*, not FILE*.
(dbfile_getc): Ditto.
(dbfile_ungetc): Ditto.
* src/server/conference.c: Include ram-io.h, since
local-to-global.h needs it.
* src/server/memory.c: Ditto.
* src/server/person.c: Ditto.
* src/server/prot-a-output.c: Ditto.
* src/server/text.c: Ditto.
* src/server/membership.c: Include ram-io.h.
(read_ranges_postcondition): Set up a dbfile wrapper around stderr
for the report created if check_membership() fails.
* src/server/local-to-global.h, src/server/local-to-global.c
(l2g_read): The fp argument is now a struct dbfile*, not a FILE*.
* src/server/dbck.c (oformat): Removed.  The format is stored
inside the dbfile struct instead.
(main): Report an error message if an attempt to use an undefined
output format is detected.
* src/server/dbck-cache.c: Change all FILE* that refer to the
status files to struct dbfile* in all functions, and made
appropriate changes.  Use fp->format instead of the global
variable oformat or data_file_version.
(get_version): Moved to ram-io.c.
(sync_output_header): Removed the oformat argument.  Use
fp->format instead.  All callers updated.
(cache_sync_all): Use dbfile_open_write() instead of i_fopen(),
and dbfile_delete() instead of i_fclose().
(init_cache): Removed the data_file_version variable, as the
format is now stored inside the dbfile struct.  Use
dbfile_open_read() instead of i_fopen(), and dbfile_delete()
instead of i_fclose().
* doc/lyskomd.texi (Modifying Stored Types): The default database
format is now defined in ram-io.c, and nowhere else.  It is
preferrable if lyskomd is able to convert an old format to a new
one after an upgrade.
* src/server/testsuite/test-l2g.c (main): Added a dbfile wrapper
around stdin in call to l2g_read(), and another around stderr in
call to l2g_write().
* src/server/testsuite/Makefile.am (test_l2g_LDADD): Include
libeintr.a.
* src/server/simple-cache.c: Change all FILE* that refer to the
status files to struct dbfile* in all functions, and made
appropriate changes.
(pre_sync): Use dbfile_delete() instead of i_fclose(), and
dbfile_open_write() instead of i_fopen().
(post_sync): Use dbfile_delete() instead of i_fclose(), and
dbfile_open_read() instead of i_fopen().
(save_one_text): Use dbfile_delete() instead of i_fclose(), and
dbfile_open_read() instead of i_fopen().
(sync_part): Use dbfile_delete() instead of i_fclose().
(init_cache): Removed local variable datafile_version; use
fp->format instead.  Use dbfile_open_read() instead of i_fopen().
Removed call to set_input_format(), as dbfile_open_read() does
the same thing.
(free_all_cache): Use dbfile_delete() instead of i_fclose().
* src/server/ramkomd.c (dump_exit_statistics): Dump dbfile stats.
* src/server/ram-parse.h, src/server/ram-parse.c: Change all
FILE* that refer to the status files to struct dbfile* in all
functions, and made appropriate changes.
(set_input_format): Removed.
* src/server/ram-parse.c (input_format): Removed.  All users
changed to use fp->format instead, so that lyskomd can read files
with different versions at the same time.
(fparse_text_stat_2): Code cleanup.
(fparse_text_stat_0): Use dbfile_ungetc() instead of ungetc().
* src/server/ram-output.h, src/server/ram-output.c: Change all
FILE* that refer to the status files to struct dbfile* in all
functions, and made appropriate changes.
(output_format): Moved to ram-io.c and made static.
(set_output_format): Moved to ram-io.c.

foutput_newline().
* src/server/dbck-cache.c (get_version): Use fparse_set_pos()
intead of fseek() where appropriate.
(init_cache): Ditto.
* src/server/simple-cache.c (get_version): Ditto.
(pre_sync): Removed dead code.  Use foutput_newline() and
fparse_set_pos() where appropriate.
(save_one_conf): Use foutput_newline() where appropriate.
(save_one_pers): Ditto.
(save_one_text): Ditto.
(init_cache): Use fparse_set_pos() where appropriate.

* src/server/simple-cache.c (read_person): Use restart_kom instead
of kom_log when there is a size mismatch.
(read_conference): Ditto.
(pre_sync): Log the file name and error message when the file to
save in cannot be opened.
(init_cache): Improve the error message when the database is in
the wrong format.

* src/server/dbck-cache.c (cache_sync_all): Replaced another
fprintf call with a call to foutput_newline.

time handling.  This is more preparation for bug 1616.
* src/server/simple-cache.c (sync_output_header): Renamed to
foutput_header and moved to ram-output.c.  All callers updated.
* src/server/ramkomd.c (current_time): Moved to server-time.c.
(main): Use set_initial_time instead of calling gettimeofday and
accessing current_time directly.
* src/server/ram-output.c, src/server/ram-output.h
(foutput_header): Renamed from sync_output_header.  Use
output_format instead of a hardcoding it to 2.
* src/server/dbck.c (main): Call set_initial_time().
* src/server/dbck-cache.c (sync_output_header): Use foutput_header
to output a format 2 header.
* src/server/server-time.c: New file.
(current_time): Moved here from ramkomd.c.
* src/server/server-time.c, src/server/server-time.h
(set_time): Moved here from connections.c.
(set_initial_time): New function.
* src/server/connections.c (set_ time): Moved to server-time.c.
* src/server/Makefile.am (GENOBJS): Added server-time.c.
(DBCK): Ditto.