From cb2aeb4e1157fc0d7dc25d94115973422dc1a800 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 7 May 2014 18:18:27 +0200 Subject: Make more use of *_NAME macros. * configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New. (GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New. (DIRMNGR_DISP_NAME, G13_DISP_NAME): New. (GPGCONF_DISP_NAME): New. (SCDAEMON_SOCK_NAME): New. * common/argparse.c (show_help): Map description string. --- scd/scdaemon.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'scd/scdaemon.c') diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 6fe11f83a..aa1588392 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -489,7 +489,8 @@ main (int argc, char **argv ) if (default_config) - configname = make_filename (opt.homedir, "scdaemon.conf", NULL ); + configname = make_filename (opt.homedir, SCDAEMON_NAME EXTSEP_S "conf", + NULL ); argc = orig_argc; @@ -659,10 +660,12 @@ main (int argc, char **argv ) if (config_filename) filename = xstrdup (config_filename); else - filename = make_filename (opt.homedir, "scdaemon.conf", NULL); + filename = make_filename (opt.homedir, SCDAEMON_NAME EXTSEP_S "conf", + NULL); filename_esc = percent_escape (filename, NULL); - es_printf ("gpgconf-scdaemon.conf:%lu:\"%s\n", + es_printf ("%s-%s.conf:%lu:\"%s\n", + GPGCONF_NAME, SCDAEMON_NAME, GC_OPT_FLAG_DEFAULT, filename_esc); xfree (filename_esc); xfree (filename); @@ -742,8 +745,8 @@ main (int argc, char **argv ) if (multi_server) { socket_name = create_socket_name (standard_socket, - "S.scdaemon", - "gpg-XXXXXX/S.scdaemon"); + SCDAEMON_SOCK_NAME, + "gpg-XXXXXX/" SCDAEMON_SOCK_NAME); fd = FD2INT(create_server_socket (standard_socket, socket_name, &socket_nonce)); @@ -798,8 +801,8 @@ main (int argc, char **argv ) /* Create the socket. */ socket_name = create_socket_name (standard_socket, - "S.scdaemon", - "gpg-XXXXXX/S.scdaemon"); + SCDAEMON_SOCK_NAME, + "gpg-XXXXXX/" SCDAEMON_SOCK_NAME); fd = FD2INT (create_server_socket (standard_socket, socket_name, &socket_nonce)); -- cgit v1.2.3