Don't ignore stdin in password mode
This makes password mode work for wmenu and wmenu-run without special cases.
This commit is contained in:
parent
15d7c7bcc2
commit
30abca4f30
3 changed files with 3 additions and 5 deletions
|
@ -37,7 +37,7 @@ $PATH and runs the result.
|
||||||
|
|
||||||
*-P*
|
*-P*
|
||||||
wmenu will not directly display the keyboard input, but instead replace it
|
wmenu will not directly display the keyboard input, but instead replace it
|
||||||
with asterisks. All data from stdin will be ignored.
|
with asterisks.
|
||||||
|
|
||||||
*-v*
|
*-v*
|
||||||
prints version information to stdout, then exits.
|
prints version information to stdout, then exits.
|
||||||
|
|
2
menu.c
2
menu.c
|
@ -85,7 +85,7 @@ static bool parse_color(const char *color, uint32_t *result) {
|
||||||
// Parse menu options from command line arguments.
|
// Parse menu options from command line arguments.
|
||||||
void menu_getopts(struct menu *menu, int argc, char *argv[]) {
|
void menu_getopts(struct menu *menu, int argc, char *argv[]) {
|
||||||
const char *usage =
|
const char *usage =
|
||||||
"Usage: wmenu [-biPvx] [-f font] [-l lines] [-o output] [-p prompt]\n"
|
"Usage: wmenu [-biPv] [-f font] [-l lines] [-o output] [-p prompt]\n"
|
||||||
"\t[-N color] [-n color] [-M color] [-m color] [-S color] [-s color]\n";
|
"\t[-N color] [-n color] [-M color] [-m color] [-S color] [-s color]\n";
|
||||||
|
|
||||||
int opt;
|
int opt;
|
||||||
|
|
2
wmenu.c
2
wmenu.c
|
@ -19,9 +19,7 @@ static void read_items(struct menu *menu) {
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
struct menu *menu = menu_create();
|
struct menu *menu = menu_create();
|
||||||
menu_getopts(menu, argc, argv);
|
menu_getopts(menu, argc, argv);
|
||||||
if (!menu->passwd) {
|
|
||||||
read_items(menu);
|
read_items(menu);
|
||||||
}
|
|
||||||
int status = menu_run(menu);
|
int status = menu_run(menu);
|
||||||
menu_destroy(menu);
|
menu_destroy(menu);
|
||||||
return status;
|
return status;
|
||||||
|
|
Loading…
Add table
Reference in a new issue