diff options
author | George Burgess IV <gbiv@google.com> | 2016-03-02 14:02:55 -0800 |
---|---|---|
committer | George Burgess IV <gbiv@google.com> | 2016-03-07 18:40:40 -0800 |
commit | e7aa2b2c8378b458345477d1f6d9904490263bb6 (patch) | |
tree | 125b6116858579422945357b40930b5738a94eab /toolbox | |
parent | d1ec9c450d8dc9d24b5f0254111449ecfcbeaea6 (diff) | |
download | system_core-e7aa2b2c8378b458345477d1f6d9904490263bb6.tar.gz system_core-e7aa2b2c8378b458345477d1f6d9904490263bb6.tar.bz2 system_core-e7aa2b2c8378b458345477d1f6d9904490263bb6.zip |
Cleanup uses of sprintf so we can deprecate it.
Also cleans up two instances of open() with useless mode params, and
changes a few uses of snprintf to use sizeof(buffer) instead of
hardcoded buffer sizes.
Change-Id: If11591003d910c995e72ad8f75afd072c255a3c5
Diffstat (limited to 'toolbox')
-rw-r--r-- | toolbox/newfs_msdos.c | 2 | ||||
-rw-r--r-- | toolbox/ps.c | 14 | ||||
-rw-r--r-- | toolbox/top.c | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/toolbox/newfs_msdos.c b/toolbox/newfs_msdos.c index 5b98a019a..27ea9e898 100644 --- a/toolbox/newfs_msdos.c +++ b/toolbox/newfs_msdos.c @@ -695,7 +695,7 @@ int newfs_msdos_main(int argc, char *argv[]) (u_int)tm->tm_min)); mk4(bsx->volid, x); mklabel(bsx->label, opt_L ? opt_L : "NO NAME"); - sprintf(buf, "FAT%u", fat); + snprintf(buf, sizeof(buf), "FAT%u", fat); setstr(bsx->type, buf, sizeof(bsx->type)); if (!opt_B) { x1 += sizeof(struct bsx); diff --git a/toolbox/ps.c b/toolbox/ps.c index 7e70c71c0..d366f3ecf 100644 --- a/toolbox/ps.c +++ b/toolbox/ps.c @@ -57,16 +57,16 @@ static int ps_line(int pid, int tid) int prio, nice, rtprio, sched, psr; struct passwd *pw; - sprintf(statline, "/proc/%d", tid ? tid : pid); + snprintf(statline, sizeof(statline), "/proc/%d", tid ? tid : pid); stat(statline, &stats); if(tid) { - sprintf(statline, "/proc/%d/task/%d/stat", pid, tid); + snprintf(statline, sizeof(statline), "/proc/%d/task/%d/stat", pid, tid); cmdline[0] = 0; snprintf(macline, sizeof(macline), "/proc/%d/task/%d/attr/current", pid, tid); } else { - sprintf(statline, "/proc/%d/stat", pid); - sprintf(cmdline, "/proc/%d/cmdline", pid); + snprintf(statline, sizeof(statline), "/proc/%d/stat", pid); + snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", pid); snprintf(macline, sizeof(macline), "/proc/%d/attr/current", pid); int fd = open(cmdline, O_RDONLY); if(fd == 0) { @@ -149,7 +149,7 @@ static int ps_line(int pid, int tid) pw = getpwuid(stats.st_uid); if(pw == 0 || (display_flags & SHOW_NUMERIC_UID)) { - sprintf(user,"%d",(int)stats.st_uid); + snprintf(user,sizeof(user),"%d",(int)stats.st_uid); } else { strcpy(user,pw->pw_name); } @@ -208,7 +208,7 @@ static void print_exe_abi(int pid) int fd, r; char exeline[1024]; - sprintf(exeline, "/proc/%d/exe", pid); + snprintf(exeline, sizeof(exeline), "/proc/%d/exe", pid); fd = open(exeline, O_RDONLY); if(fd == 0) { printf(" "); @@ -243,7 +243,7 @@ void ps_threads(int pid) DIR *d; struct dirent *de; - sprintf(tmp,"/proc/%d/task",pid); + snprintf(tmp,sizeof(tmp),"/proc/%d/task",pid); d = opendir(tmp); if(d == 0) return; diff --git a/toolbox/top.c b/toolbox/top.c index 6fda13232..003f4c93d 100644 --- a/toolbox/top.c +++ b/toolbox/top.c @@ -258,29 +258,29 @@ static void read_procs(void) { proc->pid = proc->tid = pid; - sprintf(filename, "/proc/%d/stat", pid); + snprintf(filename, sizeof(filename), "/proc/%d/stat", pid); read_stat(filename, proc); - sprintf(filename, "/proc/%d/cmdline", pid); + snprintf(filename, sizeof(filename), "/proc/%d/cmdline", pid); read_cmdline(filename, proc); - sprintf(filename, "/proc/%d/status", pid); + snprintf(filename, sizeof(filename), "/proc/%d/status", pid); read_status(filename, proc); read_policy(pid, proc); proc->num_threads = 0; } else { - sprintf(filename, "/proc/%d/cmdline", pid); + snprintf(filename, sizeof(filename), "/proc/%d/cmdline", pid); read_cmdline(filename, &cur_proc); - sprintf(filename, "/proc/%d/status", pid); + snprintf(filename, sizeof(filename), "/proc/%d/status", pid); read_status(filename, &cur_proc); proc = NULL; } - sprintf(filename, "/proc/%d/task", pid); + snprintf(filename, sizeof(filename), "/proc/%d/task", pid); task_dir = opendir(filename); if (!task_dir) continue; @@ -295,7 +295,7 @@ static void read_procs(void) { proc->pid = pid; proc->tid = tid; - sprintf(filename, "/proc/%d/task/%d/stat", pid, tid); + snprintf(filename, sizeof(filename), "/proc/%d/task/%d/stat", pid, tid); read_stat(filename, proc); read_policy(tid, proc); @@ -484,7 +484,7 @@ static void print_procs(void) { if (user && user->pw_name) { user_str = user->pw_name; } else { - snprintf(user_buf, 20, "%d", proc->uid); + snprintf(user_buf, sizeof(user_buf), "%d", proc->uid); user_str = user_buf; } if (!threads) { |