mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-12-01 02:49:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace all sprintf() with snprintf()

Browse source
This commit is contained in:
Arun Prakash Jana 2018-03-09 02:32:22 +05:30
parent eddc0c93ba
commit 460984c154
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nnn.c
View file

@ -1763,11 +1763,11 @@ show_stats(char *fpath, char *fname, struct stat *sb)
/* Show containing device, inode, hardlink count */ /* Show containing device, inode, hardlink count */
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
sprintf(g_buf, "%xh/%ud", sb->st_dev, sb->st_dev); snprintf(g_buf, 32, "%xh/%ud", sb->st_dev, sb->st_dev);
dprintf(fd, "\n Device: %-15s Inode: %-11llu Links: %-9hu", dprintf(fd, "\n Device: %-15s Inode: %-11llu Links: %-9hu",
g_buf, (unsigned long long)sb->st_ino, sb->st_nlink); g_buf, (unsigned long long)sb->st_ino, sb->st_nlink);
#else #else
sprintf(g_buf, "%lxh/%lud", (ulong)sb->st_dev, (ulong)sb->st_dev); snprintf(g_buf, 32, "%lxh/%lud", (ulong)sb->st_dev, (ulong)sb->st_dev);
dprintf(fd, "\n Device: %-15s Inode: %-11lu Links: %-9lu", dprintf(fd, "\n Device: %-15s Inode: %-11lu Links: %-9lu",
g_buf, sb->st_ino, (ulong)sb->st_nlink); g_buf, sb->st_ino, (ulong)sb->st_nlink);
#endif #endif
@ -2329,11 +2329,12 @@ redraw(char *path)
/* We need to show filename as it may be truncated in directory listing */ /* We need to show filename as it may be truncated in directory listing */
if (!cfg.blkorder) if (!cfg.blkorder)
sprintf(buf, "%d/%d %s[%s%s]", cur + 1, ndents, sort, unescape(dents[cur].name, 0), get_file_sym(dents[cur].mode)); snprintf(buf, (NAME_MAX + 1) << 1, "%d/%d %s[%s%s]",
cur + 1, ndents, sort, unescape(dents[cur].name, 0), get_file_sym(dents[cur].mode));
else { else {
i = sprintf(buf, "%d/%d du: %s (%lu files) ", cur + 1, ndents, coolsize(dir_blocks << 9), num_files); i = snprintf(buf, 128, "%d/%d du: %s (%lu files) ", cur + 1, ndents, coolsize(dir_blocks << 9), num_files);
sprintf(buf + i, "vol: %s free [%s%s]", snprintf(buf + i, ((NAME_MAX + 1) << 1) - 128, "vol: %s free [%s%s]",
coolsize(get_fs_free(path)), unescape(dents[cur].name, 0), get_file_sym(dents[cur].mode)); coolsize(get_fs_free(path)), unescape(dents[cur].name, 0), get_file_sym(dents[cur].mode));
} }
printmsg(buf); printmsg(buf);
@ -2981,7 +2982,7 @@ nochange:
goto nochange;; goto nochange;;
} }
sprintf(newpath, "%d files copied", copyendid - copystartid + 1); snprintf(newpath, PATH_MAX, "%d files copied", copyendid - copystartid + 1);
printmsg(newpath); printmsg(newpath);
} }
} }