diff options
author | delphij <delphij@FreeBSD.org> | 2015-09-25 01:17:24 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-09-25 01:17:24 +0000 |
commit | abaf4cee122aa83567818185bfbf7245e344ba37 (patch) | |
tree | 94e5e854365ad4c326d6a32b5020449f5cbedf69 /usr.sbin/gstat/gstat.c | |
parent | a5313e9c06aa2e59378cb8508a90557065f9fa78 (diff) | |
download | FreeBSD-src-abaf4cee122aa83567818185bfbf7245e344ba37.zip FreeBSD-src-abaf4cee122aa83567818185bfbf7245e344ba37.tar.gz |
MFC r287650:
Use strlcpy() in favor of strncpy() as it's defined to have a nul character
at the end of string buffer, and the code context do expects this to behave
correctly (e.g. strchr).
Diffstat (limited to 'usr.sbin/gstat/gstat.c')
-rw-r--r-- | usr.sbin/gstat/gstat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c index d83ef79..8be3775 100644 --- a/usr.sbin/gstat/gstat.c +++ b/usr.sbin/gstat/gstat.c @@ -124,7 +124,7 @@ main(int argc, char **argv) if (regcomp(&f_re, optarg, REG_EXTENDED) != 0) errx(EX_USAGE, "Invalid filter - see re_format(7)"); - strncpy(f_s, optarg, sizeof(f_s)); + strlcpy(f_s, optarg, sizeof(f_s)); break; case 'o': flag_o = 1; @@ -216,7 +216,7 @@ main(int argc, char **argv) getyx(stdscr, cury, curx); getmaxyx(stdscr, maxy, maxx); } - strncpy(pf_s, f_s, sizeof(pf_s)); + strlcpy(pf_s, f_s, sizeof(pf_s)); max_flen = maxx - curx - 1; if ((int)strlen(f_s) > max_flen && max_flen >= 0) { if (max_flen > 3) @@ -406,7 +406,7 @@ main(int argc, char **argv) err(1, "el_gets"); if (line_len > 1) history(hist, &hist_ev, H_ENTER, line); - strncpy(tmp_f_s, line, sizeof(f_s)); + strlcpy(tmp_f_s, line, sizeof(f_s)); if ((p = strchr(tmp_f_s, '\n')) != NULL) *p = '\0'; /* @@ -423,7 +423,7 @@ main(int argc, char **argv) refresh(); sleep(1); } else { - strncpy(f_s, tmp_f_s, sizeof(f_s)); + strlcpy(f_s, tmp_f_s, sizeof(f_s)); f_re = tmp_f_re; } break; |