@@ -294,8 +294,7 @@ typedef struct {
uint_t reserved1 : 1;
uint_t reserved1 : 1;
/* The following settings are global */
/* The following settings are global */
uint_t curctx : 3; /* Current context number */
uint_t curctx : 3; /* Current context number */
uint_t prefersel : 1; /* Prefer selection over current, if exists */
uint_t reserved2 : 1;
uint_t reserved2 : 2;
uint_t nonavopen : 1; /* Open file on right arrow or `l` */
uint_t nonavopen : 1; /* Open file on right arrow or `l` */
uint_t autoselect : 1; /* Auto-select dir in type-to-nav mode */
uint_t autoselect : 1; /* Auto-select dir in type-to-nav mode */
uint_t cursormode : 1; /* Move hardware cursor with selection */
uint_t cursormode : 1; /* Move hardware cursor with selection */
@@ -372,7 +371,6 @@ static settings cfg = {
0, /* version */
0, /* version */
0, /* reserved1 */
0, /* reserved1 */
0, /* curctx */
0, /* curctx */
0, /* prefersel */
0, /* reserved2 */
0, /* reserved2 */
0, /* nonavopen */
0, /* nonavopen */
1, /* autoselect */
1, /* autoselect */
@@ -525,7 +523,7 @@ static char * const utils[] = {
#define MSG_FAILED 5
#define MSG_FAILED 5
#define MSG_SSN_NAME 6
#define MSG_SSN_NAME 6
#define MSG_CP_MV_AS 7
#define MSG_CP_MV_AS 7
#define MSG_CUR_SEL_OPTS 8
#define MSG_NOCHNAGE 8
#define MSG_FORCE_RM 9
#define MSG_FORCE_RM 9
#define MSG_LIMIT 10
#define MSG_LIMIT 10
#define MSG_NEW_OPTS 11
#define MSG_NEW_OPTS 11
@@ -558,9 +556,8 @@ static char * const utils[] = {
#define MSG_LAZY 38
#define MSG_LAZY 38
#define MSG_FIRST 39
#define MSG_FIRST 39
#define MSG_RM_TMP 40
#define MSG_RM_TMP 40
#define MSG_NOCHNAGE 41
#ifndef DIR_LIMITED_SELECTION
#ifndef DIR_LIMITED_SELECTION
#define MSG_DIR_CHANGED 42 /* Must be the last entry */
#define MSG_DIR_CHANGED 41 /* Must be the last entry */
#endif
#endif
static const char * const messages[] = {
static const char * const messages[] = {
@@ -572,7 +569,7 @@ static const char * const messages[] = {
"failed!",
"failed!",
"session name: ",
"session name: ",
"'c'p / 'm'v as?",
"'c'p / 'm'v as?",
"'c'urrent / 's'el? ",
"unchanged ",
"rm -rf %s file%s? [Esc cancels]",
"rm -rf %s file%s? [Esc cancels]",
"limit exceeded",
"limit exceeded",
"'f'ile / 'd'ir / 's'ym / 'h'ard?",
"'f'ile / 'd'ir / 's'ym / 'h'ard?",
@@ -605,7 +602,6 @@ static const char * const messages[] = {
"unmount failed! try lazy?",
"unmount failed! try lazy?",
"first file (\')/char?",
"first file (\')/char?",
"remove tmp file?",
"remove tmp file?",
"unchanged",
#ifndef DIR_LIMITED_SELECTION
#ifndef DIR_LIMITED_SELECTION
"dir changed, range sel off", /* Must be the last entry */
"dir changed, range sel off", /* Must be the last entry */
#endif
#endif
@@ -1223,15 +1219,6 @@ static int get_input(const char *prompt)
static int get_cur_or_sel(void)
static int get_cur_or_sel(void)
{
{
if (selbufpos && ndents) {
if (cfg.prefersel)
return 's';
int choice = get_input(messages[MSG_CUR_SEL_OPTS]);
return ((choice == 'c' || choice == 's') ? choice : 0);
}
if (selbufpos)
if (selbufpos)
return 's';
return 's';
@@ -7428,7 +7415,6 @@ static void usage(void)
#endif
#endif
" -t secs timeout to lock\n"
" -t secs timeout to lock\n"
" -T key sort order [a/d/e/r/s/t/v]\n"
" -T key sort order [a/d/e/r/s/t/v]\n"
" -u use selection (no prompt)\n"
#ifndef NOUG
#ifndef NOUG
" -U show user and group\n"
" -U show user and group\n"
#endif
#endif
@@ -7585,7 +7571,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0
while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id]
? env_opts[--env_opts_id]
: getopt(argc, argv, "aAb:cCdDeEfFgHJKl:nop:P:QrRs:St:T:u UVwxh"))) != -1) {
: getopt(argc, argv, "aAb:cCdDeEfFgHJKl:nop:P:QrRs:St:T:UVwxh"))) != -1) {
switch (opt) {
switch (opt) {
#ifndef NOFIFO
#ifndef NOFIFO
case 'a':
case 'a':
@@ -7701,9 +7687,6 @@ int main(int argc, char *argv[])
if (env_opts_id < 0)
if (env_opts_id < 0)
sort = (uchar_t)optarg[0];
sort = (uchar_t)optarg[0];
break;
break;
case 'u':
cfg.prefersel = 1;
break;
case 'U':
case 'U':
g_state.uidgid = 1;
g_state.uidgid = 1;
break;
break;