emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Please don't use if(asprintf(&t)<0) free(t); Use concat_subpath_file() for scan dir. Added losed chdir(".."). Removed warnings for 64-bit inode size. Why use memcpy and do not let? Very strange code for me

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2005-10-28 16:08:47 +00:00
parent ea97282af1
commit 7eb8e45348
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
procps/fuser.c
View File

@ -7,11 +7,6 @@
* GNU Library General Public License * GNU Library General Public License
*/ */
/* this define is needed for asprintf() */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -72,8 +67,8 @@ static int fuser_file_to_dev_inode(const char *filename,
{ {
struct stat f_stat; struct stat f_stat;
if((stat(filename, &f_stat)) < 0) return 0; if((stat(filename, &f_stat)) < 0) return 0;
memcpy(inode, &f_stat.st_ino, sizeof(ino_t)); *inode = f_stat.st_ino;
memcpy(dev, &f_stat.st_dev, sizeof(dev_t)); *dev = f_stat.st_dev;
return 1; return 1;
} }
@ -82,7 +77,7 @@ static int fuser_find_socket_dev(dev_t *dev) {
struct stat buf; struct stat buf;
if (fd >= 0 && (fstat(fd, &buf)) == 0) { if (fd >= 0 && (fstat(fd, &buf)) == 0) {
memcpy(dev, &buf.st_dev, sizeof(dev_t)); *dev = buf.st_dev;
close(fd); close(fd);
return 1; return 1;
} }
@ -92,16 +87,12 @@ static int fuser_find_socket_dev(dev_t *dev) {
static int fuser_parse_net_arg(const char *filename, static int fuser_parse_net_arg(const char *filename,
const char **proto, int *port) const char **proto, int *port)
{ {
int tport; char path[sizeof(FUSER_PROC_DIR)+12], tproto[5];
char path[PATH_MAX+1], tproto[5];
if((sscanf(filename, "%d/%4s", &tport, &tproto[0])) != 2) return 0; if((sscanf(filename, "%d/%4s", port, tproto)) != 2) return 0;
strncpy(path, FUSER_PROC_DIR, sizeof(FUSER_PROC_DIR)); sprintf(path, "%s/net/%s", FUSER_PROC_DIR, tproto);
strncat(path, "/net/", 5);
strncat(path, tproto, strlen(tproto));
if((access(path, R_OK)) != 0) return 0; if((access(path, R_OK)) != 0) return 0;
*proto = bb_xstrndup(tproto, strlen(tproto)); *proto = bb_xstrdup(tproto);
memcpy(port, &tport, sizeof(int));
return 1; return 1;
} }
@ -148,30 +139,29 @@ static int fuser_add_inode(inode_list *ilist, dev_t dev, ino_t inode)
static int fuser_scan_proc_net(int opts, const char *proto, static int fuser_scan_proc_net(int opts, const char *proto,
int port, inode_list *ilist) int port, inode_list *ilist)
{ {
char path[PATH_MAX+1], line[FUSER_MAX_LINE+1]; char path[sizeof(FUSER_PROC_DIR)+12], line[FUSER_MAX_LINE+1];
char addr[128]; char addr[128];
ino_t tmp_inode; ino_t tmp_inode;
dev_t tmp_dev; dev_t tmp_dev;
uint64_t uint64_inode;
int tmp_port; int tmp_port;
FILE *f; FILE *f;
if(!fuser_find_socket_dev(&tmp_dev)) tmp_dev = 0; if(!fuser_find_socket_dev(&tmp_dev)) tmp_dev = 0;
sprintf(path, "%s/net/%s", FUSER_PROC_DIR, proto);
strncpy(path, FUSER_PROC_DIR, sizeof(FUSER_PROC_DIR));
strncat(path, "/net/", 5);
strncat(path, proto, strlen(proto));
if (!(f = fopen(path, "r"))) return 0; if (!(f = fopen(path, "r"))) return 0;
while(fgets(line, FUSER_MAX_LINE, f)) { while(fgets(line, FUSER_MAX_LINE, f)) {
if(sscanf(line, if(sscanf(line,
"%*d: %64[0-9A-Fa-f]:%x %*x:%*x %*x %*x:%*x " "%*d: %64[0-9A-Fa-f]:%x %*x:%*x %*x %*x:%*x "
"%*x:%*x %*x %*d %*d %lu", "%*x:%*x %*x %*d %*d %llu",
&addr[0], &tmp_port, &tmp_inode) == 3) { addr, &tmp_port, &uint64_inode) == 3) {
if((strlen(addr) == 8) && if((strlen(addr) == 8) &&
(opts & FUSER_OPT_IP6)) continue; (opts & FUSER_OPT_IP6)) continue;
else if((strlen(addr) > 8) && else if((strlen(addr) > 8) &&
(opts & FUSER_OPT_IP4)) continue; (opts & FUSER_OPT_IP4)) continue;
if(tmp_port == port) { if(tmp_port == port) {
tmp_inode = uint64_inode;
fuser_add_inode(ilist, tmp_dev, tmp_inode); fuser_add_inode(ilist, tmp_dev, tmp_inode);
} }
} }
@ -204,12 +194,14 @@ static int fuser_scan_pid_maps(int opts, const char *fname, pid_t pid,
char line[FUSER_MAX_LINE + 1]; char line[FUSER_MAX_LINE + 1];
int major, minor; int major, minor;
ino_t inode; ino_t inode;
uint64_t uint64_inode;
dev_t dev; dev_t dev;
if (!(file = fopen(fname, "r"))) return 0; if (!(file = fopen(fname, "r"))) return 0;
while (fgets(line, FUSER_MAX_LINE, file)) { while (fgets(line, FUSER_MAX_LINE, file)) {
if(sscanf(line, "%*s %*s %*s %x:%x %ld", if(sscanf(line, "%*s %*s %*s %x:%x %llu",
&major, &minor, &inode) != 3) continue; &major, &minor, &uint64_inode) != 3) continue;
inode = uint64_inode;
if(major == 0 && minor == 0 && inode == 0) continue; if(major == 0 && minor == 0 && inode == 0) continue;
dev = makedev(major, minor); dev = makedev(major, minor);
if(fuser_search_dev_inode(opts, ilist, dev, inode)) { if(fuser_search_dev_inode(opts, ilist, dev, inode)) {
@ -242,12 +234,9 @@ static int fuser_scan_dir_links(int opts, const char *dname, pid_t pid,
if((d = opendir(dname))) { if((d = opendir(dname))) {
while((de = readdir(d)) != NULL) { while((de = readdir(d)) != NULL) {
if(!(strcmp(de->d_name, "."))) continue; lname = concat_subpath_file(dname, de->d_name);
if(!(strcmp(de->d_name, ".."))) continue; if(lname == NULL)
if(asprintf(&lname, "%s/%s", dname, de->d_name) < 0) {
free(lname);
continue; continue;
}
fuser_scan_link(opts, lname, pid, ilist, plist); fuser_scan_link(opts, lname, pid, ilist, plist);
free(lname); free(lname);
} }
@ -269,10 +258,7 @@ static int fuser_scan_proc_pids(int opts, inode_list *ilist, pid_list *plist)
while((de = readdir(d)) != NULL) { while((de = readdir(d)) != NULL) {
pid = (pid_t)atoi(de->d_name); pid = (pid_t)atoi(de->d_name);
if(!pid) continue; if(!pid) continue;
if(asprintf(&dname, "%s/%d/", FUSER_PROC_DIR, pid) < 0) { dname = concat_subpath_file(FUSER_PROC_DIR, de->d_name);
free(dname);
continue;
}
if(chdir(dname) < 0) { if(chdir(dname) < 0) {
free(dname); free(dname);
continue; continue;
@ -285,6 +271,7 @@ static int fuser_scan_proc_pids(int opts, inode_list *ilist, pid_list *plist)
fuser_scan_dir_links(opts, "lib", pid, ilist, plist); fuser_scan_dir_links(opts, "lib", pid, ilist, plist);
fuser_scan_dir_links(opts, "mmap", pid, ilist, plist); fuser_scan_dir_links(opts, "mmap", pid, ilist, plist);
fuser_scan_pid_maps(opts, "maps", pid, ilist, plist); fuser_scan_pid_maps(opts, "maps", pid, ilist, plist);
chdir("..");
} }
closedir(d); closedir(d);
return 1; return 1;