shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

lvmcmdline: support size_mb_arg_with_percent

Browse Source 
New size_mb_arg_with_percent is able to read  size_mb_arg
but also it's able to read % values.

Percent parsing is share with int_arg_with_sign_and_percent.
This commit is contained in:
Zdenek Kabelac 2014-10-30 14:52:37 +01:00
parent 519fbe71e4
commit 464f3b8abd
3 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.112 - Version 2.02.112 -
===================================== =====================================
Introduce size_mb_arg_with_percent() for advanced size arg reading.
Add extra support for '.' as decimal point in size args. Add extra support for '.' as decimal point in size args.
Configurable support for creation of sparse volumes with thin-pools. Configurable support for creation of sparse volumes with thin-pools.
Update and correct lvcreate and lvcovert man pages. Update and correct lvcreate and lvcovert man pages.

66
tools/lvmcmdline.c
View File

@ -384,8 +384,32 @@ static int _get_int_arg(struct arg_values *av, char **ptr)
return 1; return 1;
} }
static int _get_percent_arg(struct arg_values *av, const char *ptr)
{
if (!strcasecmp(ptr, "V") || !strcasecmp(ptr, "VG"))
av->percent = PERCENT_VG;
else if (!strcasecmp(ptr, "L") || !strcasecmp(ptr, "LV"))
av->percent = PERCENT_LV;
else if (!strcasecmp(ptr, "P") || !strcasecmp(ptr, "PV") ||
!strcasecmp(ptr, "PVS"))
av->percent = PERCENT_PVS;
else if (!strcasecmp(ptr, "F") || !strcasecmp(ptr, "FR") ||
!strcasecmp(ptr, "FREE"))
av->percent = PERCENT_FREE;
else if (!strcasecmp(ptr, "O") || !strcasecmp(ptr, "OR") ||
!strcasecmp(ptr, "ORIGIN"))
av->percent = PERCENT_ORIGIN;
else {
log_error("Specified %%%s is unknown.", ptr);
return 0;
}
return 1;
}
/* Size stored in sectors */ /* Size stored in sectors */
static int _size_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av, int factor) static int _size_arg(struct cmd_context *cmd __attribute__((unused)),
struct arg_values *av, int factor, int percent)
{ {
char *ptr; char *ptr;
int i; int i;
@ -429,7 +453,14 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), struct arg
if (ptr == val) if (ptr == val)
return 0; return 0;
if (*ptr) { if (percent && *ptr == '%') {
if (!_get_percent_arg(av, ++ptr))
return_0;
if ((uint64_t) v >= UINT32_MAX) {
log_error("Percentage is too big (>=%d%%).", UINT32_MAX);
return 0;
}
} else if (*ptr) {
for (i = strlen(suffixes) - 1; i >= 0; i--) for (i = strlen(suffixes) - 1; i >= 0; i--)
if (suffixes[i] == tolower((int) *ptr)) if (suffixes[i] == tolower((int) *ptr))
break; break;
@ -474,12 +505,17 @@ static int _size_arg(struct cmd_context *cmd __attribute__((unused)), struct arg
int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) int size_kb_arg(struct cmd_context *cmd, struct arg_values *av)
{ {
return _size_arg(cmd, av, 2); return _size_arg(cmd, av, 2, 0);
} }
int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) int size_mb_arg(struct cmd_context *cmd, struct arg_values *av)
{ {
return _size_arg(cmd, av, 2048); return _size_arg(cmd, av, 2048, 0);
}
int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av)
{
return _size_arg(cmd, av, 2048, 1);
} }
int int_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) int int_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av)
@ -516,21 +552,13 @@ int int_arg_with_sign_and_percent(struct cmd_context *cmd __attribute__((unused)
if (*ptr++ != '%') if (*ptr++ != '%')
return 0; return 0;
if (!strcasecmp(ptr, "V") || !strcasecmp(ptr, "VG")) if (!_get_percent_arg(av, ptr))
av->percent = PERCENT_VG; return_0;
else if (!strcasecmp(ptr, "L") || !strcasecmp(ptr, "LV"))
av->percent = PERCENT_LV; if (av->ui64_value >= UINT32_MAX) {
else if (!strcasecmp(ptr, "P") || !strcasecmp(ptr, "PV") || log_error("Percentage is too big (>=%d%%).", UINT32_MAX);
!strcasecmp(ptr, "PVS"))
av->percent = PERCENT_PVS;
else if (!strcasecmp(ptr, "F") || !strcasecmp(ptr, "FR") ||
!strcasecmp(ptr, "FREE"))
av->percent = PERCENT_FREE;
else if (!strcasecmp(ptr, "O") || !strcasecmp(ptr, "OR") ||
!strcasecmp(ptr, "ORIGIN"))
av->percent = PERCENT_ORIGIN;
else
return 0; return 0;
}
return 1; return 1;
} }
@ -613,7 +641,7 @@ int readahead_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_va
return 1; return 1;
} }
if (!_size_arg(cmd, av, 1)) if (!_size_arg(cmd, av, 1, 0))
return 0; return 0;
if (av->sign == SIGN_MINUS) if (av->sign == SIGN_MINUS)

1
tools/tools.h
View File

@ -129,6 +129,7 @@ int discards_arg(struct cmd_context *cmd, struct arg_values *av);
int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av); int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av);
int size_kb_arg(struct cmd_context *cmd, struct arg_values *av); int size_kb_arg(struct cmd_context *cmd, struct arg_values *av);
int size_mb_arg(struct cmd_context *cmd, struct arg_values *av); int size_mb_arg(struct cmd_context *cmd, struct arg_values *av);
int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av);
int int_arg(struct cmd_context *cmd, struct arg_values *av); int int_arg(struct cmd_context *cmd, struct arg_values *av);
int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av); int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av);
int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av); int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av);