progs/pixie.[c1]: Don't replace the existing pixie by default.

[u/mdw/catacomb] / progs / pixie.1

diff --git a/progs/pixie.1 b/progs/pixie.1
index ced4b48..7769e9f 100644 (file)
--- a/progs/pixie.1
+++ b/progs/pixie.1
@@ -13,7 +13,7 @@
 pixie \- Catacomb passphrase pixie
 .SH "SYNOPSIS"
 .B pixie
 pixie \- Catacomb passphrase pixie
 .SH "SYNOPSIS"
 .B pixie

-.RB [ \-qvfidl ]
+.RB [ \-qvfidlr ]

 .RB [ \-c
 .IR command ]
 .RB [ \-t
 .RB [ \-c
 .IR command ]
 .RB [ \-t


@@ -97,6 +97,10 @@ the socket to which a connection is made.  If running as a server, and
 the socket already exists, the pixie currently listening on the socket
 is told to quit.
 .TP
 the socket already exists, the pixie currently listening on the socket
 is told to quit.
 .TP

+.B "\-r, \-\-replace"
+If there's already a pixie listening on the socket then ask it to quit.
+The default behaviour is to report an error and exit in this case.
+.TP

 .BI "\-c, \-\-command=" command
 Specifies a shell command to be run by the pixie when an unknown
 passphrase is requested by a client.
 .BI "\-c, \-\-command=" command
 Specifies a shell command to be run by the pixie when an unknown
 passphrase is requested by a client.


@@ -173,7 +177,9 @@ is complete.
 .PP
 If the attempt failed because a file with the required name already
 exists and is not a socket, the pixie reports an error and exits.  If
 .PP
 If the attempt failed because a file with the required name already
 exists and is not a socket, the pixie reports an error and exits.  If

-there's already a socket with that name, the pixie connects to it, sends
+there's already a socket with that name, the pixie quits unless the
+.B \-\-replace
+option is given: in the latter case, the pixie connects to it, sends

 a
 .B QUIT
 request to the server, waits for a second and retries.  If the
 a
 .B QUIT
 request to the server, waits for a second and retries.  If the