Re: Official patch #3 for faces v1.5.

Ken Wood (kwood@adl.austek.oz.au)
Thu, 20 Jun 91 23:00:27 CST

Here are a couple of minor patches for this release.

1) Rich has updated the documentation to change the -MH option to -M,
but he hasn't actually changed the source: it still expects -MH and
barfs on -M.

2) The face directory option parsing can't cope with a trailing null
directory. i.e. when faces is run as follows, it correctly substitutes
the compiled-in directory for the null directory

xfaces -f :
xfaces -f :$HOME/lib/faces

but this doesn't work

xfaces -f $HOME/lib/faces:

This is strange because the last release of faces that I looked at
(1.4.11) worked just fine in this respect, so my patch below just
changes the code back again. Perhaps there is another reason why it
was changed. Rich?

Ken

*** dist/get.c Wed Jun 19 15:55:44 1991
--- faces/get.c Thu Jun 20 22:12:41 1991
***************
*** 175,182 ****
INC ;
getparam(&rhostname, argv, "-H needs hostname") ;
break ;
! case 'M' : if (argv[0][2] == 'H') mhflag++ ;
! else goto error ;
break ;
case 'P' : mtype = MONPRINTER ; /* Monitor printer queue. */
INC ;
--- 175,181 ----
INC ;
getparam(&rhostname, argv, "-H needs hostname") ;
break ;
! case 'M' : mhflag++ ;
break ;
case 'P' : mtype = MONPRINTER ; /* Monitor printer queue. */
INC ;
***************
*** 342,348 ****

for (i = 0, pptr = facedirs; pptr && (i <= MAXPATHS); i++)
{
! if ((pptr == NULL) || (*pptr == ':'))
{

/* Null entry in face path means insert compiled-in default. */
--- 341,347 ----

for (i = 0, pptr = facedirs; pptr && (i <= MAXPATHS); i++)
{
! if ((*pptr == (char) NULL) || (*pptr == ':'))
{

/* Null entry in face path means insert compiled-in default. */