From 2ca219bc802a80f5d5de8b2124bc1f790b229a89 Mon Sep 17 00:00:00 2001 From: TiynGER Date: Sat, 28 Mar 2020 22:24:44 +0100 Subject: [PATCH] patching password --- dmenu-password-4.9.diff | 88 +++++++++++++++++++++++++++++++++++++++++ dmenu.1 | 5 ++- dmenu.1.rej | 21 ++++++++++ dmenu.c | 21 ++++++++-- 4 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 dmenu-password-4.9.diff create mode 100644 dmenu.1.rej diff --git a/dmenu-password-4.9.diff b/dmenu-password-4.9.diff new file mode 100644 index 0000000..db9e680 --- /dev/null +++ b/dmenu-password-4.9.diff @@ -0,0 +1,88 @@ +diff -up dmenu-4.9/dmenu.1 dmenu-4.9-orig/dmenu.1 +--- dmenu-4.9/dmenu.1 2019-09-25 12:55:42.666319316 -0600 ++++ dmenu-4.9-orig/dmenu.1 2019-09-25 12:48:38.848249931 -0600 +@@ -3,7 +3,7 @@ + dmenu \- dynamic menu + .SH SYNOPSIS + .B dmenu ++.RB [ \-bfivP ] +-.RB [ \-bfiv ] + .RB [ \-l + .IR lines ] + .RB [ \-m +@@ -47,9 +47,6 @@ is faster, but will lock up X until stdi + .B \-i + dmenu matches menu items case insensitively. + .TP ++.B \-P ++dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. ++.TP + .BI \-l " lines" + dmenu lists items vertically, with the given number of lines. + .TP +diff -up dmenu-4.9/dmenu.c dmenu-4.9-orig/dmenu.c +--- dmenu-4.9/dmenu.c 2019-09-25 12:48:55.756173240 -0600 ++++ dmenu-4.9-orig/dmenu.c 2019-09-25 12:48:38.848249931 -0600 +@@ -37,7 +37,7 @@ struct item { + static char text[BUFSIZ] = ""; + static char *embed; + static int bh, mw, mh; ++static int inputw = 0, promptw, passwd = 0; +-static int inputw = 0, promptw; + static int lrpad; /* sum of left and right padding */ + static size_t cursor; + static struct item *items = NULL; +@@ -132,7 +132,6 @@ drawmenu(void) + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; ++ char *censort; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); +@@ -144,12 +143,7 @@ drawmenu(void) + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); ++ if (passwd) { ++ censort = ecalloc(1, sizeof(text)); ++ memset(censort, '.', strlen(text)); ++ drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); ++ free(censort); ++ } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); +- drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { +@@ -531,11 +525,6 @@ readstdin(void) + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + ++ if(passwd){ ++ inputw = lines = 0; ++ return; ++ } ++ + /* read each line from stdin and add it to the item list */ + for (i = 0; fgets(buf, sizeof buf, stdin); i++) { + if (i + 1 >= size / sizeof *items) +@@ -693,7 +682,7 @@ setup(void) + static void + usage(void) + { ++ fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" +- fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); + exit(1); + } +@@ -716,9 +705,7 @@ main(int argc, char *argv[]) + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; ++ } else if (!strcmp(argv[i], "-P")) /* is the input a password */ ++ passwd = 1; ++ else if (i + 1 == argc) +- } else if (i + 1 == argc) + usage(); + /* these options take one argument */ + else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ diff --git a/dmenu.1 b/dmenu.1 index 323f93c..762f707 100644 --- a/dmenu.1 +++ b/dmenu.1 @@ -3,7 +3,7 @@ dmenu \- dynamic menu .SH SYNOPSIS .B dmenu -.RB [ \-bfiv ] +.RB [ \-bfivP ] .RB [ \-l .IR lines ] .RB [ \-m @@ -47,6 +47,9 @@ is faster, but will lock up X until stdin reaches end\-of\-file. .B \-i dmenu matches menu items case insensitively. .TP +.B \-P +dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +.TP .BI \-l " lines" dmenu lists items vertically, with the given number of lines. .TP diff --git a/dmenu.1.rej b/dmenu.1.rej new file mode 100644 index 0000000..de8f614 --- /dev/null +++ b/dmenu.1.rej @@ -0,0 +1,21 @@ +--- dmenu.1 2019-09-25 12:55:42.666319316 -0600 ++++ dmenu.1 2019-09-25 12:48:38.848249931 -0600 +@@ -3,7 +3,7 @@ + dmenu \- dynamic menu + .SH SYNOPSIS + .B dmenu +-.RB [ \-bfivP ] ++.RB [ \-bfiv ] + .RB [ \-l + .IR lines ] + .RB [ \-m +@@ -47,9 +47,6 @@ is faster, but will lock up X until stdi + .B \-i + dmenu matches menu items case insensitively. + .TP +-.B \-P +-dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +-.TP + .BI \-l " lines" + dmenu lists items vertically, with the given number of lines. + .TP diff --git a/dmenu.c b/dmenu.c index 65f25ce..01eab58 100644 --- a/dmenu.c +++ b/dmenu.c @@ -37,7 +37,7 @@ struct item { static char text[BUFSIZ] = ""; static char *embed; static int bh, mw, mh; -static int inputw = 0, promptw; +static int inputw = 0, promptw, passwd = 0; static int lrpad; /* sum of left and right padding */ static size_t cursor; static struct item *items = NULL; @@ -132,6 +132,7 @@ drawmenu(void) unsigned int curpos; struct item *item; int x = 0, y = 0, w; + char *censort; drw_setscheme(drw, scheme[SchemeNorm]); drw_rect(drw, 0, 0, mw, mh, 1, 1); @@ -143,7 +144,12 @@ drawmenu(void) /* draw input field */ w = (lines > 0 || !matches) ? mw - x : inputw; drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + if (passwd) { + censort = ecalloc(1, sizeof(text)); + memset(censort, '.', strlen(text)); + drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); + free(censort); + } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); curpos = TEXTW(text) - TEXTW(&text[cursor]); if ((curpos += lrpad / 2 - 1) < w) { @@ -525,6 +531,11 @@ readstdin(void) size_t i, imax = 0, size = 0; unsigned int tmpmax = 0; + if(passwd){ + inputw = lines = 0; + return; + } + /* read each line from stdin and add it to the item list */ for (i = 0; fgets(buf, sizeof buf, stdin); i++) { if (i + 1 >= size / sizeof *items) @@ -689,7 +700,7 @@ setup(void) static void usage(void) { - fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); exit(1); } @@ -712,7 +723,9 @@ main(int argc, char *argv[]) else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; - } else if (i + 1 == argc) + } else if (!strcmp(argv[i], "-P")) /* is the input a password */ + passwd = 1; + else if (i + 1 == argc) usage(); /* these options take one argument */ else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */