]> git.pond.sub.org Git - empserver/log
empserver
16 years agoFix get_empobjp() not to reject EF_SECTOR
Markus Armbruster [Sat, 23 Feb 2008 06:59:10 +0000 (07:59 +0100)]
Fix get_empobjp() not to reject EF_SECTOR

There's no technical reason for rejecting sector access by id.  It's
unusual, but not wrong.

Also remove the superfluous test for EF_BAD; ef_ptr() covers that.

16 years agoFix put_empobj() for types other than units
Markus Armbruster [Sat, 23 Feb 2008 06:48:32 +0000 (07:48 +0100)]
Fix put_empobj() for types other than units

put_empobj() used struct empobj member uid, which is valid only for
units.  Existing users pass only units, fortunately.  Fix by making it
take type and uid parameters.

16 years agoGive unit_map() internal linkage
Markus Armbruster [Fri, 22 Feb 2008 20:53:24 +0000 (21:53 +0100)]
Give unit_map() internal linkage

16 years agoNew realm selector timestamp
Markus Armbruster [Fri, 22 Feb 2008 20:37:04 +0000 (21:37 +0100)]
New realm selector timestamp

The timestamp always existed, but the selector was missing.  It's
needed for incremental xdumps.

16 years agoClean up ugly line break
Markus Armbruster [Fri, 22 Feb 2008 20:13:32 +0000 (21:13 +0100)]
Clean up ugly line break

16 years agoFix test for water in explore
Markus Armbruster [Fri, 22 Feb 2008 20:11:30 +0000 (21:11 +0100)]
Fix test for water in explore

This led to a bogus message when an interactive explore moved onto a
bridge and got prompted, the bridge was destroyed, and the player
stopped the explore "on the water".

16 years agoMake sector types signed
Markus Armbruster [Fri, 22 Feb 2008 19:58:37 +0000 (20:58 +0100)]
Make sector types signed

get_empobj_chr() and emp_obj_chr_name() access struct sctstr member
sct_type through struct empobj member type.  This is technically
non-portable, because the two differ in signedness.  It was also
undocumented.  Fix by making sct_type signed.  sct_newtype as well,
for consistency.

map_char() uses unsigned char for a sector type argument.  Change that
to int.  Matches how this is done elsewhere.

16 years agoMake xundump capable of extending tables
Markus Armbruster [Thu, 21 Feb 2008 20:17:32 +0000 (21:17 +0100)]
Make xundump capable of extending tables

Use ef_ensure_space() in getobj().  This also makes sure objects are
properly initialized before undumping writes to them.

Clean up how sentinels are appended: instead of keeping its slot
reserved while undumping, keep it in the table, and strip it off when
done.

16 years agoGeneralize ef_extend() to non-file-backed tables
Markus Armbruster [Thu, 21 Feb 2008 20:12:58 +0000 (21:12 +0100)]
Generalize ef_extend() to non-file-backed tables

ef_extend() extended the file bypassing the cache, which screws up the
cache if it's EFF_MEM.  It fixed that by closing and reopening the
table.  Cheesy, and worked only for file-backed tables.

Rewrite ef_extend() to remap the cache properly for EFF_MEM.  While
there, simplify the !EFF_MEM case: steal a cache slot instead of
allocating a buffer.

Factor cache mapping out of ef_open() and ef_extend() into new
ef_remap_cache().

16 years agoReplace EFF_RDONLY by EFF_PRIVATE
Markus Armbruster [Thu, 21 Feb 2008 20:04:11 +0000 (21:04 +0100)]
Replace EFF_RDONLY by EFF_PRIVATE

Read-only was a bit of a misnomer: you could write to the table by
obtaining a pointer into it from ef_ptr(), you just couldn't write to
the backing file.

Semantic changes:

* ef_flush() is now allowed when the table is file-backed or privately
  mapped.  Before, it had to be file-backed.  Flushing a privately
  mapped table does nothing, just like flushing a read-only table did.

* ef_write() is now allowed when the table is file-backed or fully
  cached.  Before, it had to be file-backed and not read-only.
  Writing to a privately mapped file-backed table doesn't write to the
  file.

* ef_extend() is not implemented for privately mapped tables, just
  like it wasn't implemented for read-only tables.

16 years agoRemove obsolete comment
Markus Armbruster [Tue, 19 Feb 2008 19:27:01 +0000 (20:27 +0100)]
Remove obsolete comment

Obsolete since ef_open() locks the file (commit de124108).

16 years agoDefine and use NATID_BAD instead of literal 255
Markus Armbruster [Tue, 19 Feb 2008 19:25:08 +0000 (20:25 +0100)]
Define and use NATID_BAD instead of literal 255

16 years agoFix spelling of symbol PLN_AIRBURST in plane_flags[]
Markus Armbruster [Sun, 17 Feb 2008 18:54:41 +0000 (19:54 +0100)]
Fix spelling of symbol PLN_AIRBURST in plane_flags[]

16 years agoClean up trailing whitespace-space in manual pages
Markus Armbruster [Sun, 17 Feb 2008 18:50:38 +0000 (19:50 +0100)]
Clean up trailing whitespace-space in manual pages

16 years agoConsider only wilderness for randomly placed sanctuaries
Markus Armbruster [Sun, 17 Feb 2008 08:01:29 +0000 (09:01 +0100)]
Consider only wilderness for randomly placed sanctuaries

Before, any non-sea sector was acceptable.  Placing sanctuaries on
mountains, plains or bridges doesn't seem such a bright idea, though.

16 years agoDon't recompute sct_coastal in desi(), just use it
Markus Armbruster [Sun, 17 Feb 2008 07:56:14 +0000 (08:56 +0100)]
Don't recompute sct_coastal in desi(), just use it

No need to recompute it since sct_coastal was redesigned to be
reliable in 4.3.0 (commit 7b947943),

16 years agoRemove unused check_cost()
Markus Armbruster [Sun, 17 Feb 2008 07:47:51 +0000 (08:47 +0100)]
Remove unused check_cost()

16 years agoDon't let designate check total cost before doing anything
Markus Armbruster [Sun, 17 Feb 2008 07:47:23 +0000 (08:47 +0100)]
Don't let designate check total cost before doing anything

desi() ran the designate code twice, first for adding up the cost,
then for changing designation.  However, the checking pass already
changed the sector when that cost nothing.  The checking pass also
suppressed messages.  There was at least one message that never got
printed because it was suppressed in the checking pass, and the
condition for it was no longer true in the changing pass, due to the
premature sector change: when a deity changed a non-coastal sector to
harbor or bridge head.

The total cost check is of limited value: designate costing money is a
bad idea, and the stock game has no such sectors.  Not enough value to
justify keeping and fixing this disgusting mess.  Remove it instead.

16 years agoFix mobility cost for marines assaulting from non-landing ships
Markus Armbruster [Sat, 16 Feb 2008 19:42:11 +0000 (20:42 +0100)]
Fix mobility cost for marines assaulting from non-landing ships

Always charge land units at least as much mobility for assaulting from
non-landing ships as for landing ships.  Before, marines lost all
mobility when assaulting from a non-landing ship, which could be less
than what the same assault costs from a landing ship (half an update's
worth).

16 years agoRemove thoroughly obsolete info on estimated odds
Markus Armbruster [Sat, 16 Feb 2008 19:14:20 +0000 (20:14 +0100)]
Remove thoroughly obsolete info on estimated odds

The code to estimate odds and ask for confirmation was disabled in
4.0.0, and removed for good in 4.3.4.

16 years agoSimplify take_move_in_mob()
Markus Armbruster [Sat, 16 Feb 2008 17:29:35 +0000 (18:29 +0100)]
Simplify take_move_in_mob()

Actually, this isn't just simplification.  When mobility gain per
update was configured to be greater than 128, mobility could go from 1
to less than -127 when assaulting from a landing ship, and thus
overflow.  Make it saturate at -127.  Note that you can expect plenty
of trouble elsewhere with such a silly configuration.

16 years agoFix LWP's stack initialization for -s
Markus Armbruster [Thu, 14 Feb 2008 22:47:27 +0000 (23:47 +0100)]
Fix LWP's stack initialization for -s

With -s, LWP initializes thread stacks to track stack use.  It did
that after makecontext(), with disastrous results on systems where
makecontext() writes something to the stack that swapcontext() expects
to find there.  Makes FreeBSD 6.2 crash in swapcontext().

Factor stack allocation out of lwpNewContext() into lwpNewStack().
Move call of lwpStackCheckInit() into lwpNewStack().

16 years agoFix confused and buggy bridge splashing code
Markus Armbruster [Mon, 11 Feb 2008 22:14:04 +0000 (23:14 +0100)]
Fix confused and buggy bridge splashing code

A bridge (span or tower) must be splashed when it gets damaged below
SCT_MINEFF.  Likewise when its last supporting sector (bridge head or
tower) gets damaged below SCT_MINEFF, unless EASY_BRIDGES is enabled.
We need to check this whenever a bridge head, span or tower gets
damaged.  This is done in three places, and all of them screw up:

* checksect() ignores damage to bridge heads.  It also leaves writing
  back the sector it checks to the caller, which never happens when
  it's called from sct_postread().

  Note that checksect() drowns all planes on bridges it splashes.
  Functions that need to exempt flying planes from such a fate have to
  splash bridges themselves.

* sect_damage() ignores damage to bridge towers, and damage to bridge
  spans unless EASY_BRIDGES is enabled.  It then runs checksect(),
  which compensates for these omissions, but happily drowns the planes
  sect_damage() attempts to protect.

* eff_bomb() ignores damage to bridge heads.  Collateral damage makes
  sect_damage() run, which compensates for the omission.

This causes the following bugs:

* Efficiency damage going through sect_damage() can drown planes it
  shouldn't.  This affects pinpoint bombing when collateral damage
  splashes a bridge, and strategic bombing.  The drowned planes then
  crash and burn when they attempt to land at their (just splashed)
  base.

* Efficiency damage to bridge heads not going through sect_damage()
  fails to collapse unsupported bridges.  This affects pin-bombing
  efficiency without collateral damage, and ground combat.  Also deity
  commands edit, setsector and add, but that could be regarded as a
  feature.

* If the sector file somehow ends up with an inefficient bridge span,
  it collapses on every read again and again, until it collapses on a
  write.  Related problems exist with other actions of checksect(),
  and they're not addressed here.

* If the sector file somehow ends up with adjacent inefficient bridge
  towers, checksect() on any of them recurses infinitely:

  - checksect() inefficient tower T1
    - knockdown() T1, but don't write that back to the sector file
    - bridgefall() T1; this reads all adjacent sectors, including
      inefficient towert T2
      - checksect() T2
        - knockdown() T2, but don't write that back to the sector file
- bridgefall() T1; this reads adjacent sectors including T1
  - checksect() T1
    ...

This commit creates a new function bridge_damaged() to splash any
bridges that became inefficient or unsupported after damage to a
sector.  To avoid the inifinite recursion, we call it in
sct_prewrite() instead of checksect().

No uses knockdown() outside bridgefall.c remain, so give it internal
linkage.

16 years agoAdded Remove_Repository to supported command list
Ron Koenderink [Sat, 16 Feb 2008 17:15:10 +0000 (11:15 -0600)]
Added Remove_Repository to supported command list

This feature was added in commit 70c03561bb90 but was
not added to the list of supported commands at the top
of file.  No functional change just a documentation
correction.

16 years agoApply the patches using git apply instead of patch
Ron Koenderink [Sat, 16 Feb 2008 17:09:19 +0000 (11:09 -0600)]
Apply the patches using git apply instead of patch

Need to be in the empserver directory before applying
the "git apply" command, move the "cd empserver" to the
clone step. This change also fixes a bug when using
with an existing repository not being the correct
directory when executing the "git pull" command.
Fixes commit acd768e5e2 as it used git diff format.

16 years agoRemove unused local variables
Ron Koenderink [Sat, 9 Feb 2008 17:13:50 +0000 (11:13 -0600)]
Remove unused local variables

16 years agoUpdate nightly build for recent changes to path.c.in
Ron Koenderink [Sat, 9 Feb 2008 14:03:56 +0000 (08:03 -0600)]
Update nightly build for recent changes to path.c.in

The three previous commits touching path.c.in broke mingw.patch: the
relative vs absolute paths changes moved the initializers to be
patched to new variables, and the telfil removal messed up the
context.

16 years agoRemove the initialization for builtindir, not required
Ron Koenderink [Sat, 9 Feb 2008 13:51:07 +0000 (07:51 -0600)]
Remove the initialization for builtindir, not required

Fixes commit 4bb23dd1.

16 years agoClean up initialization of nat_ca[]
Markus Armbruster [Wed, 6 Feb 2008 19:33:33 +0000 (20:33 +0100)]
Clean up initialization of nat_ca[]

Factor it out of ef_init_srv() and put it into new nsc_init(), next to
nat_ca[].

16 years agoClean up initialization of empfile[]
Markus Armbruster [Wed, 6 Feb 2008 19:14:39 +0000 (20:14 +0100)]
Clean up initialization of empfile[]

Split ef_init() into two functions: empfile_init() for initialization,
and empfile_fixup() to fix it up for configuration.  Put them next to
empfile[].  Move the call to empfile_init() from behind emp_config()
to before it.

16 years agoGet rid of the need to fix up lchr[].
Markus Armbruster [Mon, 4 Feb 2008 20:38:38 +0000 (21:38 +0100)]
Get rid of the need to fix up lchr[].

Mil are not required for building units since 4.0.0.  l_mil was still
initialized to l_item[I_MILIT], and used instead of that in a couple
of places.  Fix those, and remove the initialization.

16 years agoFix initialization of configdir
Markus Armbruster [Mon, 4 Feb 2008 06:39:42 +0000 (07:39 +0100)]
Fix initialization of configdir

Windows code leaked memory (result of _fullpath()).

POSIX code passed a null buffer to getcwd(), which is not portable,
and failed to check for errors.

16 years agoMake conftab.c independent of the current directory
Markus Armbruster [Sun, 3 Feb 2008 20:43:49 +0000 (21:43 +0100)]
Make conftab.c independent of the current directory

read_builtin_tables() wanted to run in builtindir, and
read_custom_tables() wanted to run in configdir.  Bothersome.  Use new
fopenat() to relax those requirements.

The chdir() satisfying them are now superflous, remove them.

16 years agoMake econfig keys data and info work for relative names
Markus Armbruster [Sun, 3 Feb 2008 19:51:38 +0000 (20:51 +0100)]
Make econfig keys data and info work for relative names

File names in econfig need to be interpreted relative to configdir.
This wasn't the case everywhere for keys data and info.

Fix this by changing variables gamedir and infodir to hold absolute
names.  Change builtindir likewise, for consistency.  Store the values
from econfig in gamedir_conf, infodir_conf and builtindir_conf.

Uses new fnameat() to derive absolute names from possibly relative
ones.

16 years agoFix title and section header in manual pages
Markus Armbruster [Sun, 3 Feb 2008 12:53:22 +0000 (13:53 +0100)]
Fix title and section header in manual pages

Commit 530deef2 failed to update .TH of fairland(6), files(6) and
pconfig(6).

Commit 530deef2 failed to update .TH of empire(6).

Commit eeb9d3cb created empsched(6) with the wrong .TH.

16 years agoMake utility programs abort on internal error
Markus Armbruster [Sun, 3 Feb 2008 12:22:34 +0000 (13:22 +0100)]
Make utility programs abort on internal error

Until now, they tried to recover and continue (debug off).  That's
appropriate only for the server.  The server could be told to abort
instead (debug on, selected by option -d), but not the utility
programs.

Change debug to be on by default, and switch it off early in the
server's main().  No functional change for the server.

16 years agoFix unintentionally broad patterns in .gitignore
Markus Armbruster [Sun, 3 Feb 2008 07:57:41 +0000 (08:57 +0100)]
Fix unintentionally broad patterns in .gitignore

The patterns intended to match exactly weren't anchored.  In
particular, pattern lib make anything below src/lib/ invisible.
Anchor them all.

16 years agoSwitch nightlybuilds to git
Ron Koenderink [Tue, 5 Feb 2008 02:26:46 +0000 (20:26 -0600)]
Switch nightlybuilds to git

Create a local git repository on the SuSE nightly build machine.
Update local git repository from the Markus's public repository
at the beginnning of the nightlybuilds for SuSE and WIN32.
For the SuSE and WIN32 nightlybuilds drawn from the local
git repository on SuSE machine.

16 years agoClean up library dependencies
Markus Armbruster [Sat, 2 Feb 2008 20:03:12 +0000 (21:03 +0100)]
Clean up library dependencies

Move stuff to untangle the ugly cyclic dependencies between the
archives built for selected subdirectories of src/lib/:

* Move common/io.c to empthread/ because it requires empthread stuff

* Move parts of subs/nstr.c to common/nstreval.c to satisfy
  common/ef_verify.o

* Move getstarg.c getstring.c onearg.c from gen/ to subs/ because they
  require stuff from there

* Move bridgefall.c check.c damage.c empobj.c journal.c maps.c
  sectdamage.c from common/ to subs/ because they require stuff from
  there

* Move cnumb.c from subs/ to common/ to satisfy common/type.o

* Move log.c fsize.c from common/ to gen/ because they really belong
  there

* Move emp_config.c mapdist.c from gen/ to common/ because they really
  belong there, and require stuff from libglobal.a

Also package as/ as libas.a to satisfy common/path.o.

Remaining dependencies:

    lib             needs
    --------------------------------------------
    libas.a         libglobal.a
    libcommon.a     libas.a libglobal.a libgen.a
    libgen.a
    libglobal.a
    liblwp.a        libgen.a
    libw32.a[*]     libgen.a

    [*] Except for service.o, which can only be linked into the server

Link order now: liblwp.a libcommon.a libas.a libgen.a libglobal.a
libw32.a.  The position of libw32.a is not quite right, but works
anyway.

16 years agoGet rid of src/lib/gen/copy.c
Markus Armbruster [Sat, 2 Feb 2008 20:52:01 +0000 (21:52 +0100)]
Get rid of src/lib/gen/copy.c

The function that gave its name to this file is long gone, the file's
description is bogus, and it contains just one definition.  Move that
to ../subs/border.c, and delete the file.

16 years agoGet rid of src/lib/common/land.c
Markus Armbruster [Sat, 2 Feb 2008 20:36:37 +0000 (21:36 +0100)]
Get rid of src/lib/common/land.c

There are several files with land unit subroutines.  This one is in an
awkward place: it depends on stuff from ../subs, which contributes to
libcommon.a's ugly dependencies.  Move its contents to logical places
(use internal linkage where possible), and remove it.

16 years agoDocument econfig key info setting for running without installing
Markus Armbruster [Sat, 2 Feb 2008 15:15:40 +0000 (16:15 +0100)]
Document econfig key info setting for running without installing

16 years agoRemove telfil, use teldir instead.
Markus Armbruster [Sat, 2 Feb 2008 08:22:10 +0000 (09:22 +0100)]
Remove telfil, use teldir instead.

16 years agoBelatedly update c_form of of show command
Markus Armbruster [Sat, 2 Feb 2008 06:56:49 +0000 (07:56 +0100)]
Belatedly update c_form of of show command

It lacked item and news since 4.3.0.

16 years agoTrim extra newline from documentation of econfig key update_demand
Markus Armbruster [Sat, 2 Feb 2008 06:53:19 +0000 (07:53 +0100)]
Trim extra newline from documentation of econfig key update_demand

16 years agoRemove unused non-terminal <VAR> from output of list command
Markus Armbruster [Sat, 2 Feb 2008 06:50:26 +0000 (07:50 +0100)]
Remove unused non-terminal <VAR> from output of list command

It's been unused since commit 5dec30d6, and its explanation was bogus
before.

16 years agoAdd missing expansion island
Ron Koenderink [Fri, 25 Jan 2008 14:12:49 +0000 (08:12 -0600)]
Add missing expansion island

The number of islands was off by one.  The last island was
created, but not actually placed on the map.

16 years agoFix empsched's name in its manual page
Markus Armbruster [Sat, 19 Jan 2008 09:32:02 +0000 (10:32 +0100)]
Fix empsched's name in its manual page

16 years agoUpdate copyright notice
Markus Armbruster [Sat, 19 Jan 2008 09:15:37 +0000 (10:15 +0100)]
Update copyright notice

16 years agoRemove bogus comment
Markus Armbruster [Sat, 19 Jan 2008 08:00:32 +0000 (09:00 +0100)]
Remove bogus comment

16 years agoNote generator script in output
Markus Armbruster [Thu, 17 Jan 2008 21:12:55 +0000 (22:12 +0100)]
Note generator script in output

16 years agoFix bogus file names in error messages
Markus Armbruster [Sun, 13 Jan 2008 10:25:32 +0000 (11:25 +0100)]
Fix bogus file names in error messages

16 years agoReplace .cvsignore files by .gitignore files
Markus Armbruster [Sun, 13 Jan 2008 10:21:39 +0000 (11:21 +0100)]
Replace .cvsignore files by .gitignore files

16 years agoConvert the build process from CVS to git
Markus Armbruster [Sun, 13 Jan 2008 10:17:26 +0000 (11:17 +0100)]
Convert the build process from CVS to git

Detect .git instead of CVS.  Use git-ls-files with git, else
$(srcdir)/sources.mk.  info/findsubj.pl now gets the info files as
arguments rather than from sources.mk.

Remaking info subjects doesn't quite work, but it was broken similarly
before.

16 years ago4.3.11 late changes. v4.3.11
Markus Armbruster [Tue, 1 Jan 2008 19:22:59 +0000 (19:22 +0000)]
4.3.11 late changes.

16 years ago(player_coms): Clean up c_form of announce, break, bye and list.
Markus Armbruster [Tue, 1 Jan 2008 19:09:38 +0000 (19:09 +0000)]
(player_coms): Clean up c_form of announce, break, bye and list.

16 years agoAdd HTML links.
Ron Koenderink [Tue, 1 Jan 2008 16:26:58 +0000 (16:26 +0000)]
Add HTML links.
Improve description for Autotrading.

16 years agoAdd HTML link for info pages.
Ron Koenderink [Tue, 1 Jan 2008 16:22:41 +0000 (16:22 +0000)]
Add HTML link for info pages.

16 years agoRename Autofeed to be Autofish and add information on doing automatic
Ron Koenderink [Tue, 1 Jan 2008 15:20:08 +0000 (15:20 +0000)]
Rename Autofeed to be Autofish and add information on doing automatic
off-shore drilling like automatic fishing.  Fix the formatting to be
more consistent with other info pages.

Add see also reference for Autofish to Autonav.

16 years agoRemove quit as it sometimes confuses the client.
Ron Koenderink [Tue, 25 Dec 2007 17:26:50 +0000 (17:26 +0000)]
Remove quit as it sometimes confuses the client.
Known problem with 4.3.11, depend on the EOF.

16 years agoRemove the symbolic link to empire and use the empire executable
Ron Koenderink [Sun, 23 Dec 2007 22:16:37 +0000 (22:16 +0000)]
Remove the symbolic link to empire and use the empire executable
directly.  Symbolic link fails for WIN32 empire because empire has
exe extension.

16 years agoScheduled task script file for win32 nightly build
Ron Koenderink [Sun, 23 Dec 2007 16:08:34 +0000 (16:08 +0000)]
Scheduled task script file for win32 nightly build

16 years agoConfiguration file for win32 nightly build
Ron Koenderink [Sun, 23 Dec 2007 16:06:59 +0000 (16:06 +0000)]
Configuration file for win32 nightly build

16 years ago(sect_ca): New selector elev. It's set by fairland, but has no effect
Markus Armbruster [Sat, 22 Dec 2007 08:11:21 +0000 (08:11 +0000)]
(sect_ca): New selector elev.  It's set by fairland, but has no effect
on the game.  It can be useful for deities to customize a world
created by fairland.

16 years agoClarify -2.
Markus Armbruster [Sat, 22 Dec 2007 08:07:55 +0000 (08:07 +0000)]
Clarify -2.

Warn about passwords on the command line.

16 years agoFix the previous revision.
Markus Armbruster [Sat, 22 Dec 2007 07:57:07 +0000 (07:57 +0000)]
Fix the previous revision.

16 years agoAdd sysdep_w32.o to the list of objects for the client.
Ron Koenderink [Tue, 18 Dec 2007 02:42:15 +0000 (02:42 +0000)]
Add sysdep_w32.o to the list of objects for the client.
Used for WIN32 clients.

16 years ago(w32_socket) [_WIN32]: Correct the return type to SOCKET
Ron Koenderink [Mon, 17 Dec 2007 13:18:19 +0000 (13:18 +0000)]
(w32_socket) [_WIN32]: Correct the return type to SOCKET
for the select() call.

16 years ago(w32_socket) [_WIN32]: Change result to be unsigned to
Ron Koenderink [Sun, 16 Dec 2007 21:31:51 +0000 (21:31 +0000)]
(w32_socket) [_WIN32]: Change result to be unsigned to
match the WIN32 return value from socket().

16 years agoMove the patch level to above the empserver level.
Ron Koenderink [Sun, 16 Dec 2007 20:14:31 +0000 (20:14 +0000)]
Move the patch level to above the empserver level.

16 years agoAdd mingw specific patch for nightly build for win32.i386.
Ron Koenderink [Sun, 16 Dec 2007 15:45:09 +0000 (15:45 +0000)]
Add mingw specific patch for nightly build for win32.i386.

16 years ago(sysdep_stdin_init) [_WIN32]: Add missing void for the parameter list.
Ron Koenderink [Sun, 16 Dec 2007 04:02:16 +0000 (04:02 +0000)]
(sysdep_stdin_init) [_WIN32]: Add missing void for the parameter list.

16 years ago(w32_openfd) [_WIN32]: Correct extern reference.
Ron Koenderink [Sun, 16 Dec 2007 04:00:19 +0000 (04:00 +0000)]
(w32_openfd) [_WIN32]: Correct extern reference.

16 years agoUpdate for 4.3.11.
Markus Armbruster [Sat, 15 Dec 2007 07:18:40 +0000 (07:18 +0000)]
Update for 4.3.11.

16 years agoUpdate for current code. Fix description of login commands option
Markus Armbruster [Sat, 15 Dec 2007 07:10:53 +0000 (07:10 +0000)]
Update for current code.  Fix description of login commands option
and play.  Document protocol's C_EXECUTE flaws.  Clarify extent of
redirections.  Spelling fixes and such.

16 years ago(parseid): Switch id encoding from base 16 to base 36. This gives us
Markus Armbruster [Sat, 15 Dec 2007 06:52:50 +0000 (06:52 +0000)]
(parseid): Switch id encoding from base 16 to base 36.  This gives us
another 20 single digit ids before we have to risk breaking clients by
going to multiple digits.

16 years agoComment cautioning about protocol version change.
Markus Armbruster [Sat, 15 Dec 2007 06:27:55 +0000 (06:27 +0000)]
Comment cautioning about protocol version change.

16 years agoRemove superfluous parenthesis.
Markus Armbruster [Fri, 14 Dec 2007 07:49:58 +0000 (07:49 +0000)]
Remove superfluous parenthesis.

16 years ago(retreat_ship1, retreat_land1): Simplify slightly.
Markus Armbruster [Fri, 14 Dec 2007 07:48:50 +0000 (07:48 +0000)]
(retreat_ship1, retreat_land1): Simplify slightly.

16 years ago(play): Failed to initialized sa.sa_mask.
Markus Armbruster [Fri, 14 Dec 2007 07:45:46 +0000 (07:45 +0000)]
(play): Failed to initialized sa.sa_mask.

16 years ago(expect): Simplify, no functional change.
Markus Armbruster [Fri, 14 Dec 2007 07:44:46 +0000 (07:44 +0000)]
(expect): Simplify, no functional change.

16 years ago(parseid): New, factored out of recvline() and recv_output().
Markus Armbruster [Fri, 14 Dec 2007 07:44:12 +0000 (07:44 +0000)]
(parseid): New, factored out of recvline() and recv_output().
(recvline, recv_output): Use it.

16 years ago(recvline): Cope with multiple-digit ids. Server doesn't send such
Markus Armbruster [Fri, 14 Dec 2007 07:36:27 +0000 (07:36 +0000)]
(recvline): Cope with multiple-digit ids.  Server doesn't send such
ids at this time.

16 years ago(recvline): Rewrite the loop to receive a line from a socket. The new
Markus Armbruster [Fri, 14 Dec 2007 07:26:30 +0000 (07:26 +0000)]
(recvline): Rewrite the loop to receive a line from a socket.  The new
version silently truncates long lines.  The old one split them up and
got quite confused.  It got also confused when the line didn't arrive
in one piece.  Icing on the cake: it wrote beyond the end of the
buffer.  The new version is less efficient, but that doesn't matter
here.

16 years ago(recvline): Remove the timeout feature. There are many other places
Markus Armbruster [Fri, 14 Dec 2007 06:59:09 +0000 (06:59 +0000)]
(recvline): Remove the timeout feature.  There are many other places
where the client could wait indefinitely for the server.  The user can
always interrupt.

[_WIN32] (alarm): Unused, remove.

16 years ago(sendcmd): Cope gracefully with short writes and EINTR. Don't just
Markus Armbruster [Fri, 14 Dec 2007 06:42:57 +0000 (06:42 +0000)]
(sendcmd): Cope gracefully with short writes and EINTR.  Don't just
continue after real errors.

16 years ago(sendcmd): Don't overflow buf[]. The bug was fairly harmless, because
Markus Armbruster [Fri, 14 Dec 2007 06:01:13 +0000 (06:01 +0000)]
(sendcmd): Don't overflow buf[].  The bug was fairly harmless, because
the overflowing data comes from the local user.

16 years ago(redir_authorized, doexecute): Change diagnostics to talk about batch
Markus Armbruster [Thu, 13 Dec 2007 21:36:25 +0000 (21:36 +0000)]
(redir_authorized, doexecute): Change diagnostics to talk about batch
files instead of script files, to match info execute.

16 years agoRemove senseless casts.
Markus Armbruster [Thu, 13 Dec 2007 21:34:27 +0000 (21:34 +0000)]
Remove senseless casts.

16 years agoRemove superfluous parenthesis.
Markus Armbruster [Thu, 13 Dec 2007 21:32:34 +0000 (21:32 +0000)]
Remove superfluous parenthesis.

16 years agoAdd -k option to the make so more than one error can be found.
Ron Koenderink [Thu, 13 Dec 2007 13:41:09 +0000 (13:41 +0000)]
Add -k option to the make so more than one error can be found.

16 years agoUpdate the CVSROOT to extract directly from sourceforge.net
Ron Koenderink [Thu, 13 Dec 2007 02:13:25 +0000 (02:13 +0000)]
Update the CVSROOT to extract directly from sourceforge.net

16 years ago(play) [_WIN32]: Remove the argumennts for sysdef_stdin_init,
Ron Koenderink [Thu, 13 Dec 2007 01:20:40 +0000 (01:20 +0000)]
(play) [_WIN32]: Remove the argumennts for sysdef_stdin_init,
not needed..

16 years ago(w32_getpw, w32_socket, w32_connect, w32_recv, w32_send,
Ron Koenderink [Tue, 11 Dec 2007 22:00:25 +0000 (22:00 +0000)]
(w32_getpw, w32_socket, w32_connect, w32_recv, w32_send,
w32_writev_socket, w32_close_socket, getpass, w32_openfd,
w32_openhandle, w32_readv_handle, w32_close_handle,
sysdep_init, sysdep_stdin_init, w32_select, w32_signal_handler,
sigaction, stdin_read_thread, w32_ring_from_file_to_bounce_buf)
[_WIN32]: New w32 equivalent functions for POSIX functions.
(recvline, sendcmd, tcp_connect, hostconnect, getpass,
main, intr, play, ring_to_file, ring_from_file, doexecute,
doredir) [_WIN32]: Use new WIN32 equivalent functions.
(main) [_WIN32]: Add sysdep_init() to support system dependent
initialization for equivalence functions.
(play) [_WIN32]: Add sysdef_stdin_init() to support system
dependent initialization for reading stdin.
(recv_input, play) [_WIN32]: Replace the calls to ring_to_file()
and select() with WIN32 specific enhanced versions.

Makefile.in: update dependencies with new files.
Make.mk: Add using of getopt.c and getopt.h
from src/lib/w32 directory.  Add getopt.c and getopt.h
to tar for client.

16 years ago(check_market): Slight simplification. No functional change.
Markus Armbruster [Sun, 9 Dec 2007 17:44:25 +0000 (17:44 +0000)]
(check_market): Slight simplification.  No functional change.

16 years agoDoc fix.
Markus Armbruster [Sun, 9 Dec 2007 17:43:44 +0000 (17:43 +0000)]
Doc fix.

16 years agoDocument restrictions. Warn of common client bugs.
Markus Armbruster [Sun, 9 Dec 2007 17:42:12 +0000 (17:42 +0000)]
Document restrictions.  Warn of common client bugs.

16 years agoDisable nested execute. The execute protocol is flawed and cannot be
Markus Armbruster [Sun, 9 Dec 2007 17:24:30 +0000 (17:24 +0000)]
Disable nested execute.  The execute protocol is flawed and cannot be
implemented correctly by asynchronous clients --- unless a client
waits for a prompt after sending the execute command and its argument,
it is prone to send more input before the C_EXECUTE arrives.  That
input overtakes the contents of the script file.  This is almost
certain to happen when the execute is in a script file.  Disabling
that is probably more useful and certainly less painful than
documenting this mess.  The client rejects nested execute since
servcmd.c rev. 1.42.
(EXEC): new.
(player_coms): Require it for execute.
(player_set_nstat): Set it in nstat.
(execute): Clear it in nstat.

16 years ago(execute): Clients can't reliably detect where a redirection ends
Markus Armbruster [Sun, 9 Dec 2007 17:06:03 +0000 (17:06 +0000)]
(execute): Clients can't reliably detect where a redirection ends
because the server doesn't send C_PROMPT.  The client simply rejects
such redirections since servcmd.c rev. 1.42.  Before it didn't, but
incorrectly extended the redirection until the end of the script, and
screwed up when there was more than one redirection in the execute.
Make the server reject such redirections as well, because that's
probably more useful and certainly less painful than documenting this
mess.

16 years agoAdd empsched, belatedly.
Markus Armbruster [Sun, 9 Dec 2007 16:04:54 +0000 (16:04 +0000)]
Add empsched, belatedly.