[PATCH app-xdm 00/11] Review xdm configuration

[Alan Coopersmith]

Alan Coopersmith wrote:
> Alan Coopersmith wrote:
>> Gaetan Nadon wrote:
>>> Man pages: fix omission and incorrect layout and replace cpp with sed
>>> Greeter: no need to build it statically with xdm exe.
>> For the series: Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
>>
>> I also tested the xdm man page on Solaris and the .if sections seemed to
>> work correctly, and the output of the lines ending in \ was corrected.
> 
> Whoops, I take that back - had failed to set the man path correctly to test
> the new man pages, the .if's aren't quite working right with Solaris man.
> 
> This change causes the .IP lines to correctly hidden:
> 
> -.if 'ARC4_RANDOM'' \{
> +.if 'ARC4_RANDOM' \{
> 
> but the following paragraph is still shown.   I'll dig out my Solaris roff
> manuals when I get to the office to see if I can find a fix.

This change seems to work for me, mirroring the old sh test trick of adding an
x for testing empty string comparisons, and using the nroff ".ig" section to
ignore blocks of text since Solaris nroff doesn't seem to support multiline
{} sections after .if properly.

--- a/xdm.man.cpp
+++ b/xdm.man.cpp
@@ -343,20 +343,23 @@ in the section
 A list of additional environment variables, separated by white space,
 to pass on to the \fIXsetup\fP,
 \fIXstartup\fP, \fIXsession\fP, and \fIXreset\fP programs.
-.if 'ARC4_RANDOM'' \{
+.\" The command "if 'x.A'x' .ig" causes everything up to .. to be ignored
+.\" if A is replaced by an empty string in the sed processing, otherwise
+.\" it will be output as normal.
+.if !'x.ARC4_RANDOM'x.' .ig
 .IP \fBDisplayManager.randomFile\fP
 A file to checksum to generate the seed of authorization keys.
 This should be a file that changes frequently.
 The default is \fI/dev/mem\fP.
-\}
-.if !'DEV_RANDOM'' \{
+..
+.if 'x.DEV_RANDOM'x.' .ig
 .IP \fBDisplayManager.randomDevice\fP
 A file to read 8 bytes from to generate the seed of authorization keys.
 The default is \fI DEV_RANDOM \fP. If this file cannot be read, or if a
 read blocks for more than 5 seconds, xdm falls back to using a checksum
 of \fBDisplayManager.randomFile\fP to generate the seed.
-\}
-.if 'ARC4_RANDOM'' \{
+..
+.if !'x.ARC4_RANDOM'x.' .ig
 .IP \fBDisplayManager.prngdSocket\fP
 .IP \fBDisplayManager.prngPort\fP
 A UNIX domain socket name or a TCP socket port number on local host on
@@ -369,7 +372,7 @@ be specified. The default is to use the Unix-domain socket
 On systems that don't have such a daemon, a fall-back entropy
 gathering system, based on various log file contents hashed by the MD5
 algorithm is used instead.
-\}
+..
 .IP \fBDisplayManager.greeterLib\fP
 On systems that support a dynamically-loadable greeter library, the
 name of the library.  The default is


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System