shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-20 18:09:23 +03:00
Code Releases Activity

Synchronise repository / 2.4.21 support

Browse Source
This commit is contained in:
Alasdair Kergon 2003-07-04 19:38:49 +00:00
parent d71bfabe39
commit 8ac9712539
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/dmsetup.c
View File

@ -25,6 +25,7 @@ enum {
MAJOR_ARG,
MINOR_ARG,
VERBOSE_ARG,
VERSION_ARG,
NUM_SWITCHES
};
@ -123,6 +124,7 @@ static void _display_info(struct dm_task *dmt)
if ((uuid = dm_task_get_uuid(dmt)) && *uuid)
printf("UUID: %s\n", uuid);
printf("\n");
}
static int _load(int task, const char *name, const char *file, const char *uuid)
@ -156,6 +158,7 @@ static int _load(int task, const char *name, const char *file, const char *uuid)
r = 1;
if (_switches[VERBOSE_ARG])
_display_info(dmt);
out:
@ -247,7 +250,7 @@ static int _simple(int task, const char *name, int display)
r = dm_task_run(dmt);
if (r && display)
if (r && display && _switches[VERBOSE_ARG])
_display_info(dmt);
out:
@ -309,10 +312,8 @@ static int _status(int argc, char **argv)
if (!dm_task_run(dmt))
goto out;
if (cmd == DM_DEVICE_STATUS) {
if (_switches[VERBOSE_ARG])
_display_info(dmt);
printf("\n");
}
/* Fetch targets and print 'em */
do {
@ -387,6 +388,7 @@ static int _deps(int argc, char **argv)
goto out;
}
if (_switches[VERBOSE_ARG])
_display_info(dmt);
printf("%d dependencies\t:", deps->count);
@ -476,7 +478,9 @@ static void _usage(FILE *out)
{
int i;
fprintf(out, "usage:\n");
fprintf(out, "Usage:\n\n");
fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
" [-r|--readonly] [-j|--major <major>] [-m|--minor <minor>]\n\n");
for (i = 0; _commands[i].name; i++)
fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
return;
@ -499,10 +503,11 @@ static int _process_switches(int *argc, char ***argv)
int c;
static struct option long_options[] = {
{"read-only", 0, NULL, READ_ONLY},
{"readonly", 0, NULL, READ_ONLY},
{"major", 1, NULL, MAJOR_ARG},
{"minor", 1, NULL, MINOR_ARG},
{"verbose", 1, NULL, VERBOSE_ARG},
{"version", 0, NULL, VERSION_ARG},
{"", 0, NULL, 0}
};
@ -526,9 +531,12 @@ static int _process_switches(int *argc, char ***argv)
}
if (c == 'v' || ind == VERBOSE_ARG)
_switches[VERBOSE_ARG]++;
if ((ind == VERSION_ARG))
_switches[VERSION_ARG]++;
}
dm_log_init_verbose(_switches[VERBOSE_ARG]);
if (_switches[VERBOSE_ARG] > 1)
dm_log_init_verbose(_switches[VERBOSE_ARG] - 1);
*argv += optind;
*argc -= optind;
@ -544,6 +552,11 @@ int main(int argc, char **argv)
exit(1);
}
if (_switches[VERSION_ARG]) {
c = _find_command("version");
goto doit;
}
if (argc == 0) {
_usage(stderr);
exit(1);
@ -561,6 +574,7 @@ int main(int argc, char **argv)
exit(1);
}
doit:
if (!c->fn(argc, argv)) {
fprintf(stderr, "Command failed\n");
exit(1);