commit e7ebda48a29fcfbc5d67473988514809d9427953
parent 1805ccb03f0389beca4bef4a66bd89ffc5843577
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sat, 7 Feb 2026 21:54:38 +0530
Avoid function call in trash command check
Diffstat:
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -9717,8 +9717,10 @@ int main(int argc, char *argv[])
/* We return to tty */
if (!isatty(STDOUT_FILENO)) {
fd = open(ctermid(NULL), O_RDONLY, 0400);
- dup2(fd, STDIN_FILENO);
- close(fd);
+ if (fd != -1) {
+ dup2(fd, STDIN_FILENO);
+ close(fd);
+ }
} else
dup2(STDOUT_FILENO, STDIN_FILENO);
@@ -9915,9 +9917,9 @@ int main(int argc, char *argv[])
/* Configure trash preference */
trashcmd = getenv(env_cfg[NNN_TRASH]);
if (trashcmd) {
- if (strcmp(trashcmd, "1") == 0)
+ if ((trashcmd[0] == '1') && (trashcmd[1] == '\0'))
trashcmd = utils[UTIL_TRASH_CLI];
- else if (strcmp(trashcmd, "2") == 0)
+ else if ((trashcmd[0] == '2') && (trashcmd[1] == '\0'))
trashcmd = utils[UTIL_GIO_TRASH];
}