Fix usage formatting issues and default socket path

Author: acornard

main/gridinit.c

@@ -112,10 +112,10 @@ static void servers_ensure(void);
 
 static GOptionEntry entries[] = {
 	{"daemonize", 'd', 0, G_OPTION_ARG_NONE, (gboolean *)&flag_daemon,
-	 "Detaches then daemonizes the gridinit \n", NULL},
+	 "Detaches then daemonizes the gridinit", NULL},
 	{"group", 'g', 0, G_OPTION_ARG_STRING_ARRAY, &groups_only_cli,
 	 "limits the services loading to those belonging to the specified"
-	 "group. This option can be repeated\n", "GROUP"},
+	 "group. This option can be repeated", "GROUP"},
 	{"quiet", 'q', 0, G_OPTION_ARG_NONE, (gboolean *)&flag_quiet,
 	 "quiet mode, suppress non-error output",NULL},
 	{"version", 'V', 0, G_OPTION_ARG_NONE, (gboolean *)&flag_version,
@@ -1794,6 +1794,8 @@ __parse_options(int argc, char ** args)
 		g_print("option parsing failed: %s\n", error_local->message);
 		gchar *usage = g_option_context_get_help (context, TRUE, NULL);
 		g_print("%s", usage);
+		exit(1);
+		return;
 	}
 
 	if (flag_more_verbose)

main/gridinit_cmd.c

@@ -44,10 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MEDIUM 1
 
 
-static gchar *sock_path;
+static gchar *sock_path = NULL;
 static gchar line[65536];
 static gboolean flag_color = FALSE;
-static gchar *format;
+static gchar *format = NULL;
 static gboolean flag_version = FALSE;
 #define BOOL(i) (i?1:0)
 
@@ -118,11 +118,11 @@ static struct keyword_set_s KEYWORDS_COLOR = {
 
 static GOptionEntry entries[] = {
 	{"color", 'c', 0, G_OPTION_ARG_NONE, &flag_color,
-	 "coloured display \n", NULL},
+	 "coloured display ", NULL},
 	{"sock-path", 'S', 0, G_OPTION_ARG_FILENAME, &sock_path,
-	 "explicit unix socket path\n", "SOCKET"},
+	 "explicit unix socket path", "SOCKET"},
 	{"format", 'f', 0, G_OPTION_ARG_STRING, &format,
-	 "output result by given FORMAT","FORMAT"},
+	 "output result by given FORMAT. Available FORMAT value are yaml, csv or json","FORMAT"},
 	{"version", 'v', 0, G_OPTION_ARG_NONE, &flag_version,
 	 "Display the version of gridinit_cmd", NULL},
 	{NULL}
@@ -679,6 +679,8 @@ main_options(int argc, char **args)
 	GError *error = NULL;
 	GOptionContext *context;
 
+	sock_path = g_strdup(GRIDINIT_SOCK_PATH);
+
 	context = g_option_context_new("(status{,2,3}|start|stop|reload|repair) [ID...]\n");
 	g_option_context_add_main_entries(context, entries, NULL);
 	if (!g_option_context_parse(context, &argc, &args, &error)) {