Make G_parser() only invoke UI if module has required arguments

No need for "if (argc > 1 && G_parser(argc, argv))"


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32756 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.colorlist/main.c

@@ -45,10 +45,8 @@ int main(int argc, char **argv)
     sep->description = "character for separation of list items";
     sep->answer = ",";
 
-    G_disable_interactive();
-
-    if (argc > 1 && G_parser(argc, argv))
-	exit(1);
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
 
     colorlist = G_store(D_color_list());
 
@@ -60,5 +58,5 @@ int main(int argc, char **argv)
     }
 
     fprintf(stdout, "%s\n", colorlist);
-    return (0);
+    return 0;
 }

display/d.erase/main.c

@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     eraseframe->key = 'f';
     eraseframe->description = _("Remove all frames and erase the screen");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(1);
 
     if (R_open_driver() != 0)

display/d.fontlist/main.c

@@ -46,7 +46,7 @@ int main(int argc, char **argv)
     flagL->key = 'L';
     flagL->description = _("List fonts verbosely");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (R_open_driver() != 0)

display/d.info/main.c

@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
     cflag->key = 'c';
     cflag->description = _("Display number of colors");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (!rflag->answer && !dflag->answer && !cflag->answer &&

display/d.measure/main.c

@@ -78,7 +78,7 @@ int main(int argc, char **argv)
     parm.k->key = 'k';
     parm.k->description = _("Output in kilometers as well");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (R_open_driver() != 0)

display/d.measure/msurements.c

@@ -18,7 +18,7 @@ int measurements(int color1, int color2, int s_flag, int m_flag, int k_flag)
     int cur_screen_x, cur_screen_y;
     int screen_x, screen_y;
     struct Cell_head window;
-    int t, b, l, r;
+    double t, b, l, r;
 
     nalloc = 128;
     x = (double *)G_calloc(nalloc, sizeof(double));

display/d.what.rast/main.c

@@ -30,7 +30,7 @@
 int main(int argc, char **argv)
 {
     struct Cell_head window;
-    int t, b, l, r;
+    double t, b, l, r;
     int i, j;
     int width, mwidth;
     struct Flag *once, *terse, *colrow;
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
     colrow->description =
 	_("Print out col/row for the entire map in grid resolution of the region");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

display/d.what.vect/main.c

@@ -46,7 +46,7 @@ int main(int argc, char **argv)
     struct Flag *once, *terse, *txt, *topo_flag, *edit_flag;
     struct Option *opt1;
     struct GModule *module;
-    char *mapset, *openvect();
+    char *mapset;
     char *str;
     int i, j, level, width = 0, mwidth = 0;
 
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
     edit_flag->key = 'e';
     edit_flag->description = _("Open form in edit mode");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (opt1->answers && opt1->answers[0])

display/d.where/main.c

@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 
 
     /* if (G_parser(argc,argv)) */
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (latlong->answer && wgs84->answer)
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 	}
     }
     else
-	fp = NULL;
+	fp = stdin;
 
     if (R_open_driver() != 0)
 	G_fatal_error(_("No graphics device selected"));

display/d.zoom/main.c

@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     last->key = 'r';
     last->description = _("Return to previous zoom");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if ((full->answer + pan->answer + hand->answer) > 1)

general/g.gisenv/main.c

@@ -25,9 +25,9 @@
 int main(int argc, char *argv[])
 {
     int n, store;
-    int tty;
     char *name, *value, *ptr;
     struct Option *get, *set, *store_opt;
+    struct Flag *flag_s, *flag_n;
     struct GModule *module;
 
     G_set_program_name(argv[0]);
@@ -60,15 +60,34 @@ int main(int argc, char *argv[])
     store_opt->description = _("Where GRASS variable is stored");
     store_opt->required = NO;
 
-    if (argc > 1 && G_parser(argc, argv) < 0)
+    flag_s = G_define_flag();
+    flag_s->key = 's';
+    flag_s->description = _("Use shell syntax (for \"eval\")");
+
+    flag_n = G_define_flag();
+    flag_n->key = 'n';
+    flag_n->description = _("Don't Use shell syntax");
+
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
+    if (flag_s->answer && flag_n->answer)
+	G_fatal_error(_("-s and -n are mutually exclusive"));
+
     /* Print or optionally set environment variables */
     if (!get->answer && !set->answer) {
-	tty = isatty(1);
 	for (n = 0; (name = G__env_name(n)); n++) {
+	    int quote;
+
+	    if (flag_s->answer)
+		quote = 1;
+	    else if (flag_n->answer)
+		quote = 0;
+	    else
+		quote = !isatty(fileno(stdout));
+
 	    if ((value = G__getenv(name))) {
-		if (tty)
+		if (!quote)
 		    fprintf(stdout, "%s=%s\n", name, value);
 		else
 		    fprintf(stdout, "%s='%s';\n", name, value);

general/g.gui/main.c

@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     oneoff->key = 'u';
     oneoff->description = _("Update default GUI setting");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

general/g.mkfontcap/main.c

@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 	"Comma-separated list of extra directories to scan for "
 	"Freetype-compatible fonts as well as the defaults (see documentation)";
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (!tostdout->answer) {

general/g.setproj/main.c

@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
     module->description =
 	_("Interactively reset the location's projection settings.");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

general/g.tempfile/main.c

@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
     G_disable_interactive();
     if (G_parser(argc, argv))
-	exit(1);
+	exit(EXIT_FAILURE);
 
     if (sscanf(pid->answer, "%d", &p) != 1) {
 	G_usage();

general/g.version/main.c

@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     build->key = 'b';
     build->description = _("Print the GRASS build information");
 
-    if (argc > 1 && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

imagery/i.maxlik/main.c

@@ -88,8 +88,6 @@ int main(int argc, char *argv[])
     flag.quiet->key = 'q';
     flag.quiet->description = _("Run quietly");
 
-    G_disable_interactive();
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

lib/gis/parser.c

@@ -90,10 +90,11 @@
 #define KEYLENGTH 64
 
 static int interactive_ok = 1;
-static int n_opts = 0;
-static int n_flags = 0;
-static int overwrite = 0;
-static int quiet = 0;
+static int n_opts;
+static int n_flags;
+static int overwrite;
+static int quiet;
+static int has_required;
 
 static struct Flag first_flag;	/* First flag in a linked list      */
 static struct Flag *current_flag;	/* Pointer for traversing list      */
@@ -723,6 +724,9 @@ int G_parser(int argc, char **argv)
 
     opt = &first_option;
     while (opt != NULL) {
+	if (opt->required)
+	    has_required = 1;
+
 	/* Parse options */
 	if (opt->options) {
 	    int cnt = 0;
@@ -803,11 +807,11 @@ int G_parser(int argc, char **argv)
 
     /* If there are NO arguments, go interactive */
 
-    if (argc < 2 && interactive_ok && isatty(0)) {
+    if (argc < 2 && has_required && interactive_ok && isatty(0)) {
 	G_gui();
 	return -1;
     }
-    else if (argc < 2 && isatty(0)) {
+    else if (argc < 2 && has_required && isatty(0)) {
 	G_usage();
 	return -1;
     }

ps/ps.map/main.c

@@ -158,10 +158,8 @@ int main(int argc, char *argv[])
     copies->description = _("Number of copies to print");
     copies->required = NO;
 
-    if (!isatty(0))
-	G_disable_interactive();
     if (G_parser(argc, argv))
-	usage(0);
+	exit(EXIT_FAILURE);
 
     /* Print papers */
     if (pflag->answer) {
@@ -277,7 +275,8 @@ int main(int argc, char *argv[])
     else {
 	G_message(_("\nERROR: Required parameter <%s> not set:\n    (%s).\n"),
 		  output_file->key, output_file->description);
-	usage(1);
+	G_usage();
+	exit(EXIT_FAILURE);
     }
 
     /* get current mapset */
@@ -753,10 +752,3 @@ int main(int argc, char *argv[])
     exit(EXIT_SUCCESS);
 }
 
-
-int usage(int full)
-{
-    if (full)
-	G_usage();
-    exit(EXIT_FAILURE);
-}

raster/r.rescale.eq/main.c

@@ -87,7 +87,6 @@ int main(int argc, char *argv[])
     parm.title->required = NO;
     parm.title->description = _("Title for new raster map");
 
-    G_disable_interactive();
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

vector/v.what/main.c

@@ -84,7 +84,7 @@ int main(int argc, char **argv)
     printattributes->key = 'a';
     printattributes->description = _("Print attribute information");
 
-    if ((argc > 1 || !vect) && G_parser(argc, argv))
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (opt1->answers && opt1->answers[0])