From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 10 Jun 2018 16:59:36 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/long-help'
X-Git-Tag: v0.6.2~2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7e611b37e41f0ec7ec6d3173b7e88ed5b9b3a276;p=paraslash.git

Merge branch 'refs/heads/t/long-help'

This series introduces lsu.c and lsu.h which contain helpers related to
the lopsub library. These helpers are designed to be shared between
the executables. The series starts by implementing a generic help
command for lopsub suites and converts para_server. Subsequent patches
convert audiod and para_play.

The second part of the series adds another lopsub related helper which
merges command line options and config file options. Each executable
is modified to make use of the new helper, getting rid of quite some
code duplication.

The conflict resolution for server.c has been tested for a while.

Cooking for five weeks.

* refs/heads/t/long-help:
  play: Use lsu_merge_config_file_options().
  mixer: Use lsu_merge_config_file_options().
  gui: Use lsu_merge_config_file_options().
  filter: Use lsu_merge_config_file_options().
  audioc: Use lsu_merge_config_file_options().
  audiod: Use lsu_merge_config_file_options().
  client: Use lsu_merge_config_file_options().
  lsu: Add helper to merge config file options, convert server.
  Trivial: Rename completion_result variables.
  play: Implement help --long.
  audiod: Implement help --long.
  Introduce lsu.{c,h}, implement help --long for para_server.
---

7e611b37e41f0ec7ec6d3173b7e88ed5b9b3a276
diff --cc NEWS.md
index 4a837ed8,d0bd6585..29a64ff9
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,26 -1,6 +1,30 @@@
  NEWS
  ====
  
 +-------------------------------------------
- 0.6.2 (to be accounced) "elastic diversity"
++0.6.2 (to be announced) "elastic diversity"
 +-------------------------------------------
 +
 +- para_gui no longer waits up to one second to update the screen when
 +  the geometry of the terminal changes.
 +- Minor documentation improvements.
 +- Improvements to the crypto subsystem.
 +- The server subcommand "task" has been deprecated. It still works,
 +  but prints nothing. It will be removed in the next major release.
 +- Server log output is now serialized, avoiding issues with partial
 +  lines.
 +- It is now possible to switch to a different afs database by changing
 +  the server configuration and sending SIGHUP to the server process.
 +- New server options: --listen--address, --http-listen-address and
 +  --dccp-listen-address. These options restrict the set of listening
 +  addresses of the TCP and DCCP sockets of the server process.
++- The help commands of server, audiod, play now support --long. By default,
++  the short help is shown.
++- The code which merges the command line options with the config file
++  options has been consolidated.
 +
 +Download: [tarball](./releases/paraslash-git.tar.xz)
 +
  ----------------------------------------
  0.6.1 (2017-09-23) "segmented iteration"
  ----------------------------------------
diff --cc configure.ac
index 9493f8e3,b8c8817e..053996d1
--- a/configure.ac
+++ b/configure.ac
@@@ -392,9 -392,10 +392,10 @@@ if test -n "$CRYPTOLIB" && test $HAVE_O
  		wma_common
  		sideband
  		version
+ 		lsu
  	"
  	if test "$CRYPTOLIB" = openssl; then
 -		server_errlist_objs="$server_errlist_objs crypt"
 +		server_errlist_objs="$server_errlist_objs openssl"
  	else
  		server_errlist_objs="$server_errlist_objs gcrypt"
  	fi
@@@ -486,9 -488,10 +488,10 @@@ if test -n "$CRYPTOLIB"; the
  		wmadec_filter
  		buffer_tree
  		sync_filter
+ 		lsu
  	"
  	if test "$CRYPTOLIB" = openssl; then
 -		audiod_errlist_objs="$audiod_errlist_objs crypt"
 +		audiod_errlist_objs="$audiod_errlist_objs openssl"
  	else
  		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
  	fi
diff --cc server.c
index a344b774,d98009d0..eee0a412
--- a/server.c
+++ b/server.c
@@@ -283,19 -210,19 +248,19 @@@ void parse_config_or_die(bool reload
  	if (OPT_GIVEN(LOG_TIMING))
  		daemon_set_flag(DF_LOG_TIMING);
  	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
- 	if (user_list_file)
+ 	if (!reload || getpid() != afs_pid) {
+ 		char *user_list_file;
+ 		if (OPT_GIVEN(USER_LIST))
+ 			user_list_file = para_strdup(OPT_STRING_VAL(USER_LIST));
+ 		else {
+ 			char *home = para_homedir();
+ 			user_list_file = make_message("%s/.paraslash/server.users", home);
+ 			free(home);
+ 		}
 -		init_user_list(user_list_file);
 +		user_list_init(user_list_file);
- 	ret = 1;
- free_cf:
- 	free(cf);
- 	free(user_list_file);
- 	if (ret < 0) {
- 		if (errctx)
- 			PARA_ERROR_LOG("%s\n", errctx);
- 		free(errctx);
- 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- 		exit(EXIT_FAILURE);
+ 		free(user_list_file);
  	}
+ 	return;
  }
  
  /*