small tweaks, -sig alias.

4 files changed, 14 insertions, 5 deletions

diff --git a/x11vnc/README b/x11vnc/README
index 94ca1b7..d7359a3 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -1,5 +1,5 @@
 
-x11vnc README file                         Date: Fri Sep 15 11:12:28 EDT 2006
+x11vnc README file                         Date: Fri Sep 15 12:06:02 EDT 2006
 
 The following information is taken from these URLs:
 
@@ -10518,7 +10518,10 @@ Options:
                        However, for convenience you can use it to ignore other
                        signals, e.g. "-sigpipe ignore:HUP,INT,TERM" in case
                        that would be useful for some sort of application.
-                       You can also put "exit:.." in there.
+                       You can also put "exit:.." in the list to have x11vnc
+                       cleanup on the listed signals. "-sig" is an alias
+                       for this option if you don't like the 'pipe'. Example:
+                       -sig ignore:INT,TERM,exit:USR1
 
 -threads               Whether or not to use the threaded libvncserver
 -nothreads             algorithm [rfbRunEventLoop] if libpthread is available
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 5f8aa10..9c3e54b 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -2392,7 +2392,10 @@ void print_help(int mode) {
 "                       However, for convenience you can use it to ignore other\n"
 "                       signals, e.g. \"-sigpipe ignore:HUP,INT,TERM\" in case\n"
 "                       that would be useful for some sort of application.\n"
-"                       You can also put \"exit:..\" in there.\n"
+"                       You can also put \"exit:..\" in the list to have x11vnc\n"
+"                       cleanup on the listed signals. \"-sig\" is an alias\n"
+"                       for this option if you don't like the 'pipe'. Example:\n"
+"                       -sig ignore:INT,TERM,exit:USR1\n"
 "\n"
 "-threads               Whether or not to use the threaded libvncserver\n"
 "-nothreads             algorithm [rfbRunEventLoop] if libpthread is available\n"
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index 0aaaf9e..d3ef73b 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -2819,7 +2819,10 @@ is doing the correct thing now for quite some time.
 However, for convenience you can use it to ignore other
 signals, e.g. "\fB-sigpipe\fR \fIignore:HUP,INT,TERM\fR" in case
 that would be useful for some sort of application.
-You can also put "exit:.." in there.
+You can also put "exit:.." in the list to have x11vnc
+cleanup on the listed signals. "\fB-sig\fR" is an alias
+for this option if you don't like the 'pipe'. Example:
+\fB-sig\fR ignore:INT,TERM,exit:USR1
 .PP
 \fB-threads,\fR \fB-nothreads\fR
 .IP
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index e43c87f..7cbaa25 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -2160,7 +2160,7 @@ int main(int argc, char* argv[]) {
 			if (f >= 0.0) {
 				xdamage_memory = f;
 			}
-		} else if (!strcmp(arg, "-sigpipe")) {
+		} else if (!strcmp(arg, "-sigpipe") || !strcmp(arg, "-sig")) {
 			CHECK_ARGC
 			if (known_sigpipe_mode(argv[++i])) {
 				sigpipe = strdup(argv[i]);