x11vnc: -sleepin m-n for random sleep. More mktemp and mkstemp

protections. SSL_INIT_TIMEOUT=n env. var.  Fix macosx console
X call bug.  Synchronize other projects sources.

1 files changed, 12 insertions, 0 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index e3ee93c..0e185c4 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -360,9 +360,14 @@ void print_help(int mode) {
 "\n"
 "-timeout n             Exit unless a client connects within the first n seconds\n"
 "                       after startup.\n"
+"\n"
 "-sleepin n             At startup sleep n seconds before proceeding (e.g. to\n"
 "                       allow redirs and listening clients to start up)\n"
 "\n"
+"                       If a range is given: '-sleepin min-max', a random value\n"
+"                       between min and max is slept. E.g. '-sleepin 0-20' and\n"
+"                       '-sleepin 10-30'.  Floats are allowed too.\n"
+"\n"
 "-inetd                 Launched by inetd(8): stdio instead of listening socket.\n"
 "                       Note: if you are not redirecting stderr to a log file\n"
 "                       (via shell 2> or -o option) you MUST also specify the -q\n"
@@ -1296,6 +1301,10 @@ void print_help(int mode) {
 "                       Set to zero to poll forever.  Set to a negative value\n"
 "                       to use the builtin setting.\n"
 "\n"
+"                       Note that this value does not apply to the *initial* ssl\n"
+"                       init connection.  The default timeout for that is 20sec.\n"
+"                       Use -env SSL_INIT_TIMEOUT=n to modify it.\n"
+"\n"
 "-sslnofail             Exit at the first SSL connection failure. Useful when\n"
 "                       scripting SSL connections (e.g. x11vnc is started via\n"
 "                       ssh) and you do not want x11vnc waiting around for more\n"
@@ -2197,6 +2206,9 @@ void print_help(int mode) {
 "                       where a Keysym is bound to multiple keys (e.g. \"<\" + \">\"\n"
 "                       and \",\" + \"<\" keys).  Default: %s\n"
 "\n"
+"                       If you are having trouble with with keys and -xkb or\n"
+"                       -noxkb, and similar things don't help, try -nomodtweak.\n"
+"\n"
 "                       On some HP-UX systems it is been noted that they have\n"
 "                       an odd keymapping where a single keycode will have a\n"
 "                       keysym, e.g. \"#\", up to three times.  You can check\n"