Skip to content

Commit

Permalink
Replace use of dprintf() with fprintf() or write()
Browse files Browse the repository at this point in the history
This improves compatibility with legacy platforms that don't provide the
function, in particular, Illumos.
  • Loading branch information
sjmulder authored and jarun committed Aug 11, 2024
1 parent 9fc320d commit 9b33c49
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/nnn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ static int create_tmp_file(void)

static void msg(const char *message)
{
dprintf(STDERR_FILENO, "%s\n", message);
fprintf(stderr, "%s\n", message);
}

#ifdef KEY_RESIZE
Expand Down Expand Up @@ -2843,7 +2843,11 @@ static void write_lastdir(const char *curpath, const char *outfile)
: cfgpath, O_CREAT | O_WRONLY | O_TRUNC, S_IWUSR | S_IRUSR);

if (fd != -1 && shell_escape(g_buf, sizeof(g_buf), curpath)) {
dprintf(fd, "cd %s", g_buf);
if (write(fd, "cd ", 3) == 3) {
if (write(fd, g_buf, strlen(g_buf)) != (ssize_t)strlen(g_buf)) {
DPRINTF_S("write failed!");
}
}
close(fd);
}
}
Expand Down Expand Up @@ -8357,15 +8361,15 @@ static void check_key_collision(void)
key = bindings[i].sym;

if (bitmap[key])
dprintf(STDERR_FILENO, "key collision! [%s]\n", keyname(key));
fprintf(stderr, "key collision! [%s]\n", keyname(key));
else
bitmap[key] = TRUE;
}
}

static void usage(void)
{
dprintf(STDOUT_FILENO,
fprintf(stdout,
"%s: nnn [OPTIONS] [PATH]\n\n"
"The unorthodox terminal file manager.\n\n"
"positional args:\n"
Expand Down Expand Up @@ -8716,7 +8720,7 @@ int main(int argc, char *argv[])
g_state.uidgid = 1;
break;
case 'V':
dprintf(STDOUT_FILENO, "%s\n", VERSION);
fprintf(stdout, "%s\n", VERSION);
return EXIT_SUCCESS;
case 'x':
cfg.x11 = 1;
Expand Down

0 comments on commit 9b33c49

Please sign in to comment.