shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-03 17:47:44 +03:00
Code Releases Activity

Fix semaphore includes in dmsetup for udev sync.

Browse Source
This commit is contained in:
Peter Rajnoha 2009-08-06 15:56:50 +00:00
parent 819e3b9661
commit 99b7ce7bf5
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/dmsetup.c
View File

@ -280,34 +280,6 @@ struct dmsetup_report_obj {
struct dm_split_name *split_name;
};
static char _yes_no_prompt(const char *prompt, ...)
{
int c = 0, ret = 0;
va_list ap;
do {
if (c == '\n' || !c) {
va_start(ap, prompt);
vprintf(prompt, ap);
va_end(ap);
}
if ((c = getchar()) == EOF) {
ret = 'n';
break;
}
c = tolower(c);
if ((c == 'y') || (c == 'n'))
ret = c;
} while (!ret || c != '\n');
if (c != '\n')
printf("\n");
return ret;
}
static struct dm_task *_get_deps_task(int major, int minor)
{
struct dm_task *dmt;
@ -804,8 +776,41 @@ static int _udevcomplete_all(int argc __attribute((unused)), char **argv __attri
return 1;
}
static int _udevcookies(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
return 1;
}
#else
static char _yes_no_prompt(const char *prompt, ...)
{
int c = 0, ret = 0;
va_list ap;
do {
if (c == '\n' || !c) {
va_start(ap, prompt);
vprintf(prompt, ap);
va_end(ap);
}
if ((c = getchar()) == EOF) {
ret = 'n';
break;
}
c = tolower(c);
if ((c == 'y') || (c == 'n'))
ret = c;
} while (!ret || c != '\n');
if (c != '\n')
printf("\n");
return ret;
}
static int _udevcomplete_all(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
int max_id, id, sid;
@ -852,7 +857,6 @@ static int _udevcomplete_all(int argc __attribute((unused)), char **argv __attri
return 1;
}
#endif
static int _udevcookies(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
@ -891,7 +895,7 @@ static int _udevcookies(int argc __attribute((unused)), char **argv __attribute(
return 1;
}
#endif
static int _version(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{