mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fish: Move 'is_true' function to library utilities.

Browse Source 
The 'is_true' function can be useful elsewhere, not just for parsing
guestfish command parameters.

This is just code motion.
This commit is contained in:
Richard W.M. Jones
2014-12-17 12:34:53 +00:00
parent d375b7818a
commit bdcd2fabe9
4 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fish/fish.c
View File

@@ -1302,32 +1302,6 @@ print_table (char *const *argv)
printf ("%s: %s\n", argv[i], argv[i+1]);
}
int
is_true (const char *str)
{
/* Similar to Tcl_GetBoolean. */
if (STREQ (str, "1") ||
STRCASEEQ (str, "true") ||
STRCASEEQ (str, "t") ||
STRCASEEQ (str, "yes") ||
STRCASEEQ (str, "y") ||
STRCASEEQ (str, "on"))
return 1;
if (STREQ (str, "0") ||
STRCASEEQ (str, "false") ||
STRCASEEQ (str, "f") ||
STRCASEEQ (str, "no") ||
STRCASEEQ (str, "n") ||
STRCASEEQ (str, "off"))
return 0;
fprintf (stderr, _("%s: '%s': invalid boolean value, use 'true' or 'false'\n"),
program_name, str);
return -1;
}
/* Free strings from a non-NULL terminated char** */
static void
free_n_strings (char **str, size_t len)

21
generator/fish.ml
View File

@@ -84,12 +84,15 @@ let generate_fish_cmds () =
pr "#include <string.h>\n";
pr "#include <inttypes.h>\n";
pr "#include <libintl.h>\n";
pr "#include <errno.h>\n";
pr "\n";
pr "#include \"c-ctype.h\"\n";
pr "#include \"full-write.h\"\n";
pr "#include \"xstrtol.h\"\n";
pr "\n";
pr "#include <guestfs.h>\n";
pr "#include \"guestfs.h\"\n";
pr "#include \"guestfs-internal-frontend.h\"\n";
pr "\n";
pr "#include \"fish.h\"\n";
pr "#include \"fish-cmds.h\"\n";
pr "#include \"options.h\"\n";
@@ -469,8 +472,12 @@ Guestfish will prompt for these separately."
pr " input_lineno++;\n";
pr " if (%s == NULL) goto out_%s;\n" name name
| Bool name ->
pr " switch (is_true (argv[i++])) {\n";
pr " case -1: goto out_%s;\n" name;
pr " switch (guestfs___is_true (argv[i++])) {\n";
pr " case -1:\n";
pr " fprintf (stderr,\n";
pr " _(\"%%s: '%%s': invalid boolean value, use 'true' or 'false'\\n\"),\n";
pr " program_name, argv[i-1]);\n";
pr " goto out_%s;\n" name;
pr " case 0: %s = 0; break;\n" name;
pr " default: %s = 1;\n" name;
pr " }\n"
@@ -508,8 +515,12 @@ Guestfish will prompt for these separately."
pr "if (STRPREFIX (argv[i], \"%s:\")) {\n" n;
(match argt with
| OBool n ->
pr " switch (is_true (&argv[i][%d])) {\n" (len+1);
pr " case -1: goto out;\n";
pr " switch (guestfs___is_true (&argv[i][%d])) {\n" (len+1);
pr " case -1:\n";
pr " fprintf (stderr,\n";
pr " _(\"%%s: '%%s': invalid boolean value, use 'true' or 'false'\\n\"),\n";
pr " program_name, &argv[i][%d]);\n" (len+1);
pr " goto out;\n";
pr " case 0: optargs_s.%s = 0; break;\n" n;
pr " default: optargs_s.%s = 1;\n" n;
pr " }\n"

1
src/guestfs-internal-frontend.h
View File

@@ -105,6 +105,7 @@ extern char **guestfs___split_string (char sep, const char *);
extern char *guestfs___exit_status_to_string (int status, const char *cmd_name, char *buffer, size_t buflen);
extern int guestfs___random_string (char *ret, size_t len);
extern char *guestfs___drive_name (size_t index, char *ret);
extern int guestfs___is_true (const char *str);
/* These functions are used internally by the CLEANUP_* macros.
* Don't call them directly.

23
src/utils.c
View File

@@ -270,3 +270,26 @@ guestfs___drive_name (size_t index, char *ret)
*ret = '\0';
return ret;
}
/* Similar to Tcl_GetBoolean. */
int
guestfs___is_true (const char *str)
{
if (STREQ (str, "1") ||
STRCASEEQ (str, "true") ||
STRCASEEQ (str, "t") ||
STRCASEEQ (str, "yes") ||
STRCASEEQ (str, "y") ||
STRCASEEQ (str, "on"))
return 1;
if (STREQ (str, "0") ||
STRCASEEQ (str, "false") ||
STRCASEEQ (str, "f") ||
STRCASEEQ (str, "no") ||
STRCASEEQ (str, "n") ||
STRCASEEQ (str, "off"))
return 0;
return -1;
}