mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of file stream functions

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-15 20:52:59 +05:30
parent 0884ad4af9
commit 3db1dfd17f
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 33 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/nnn.c
View file

@ -4071,28 +4071,22 @@ static void set_smart_ctx(int ctx, char *nextpath, char **path, char **lastname,
* Gets only a single line (that's what we need for now) or shows full command output in pager. * Gets only a single line (that's what we need for now) or shows full command output in pager.
* Uses g_buf internally. * Uses g_buf internally.
*/ */
static bool get_output(char *file, char *arg1, char *arg2, FILE *fout, bool multi, bool page) static bool get_output(char *file, char *arg1, char *arg2, int fdout, bool multi, bool page)
{ {
pid_t pid; pid_t pid;
int pipefd[2]; int pipefd[2];
FILE *fin;
int index = 0, flags; int index = 0, flags;
bool ret = FALSE; bool ret = FALSE;
bool tmpfile = (!fout && page); bool tmpfile = ((fdout == -1) && page);
char *argv[EXEC_ARGS_MAX] = {0}; char *argv[EXEC_ARGS_MAX] = {0};
char *cmd = NULL; char *cmd = NULL;
int fd = -1; int fd = -1;
ssize_t len;
if (tmpfile) { if (tmpfile) {
fd = create_tmp_file(); fdout = create_tmp_file();
if (fd == -1) if (fdout == -1)
return FALSE; return FALSE;
fout = fdopen(fd, "w");
if (!fout) {
close(fd);
return FALSE;
}
} }
if (multi) { if (multi) {
@ -4137,15 +4131,12 @@ static bool get_output(char *file, char *arg1, char *arg2, FILE *fout, bool mult
close(pipefd[1]); close(pipefd[1]);
free(cmd); free(cmd);
fin = fdopen(pipefd[0], "r"); while ((len = read(pipefd[0], g_buf, CMD_LEN_MAX - 1)) > 0) {
if (fin) {
while (fgets(g_buf, CMD_LEN_MAX - 1, fin)) {
ret = TRUE; ret = TRUE;
if (!fout) /* Read only the first line of output to buffer */ if (fdout == -1) /* Read only the first line of output to buffer */
break;
if (write(fdout, g_buf, len) != len)
break; break;
fprintf(fout, "%s", g_buf);
}
fclose(fin);
} }
close(pipefd[0]); close(pipefd[0]);
@ -4153,7 +4144,7 @@ static bool get_output(char *file, char *arg1, char *arg2, FILE *fout, bool mult
return ret; return ret;
if (tmpfile) { if (tmpfile) {
fclose(fout); close(fdout);
close(fd); close(fd);
} }
@ -4183,16 +4174,9 @@ static bool show_stats(char *fpath)
if (fd == -1) if (fd == -1)
return FALSE; return FALSE;
FILE *fp = fdopen(fd, "w");
if (!fp) {
close(fd);
return FALSE;
}
while (r) while (r)
get_output(cmds[--r], fpath, NULL, fp, TRUE, FALSE); get_output(cmds[--r], fpath, NULL, fd, TRUE, FALSE);
fclose(fp);
close(fd); close(fd);
spawn(pager, g_tmpfpath, NULL, NULL, F_CLI | F_FORCE_TTY); spawn(pager, g_tmpfpath, NULL, NULL, F_CLI | F_FORCE_TTY);
@ -4328,7 +4312,7 @@ static bool handle_archive(char *fpath /* in-out param */, char op)
if (op == 'x') /* extract */ if (op == 'x') /* extract */
spawn(util, arg, fpath, NULL, F_NORMAL | F_MULTI); spawn(util, arg, fpath, NULL, F_NORMAL | F_MULTI);
else /* list */ else /* list */
get_output(util, arg, fpath, NULL, TRUE, TRUE); get_output(util, arg, fpath, -1, TRUE, TRUE);
if (x_to) { if (x_to) {
if (chdir(xdirname(fpath)) == -1) { if (chdir(xdirname(fpath)) == -1) {
@ -4587,12 +4571,12 @@ static void lock_terminal(void)
spawn(xgetenv("NNN_LOCKER", utils[UTIL_LOCKER]), NULL, NULL, NULL, F_CLI); spawn(xgetenv("NNN_LOCKER", utils[UTIL_LOCKER]), NULL, NULL, NULL, F_CLI);
} }
static void printkv(kv *kvarr, FILE *fp, uchar_t max, uchar_t id) static void printkv(kv *kvarr, int fd, uchar_t max, uchar_t id)
{ {
char *val = (id == NNN_BMS) ? bmstr : pluginstr; char *val = (id == NNN_BMS) ? bmstr : pluginstr;
for (uchar_t i = 0; i < max && kvarr[i].key; ++i) for (uchar_t i = 0; i < max && kvarr[i].key; ++i)
fprintf(fp, " %c: %s\n", (char)kvarr[i].key, val + kvarr[i].off); dprintf(fd, " %c: %s\n", (char)kvarr[i].key, val + kvarr[i].off);
} }
static void printkeys(kv *kvarr, char *buf, uchar_t max) static void printkeys(kv *kvarr, char *buf, uchar_t max)
@ -4644,8 +4628,6 @@ static size_t handle_bookmark(const char *bmark, char *newpath)
*/ */
static void show_help(const char *path) static void show_help(const char *path)
{ {
int fd;
FILE *fp;
const char *start, *end; const char *start, *end;
const char helpstr[] = { const char helpstr[] = {
"0\n" "0\n"
@ -4685,59 +4667,51 @@ static void show_help(const char *path)
"cT Set time type%-11c0 Lock\n" "cT Set time type%-11c0 Lock\n"
}; };
fd = create_tmp_file(); int fd = create_tmp_file();
if (fd == -1) if (fd == -1)
return; return;
fp = fdopen(fd, "w");
if (!fp) {
close(fd);
return;
}
char *prog = xgetenv(env_cfg[NNN_HELP], NULL); char *prog = xgetenv(env_cfg[NNN_HELP], NULL);
if (prog) if (prog)
get_output(prog, NULL, NULL, fp, TRUE, FALSE); get_output(prog, NULL, NULL, fd, TRUE, FALSE);
start = end = helpstr; start = end = helpstr;
while (*end) { while (*end) {
if (*end == '\n') { if (*end == '\n') {
snprintf(g_buf, CMD_LEN_MAX, "%*c%.*s", snprintf(g_buf, CMD_LEN_MAX, "%*c%.*s",
xchartohex(*start), ' ', (int)(end - start), start + 1); xchartohex(*start), ' ', (int)(end - start), start + 1);
fprintf(fp, g_buf, ' '); dprintf(fd, g_buf, ' ');
start = end + 1; start = end + 1;
} }
++end; ++end;
} }
fprintf(fp, "\nVOLUME: %s of ", coolsize(get_fs_info(path, FREE))); dprintf(fd, "\nVOLUME: %s of ", coolsize(get_fs_info(path, FREE)));
fprintf(fp, "%s free\n\n", coolsize(get_fs_info(path, CAPACITY))); dprintf(fd, "%s free\n\n", coolsize(get_fs_info(path, CAPACITY)));
if (bookmark) { if (bookmark) {
fprintf(fp, "BOOKMARKS\n"); dprintf(fd, "BOOKMARKS\n");
printkv(bookmark, fp, maxbm, NNN_BMS); printkv(bookmark, fd, maxbm, NNN_BMS);
fprintf(fp, "\n"); dprintf(fd, "\n");
} }
if (plug) { if (plug) {
fprintf(fp, "PLUGIN KEYS\n"); dprintf(fd, "PLUGIN KEYS\n");
printkv(plug, fp, maxplug, NNN_PLUG); printkv(plug, fd, maxplug, NNN_PLUG);
fprintf(fp, "\n"); dprintf(fd, "\n");
} }
for (uchar_t i = NNN_OPENER; i <= NNN_TRASH; ++i) { for (uchar_t i = NNN_OPENER; i <= NNN_TRASH; ++i) {
start = getenv(env_cfg[i]); start = getenv(env_cfg[i]);
if (start) if (start)
fprintf(fp, "%s: %s\n", env_cfg[i], start); dprintf(fd, "%s: %s\n", env_cfg[i], start);
} }
if (selpath) if (selpath)
fprintf(fp, "SELECTION FILE: %s\n", selpath); dprintf(fd, "SELECTION FILE: %s\n", selpath);
fprintf(fp, "\nv%s\n%s\n", VERSION, GENERAL_INFO); dprintf(fd, "\nv%s\n%s\n", VERSION, GENERAL_INFO);
fclose(fp);
close(fd); close(fd);
spawn(pager, g_tmpfpath, NULL, NULL, F_CLI | F_FORCE_TTY); spawn(pager, g_tmpfpath, NULL, NULL, F_CLI | F_FORCE_TTY);
@ -4763,7 +4737,7 @@ static bool run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
runfile = NULL; runfile = NULL;
if (flags & F_PAGE) if (flags & F_PAGE)
get_output(g_buf, runfile, NULL, NULL, TRUE, TRUE); get_output(g_buf, runfile, NULL, -1, TRUE, TRUE);
else else
spawn(g_buf, runfile, NULL, NULL, flags); spawn(g_buf, runfile, NULL, NULL, flags);
@ -6508,11 +6482,11 @@ nochange:
if (cfg.useeditor if (cfg.useeditor
#ifdef FILE_MIME_OPTS #ifdef FILE_MIME_OPTS
&& get_output("file", FILE_MIME_OPTS, newpath, NULL, FALSE, FALSE) && get_output("file", FILE_MIME_OPTS, newpath, -1, FALSE, FALSE)
&& is_prefix(g_buf, "text/", 5) && is_prefix(g_buf, "text/", 5)
#else #else
/* no MIME option; guess from description instead */ /* no MIME option; guess from description instead */
&& get_output("file", "-bL", newpath, NULL, FALSE, FALSE) && get_output("file", "-bL", newpath, -1, FALSE, FALSE)
&& strstr(g_buf, "text") && strstr(g_buf, "text")
#endif #endif
) { ) {