Skip to content

Multiplexing: replace hardcoded fds #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Multiplexing: replace hardcoded fds #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b8145e
enableRawMode: call isatty() on provided fd instead of STDIN_FILENO
andreca Jan 15, 2025
4770084
getColumns: call ioctl() on provided ofd instead of STDOUT_FILENO
andreca Jan 15, 2025
69f75c9
linenoiseEditStop: send final '\n' to ofd instead of STDOUT_FILENO
andreca Jan 15, 2025
4e1de55
linenoiseClearScreen: clear ofd instead of STDOUT_FILENO
andreca Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions linenoise.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static int isUnsupportedTerm(void) {
static int enableRawMode(int fd) {
struct termios raw;

if (!isatty(STDIN_FILENO)) goto fatal;
if (!isatty(fd)) goto fatal;
if (!atexit_registered) {
atexit(linenoiseAtExit);
atexit_registered = 1;
Expand Down Expand Up @@ -288,7 +288,7 @@ static int getCursorPosition(int ifd, int ofd) {
static int getColumns(int ifd, int ofd) {
struct winsize ws;

if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
if (ioctl(ofd, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
/* ioctl() failed. Try to query the terminal itself. */
int start, cols;

Expand Down Expand Up @@ -319,8 +319,8 @@ static int getColumns(int ifd, int ofd) {
}

/* Clear the screen. Used to handle ctrl+l */
void linenoiseClearScreen(void) {
if (write(STDOUT_FILENO,"\x1b[H\x1b[2J",7) <= 0) {
void linenoiseClearScreen(struct linenoiseState *l) {
if (write(l->ofd,"\x1b[H\x1b[2J",7) <= 0) {
/* nothing to do, just to avoid warning. */
}
}
Expand Down Expand Up @@ -1076,7 +1076,7 @@ char *linenoiseEditFeed(struct linenoiseState *l) {
linenoiseEditMoveEnd(l);
break;
case CTRL_L: /* ctrl+l, clear screen */
linenoiseClearScreen();
linenoiseClearScreen(l);
refreshLine(l);
break;
case CTRL_W: /* ctrl+w, delete previous word */
Expand All @@ -1093,7 +1093,9 @@ char *linenoiseEditFeed(struct linenoiseState *l) {
void linenoiseEditStop(struct linenoiseState *l) {
if (!isatty(l->ifd)) return;
disableRawMode(l->ifd);
printf("\n");
if(write(l->ofd, "\n", 1) <= 0) {
/* nothing to do, just to avoid warning. */
}
}

/* This just implements a blocking loop for the multiplexed API.
Expand Down
2 changes: 1 addition & 1 deletion linenoise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int linenoiseHistorySave(const char *filename);
int linenoiseHistoryLoad(const char *filename);

/* Other utilities. */
void linenoiseClearScreen(void);
void linenoiseClearScreen(struct linenoiseState *l);
void linenoiseSetMultiLine(int ml);
void linenoisePrintKeyCodes(void);
void linenoiseMaskModeEnable(void);
Expand Down