Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reordering startup commands and cleaning up piped in input.

Browse Source
This commit is contained in:
Bruce Hill 2019-10-02 13:52:44 -07:00
parent 905783d644
commit 2be2c575b2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bb.c
View File

@ -27,7 +27,6 @@ void bb_browse(bb_t *bb, const char *path)
bb->scroll = 0; bb->scroll = 0;
bb->cursor = 0; bb->cursor = 0;
run_script(bb, runstartup);
init_term(); init_term();
goto force_check_cmds; goto force_check_cmds;
@ -1333,12 +1332,15 @@ int main(int argc, char *argv[])
} }
} }
// Check whether anything was piped in to begin with,
// and if so, treat it as commands
struct pollfd pfd = {STDIN_FILENO, POLLIN, 0}; struct pollfd pfd = {STDIN_FILENO, POLLIN, 0};
if (poll(&pfd, 1, 0) == 1 && pfd.revents & POLLIN) { if (poll(&pfd, 1, 0) == 1 && pfd.revents & POLLIN) {
ssize_t len; ssize_t len;
char buf[1024]; char buf[1024];
while ((len = read(STDIN_FILENO, buf, sizeof(buf))) > 0) while ((len = read(STDIN_FILENO, buf, sizeof(buf))) > 0)
write(cmdfd, buf, (size_t)len); write(cmdfd, buf, (size_t)len);
write(cmdfd, "\0", 1);
} }
if (cmdfd != -1) { if (cmdfd != -1) {
@ -1373,6 +1375,8 @@ int main(int argc, char *argv[])
bb_t *bb = memcheck(calloc(1, sizeof(bb_t))); bb_t *bb = memcheck(calloc(1, sizeof(bb_t)));
bb->columns[0] = COL_NAME; bb->columns[0] = COL_NAME;
strcpy(bb->sort, "+n"); strcpy(bb->sort, "+n");
cd_to(bb, path);
run_script(bb, runstartup);
bb_browse(bb, path); bb_browse(bb, path);
if (bb->firstselected && print_selection) { if (bb->firstselected && print_selection) {