Convert log_init to get command name using xbasename() rather than hard-wired name.

src/scancel/opt.c

@@ -264,7 +264,6 @@ static void _opt_env()
 static void _opt_args(int argc, char **argv)
 {
 	int opt_char;
-	log_options_t opts = LOG_OPTS_STDERR_ONLY ;
 	int option_index;
 	static struct option long_options[] = {
 		{"help",        no_argument,       0, 'H'},
@@ -279,8 +278,6 @@ static void _opt_args(int argc, char **argv)
 		{"version",     no_argument,       0, 'V'}
 	};
 
-	log_init("scancel", opts, SYSLOG_FACILITY_DAEMON, NULL);
-
 	while((opt_char = getopt_long(argc, argv, "Hin:p:s:t:u:vV",
 			long_options, &option_index)) != -1) {
 		switch (opt_char) {

src/scancel/scancel.c

@@ -46,6 +46,7 @@
 
 #include "src/common/log.h"
 #include "src/common/slurm_protocol_api.h"
+#include "src/common/xstring.h"
 #include "src/common/xmalloc.h"
 #include "src/scancel/scancel.h"
 
@@ -66,7 +67,7 @@ main (int argc, char *argv[])
 {
 	log_options_t log_opts = LOG_OPTS_STDERR_ONLY ;
 
-	log_init ("scancel", log_opts, SYSLOG_FACILITY_DAEMON, NULL);
+	log_init (xbasename(argv[0]), log_opts, SYSLOG_FACILITY_DAEMON, NULL);
 	initialize_and_process_args(argc, argv);
 	if (opt.verbose) {
 		log_opts.stderr_level += opt.verbose;

src/sinfo/opts.c

@@ -59,7 +59,6 @@ extern void parse_command_line(int argc, char *argv[])
 {
 	char *env_val = NULL;
 	int opt_char;
-	log_options_t opts = LOG_OPTS_STDERR_ONLY ;
 	int option_index;
 	static struct option long_options[] = {
 		{"exact",     no_argument,       0, 'e'},
@@ -79,8 +78,6 @@ extern void parse_command_line(int argc, char *argv[])
 		{"version",   no_argument,       0, 'V'}
 	};
 
-	log_init("sinfo", opts, SYSLOG_FACILITY_DAEMON, NULL);
-
 	while((opt_char = getopt_long(argc, argv, "ehHi:ln:No:p:sS:t:vV",
 			long_options, &option_index)) != -1) {
 		switch (opt_char) {

src/sinfo/sinfo.c

@@ -24,6 +24,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
 \*****************************************************************************/
 
+#include "src/common/xstring.h"
 #include "src/common/macros.h"
 #include "src/sinfo/sinfo.h"
 #include "src/sinfo/print.h"
@@ -63,7 +64,7 @@ int main(int argc, char *argv[])
 	node_info_msg_t *node_msg = NULL;
 	List sinfo_list = NULL;
 
-	log_init("sinfo", opts, SYSLOG_FACILITY_DAEMON, NULL);
+	log_init(xbasename(argv[0]), opts, SYSLOG_FACILITY_DAEMON, NULL);
 	parse_command_line(argc, argv);
 
 	while (1) {

src/squeue/opts.c

@@ -62,7 +62,6 @@ parse_command_line( int argc, char* argv[] )
 {
 	char *env_val = NULL;
 	int opt_char;
-	log_options_t opts = LOG_OPTS_STDERR_ONLY ;
 	int option_index;
 	static struct option long_options[] = {
 		{"noheader",   no_argument,       0, 'h'},
@@ -81,8 +80,6 @@ parse_command_line( int argc, char* argv[] )
 		{"version",    no_argument,       0, 'V'}
 	};
 
-	log_init("sinfo", opts, SYSLOG_FACILITY_DAEMON, NULL);
-
 	while((opt_char = getopt_long(argc, argv, "hHi:j::lo:p:s::S:t:u:vV",
 			long_options, &option_index)) != -1) {
 		switch (opt_char) {

src/squeue/squeue.c

@@ -28,6 +28,7 @@
 #include <termcap.h>
 #include <termios.h>
 
+#include "src/common/xstring.h"
 #include "src/squeue/squeue.h"
 
 /********************
@@ -50,7 +51,7 @@ main (int argc, char *argv[])
 {
 	log_options_t opts = LOG_OPTS_STDERR_ONLY ;
 
-	log_init(argv[0], opts, SYSLOG_FACILITY_DAEMON, NULL);
+	log_init(xbasename(argv[0]), opts, SYSLOG_FACILITY_DAEMON, NULL);
 	parse_command_line( argc, argv );
 	max_line_size = _get_window_width( );