Replace use of dprintf() with fprintf() or write()

This improves compatibility with legacy platforms that don't provide the
function, in particular, Illumos.
This commit is contained in:
Sijmen J. Mulder 2024-07-16 19:56:58 +02:00 committed by Arun Prakash Jana
parent 9fc320d56e
commit 9b33c49f68
No known key found for this signature in database
GPG key ID: 4A865183AF6C5631

View file

@ -1423,7 +1423,7 @@ static int create_tmp_file(void)
static void msg(const char *message) static void msg(const char *message)
{ {
dprintf(STDERR_FILENO, "%s\n", message); fprintf(stderr, "%s\n", message);
} }
#ifdef KEY_RESIZE #ifdef KEY_RESIZE
@ -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); : cfgpath, O_CREAT | O_WRONLY | O_TRUNC, S_IWUSR | S_IRUSR);
if (fd != -1 && shell_escape(g_buf, sizeof(g_buf), curpath)) { 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); close(fd);
} }
} }
@ -8357,7 +8361,7 @@ static void check_key_collision(void)
key = bindings[i].sym; key = bindings[i].sym;
if (bitmap[key]) if (bitmap[key])
dprintf(STDERR_FILENO, "key collision! [%s]\n", keyname(key)); fprintf(stderr, "key collision! [%s]\n", keyname(key));
else else
bitmap[key] = TRUE; bitmap[key] = TRUE;
} }
@ -8365,7 +8369,7 @@ static void check_key_collision(void)
static void usage(void) static void usage(void)
{ {
dprintf(STDOUT_FILENO, fprintf(stdout,
"%s: nnn [OPTIONS] [PATH]\n\n" "%s: nnn [OPTIONS] [PATH]\n\n"
"The unorthodox terminal file manager.\n\n" "The unorthodox terminal file manager.\n\n"
"positional args:\n" "positional args:\n"
@ -8716,7 +8720,7 @@ int main(int argc, char *argv[])
g_state.uidgid = 1; g_state.uidgid = 1;
break; break;
case 'V': case 'V':
dprintf(STDOUT_FILENO, "%s\n", VERSION); fprintf(stdout, "%s\n", VERSION);
return EXIT_SUCCESS; return EXIT_SUCCESS;
case 'x': case 'x':
cfg.x11 = 1; cfg.x11 = 1;