X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fprocps.c;h=eba90705cc8b7bfbb4448caed79273f28f2f4ba1;hb=966ec7c067d7a2df5232a69c8d3d2e777347a62d;hp=fcc9c2d3a907e7de50299c50bcb205e74fd37203;hpb=deca106b6dad70ad0a1312a82d762aa8d8ad52ba;p=oweals%2Fbusybox.git

diff --git a/libbb/procps.c b/libbb/procps.c
index fcc9c2d3a..eba90705c 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -4,19 +4,32 @@
  *
  * Copyright 1998 by Albert Cahalan; all rights reserved.
  * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru>
- * GNU Library General Public License Version 2, or any later version
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <dirent.h>
 #include <string.h>
 #include <stdlib.h>
+#include <sys/param.h>
 #include <unistd.h>
-#include <asm/page.h>
+#include <fcntl.h>
 
 #include "libbb.h"
 
-extern procps_status_t * procps_scan(int save_user_arg0)
+
+#define PROCPS_BUFSIZE 1024
+
+static int read_to_buf(const char *filename, void *buf)
+{
+	ssize_t ret;
+	ret = open_read_close(filename, buf, PROCPS_BUFSIZE-1);
+	((char *)buf)[ret > 0 ? ret : 0] = '\0';
+	return ret;
+}
+
+
+procps_status_t * procps_scan(int save_user_arg0)
 {
 	static DIR *dir;
 	struct dirent *entry;
@@ -24,20 +37,19 @@ extern procps_status_t * procps_scan(int save_user_arg0)
 	char *name;
 	int n;
 	char status[32];
-	char buf[1024];
-	FILE *fp;
+	char *status_tail;
+	char buf[PROCPS_BUFSIZE];
 	procps_status_t curstatus;
 	int pid;
 	long tasknice;
 	struct stat sb;
 
 	if (!dir) {
-		dir = opendir("/proc");
-		if(!dir)
-			error_msg_and_die("Can't open /proc");
+		dir = xopendir("/proc");
 	}
-	for(;;) {
-		if((entry = readdir(dir)) == NULL) {
+	for (;;) {
+		entry = readdir(dir);
+		if (entry == NULL) {
 			closedir(dir);
 			dir = 0;
 			return 0;
@@ -50,18 +62,18 @@ extern procps_status_t * procps_scan(int save_user_arg0)
 		pid = atoi(name);
 		curstatus.pid = pid;
 
-		sprintf(status, "/proc/%d/stat", pid);
-		if((fp = fopen(status, "r")) == NULL)
+		status_tail = status + sprintf(status, "/proc/%d", pid);
+		if (stat(status, &sb))
 			continue;
-		if(fstat(fileno(fp), &sb))
-			continue;
-		my_getpwuid(curstatus.user, sb.st_uid);
-		name = fgets(buf, sizeof(buf), fp);
-		fclose(fp);
-		if(name == NULL)
+		bb_getpwuid(curstatus.user, sb.st_uid, sizeof(curstatus.user));
+
+		/* see proc(5) for some details on this */
+		strcpy(status_tail, "/stat");
+		n = read_to_buf(status, buf);
+		if (n < 0)
 			continue;
 		name = strrchr(buf, ')'); /* split into "PID (cmd" and "<rest>" */
-		if(name == 0 || name[1] != ' ')
+		if (name == 0 || name[1] != ' ')
 			continue;
 		*name = 0;
 		sscanf(buf, "%*s (%15c", curstatus.short_cmd);
@@ -69,26 +81,26 @@ extern procps_status_t * procps_scan(int save_user_arg0)
 		"%c %d "
 		"%*s %*s %*s %*s "     /* pgrp, session, tty, tpgid */
 		"%*s %*s %*s %*s %*s " /* flags, min_flt, cmin_flt, maj_flt, cmaj_flt */
-#ifdef FEATURE_CPU_USAGE_PERCENTAGE
-		"%lu %lu "
+#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+		"%lu %lu "             /* utime, stime */
 #else
-		"%*s %*s "
+		"%*s %*s "             /* utime, stime */
 #endif
 		"%*s %*s %*s "         /* cutime, cstime, priority */
-		"%ld "
+		"%ld "                 /* nice */
 		"%*s %*s %*s "         /* timeout, it_real_value, start_time */
 		"%*s "                 /* vsize */
-		"%ld",
+		"%ld",                 /* rss */
 		curstatus.state, &curstatus.ppid,
-#ifdef FEATURE_CPU_USAGE_PERCENTAGE
+#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 		&curstatus.utime, &curstatus.stime,
 #endif
 		&tasknice,
 		&curstatus.rss);
-#ifdef FEATURE_CPU_USAGE_PERCENTAGE
-		if(n != 6)
+#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+		if (n != 6)
 #else
-		if(n != 4)
+		if (n != 4)
 #endif
 			continue;
 
@@ -103,38 +115,31 @@ extern procps_status_t * procps_scan(int save_user_arg0)
 		else
 			curstatus.state[2] = ' ';
 
+#ifdef PAGE_SHIFT
 		curstatus.rss <<= (PAGE_SHIFT - 10);     /* 2**10 = 1kb */
+#else
+		curstatus.rss *= (getpagesize() >> 10);     /* 2**10 = 1kb */
+#endif
 
-		sprintf(status, "/proc/%d/cmdline", pid);
-		if(save_user_arg0) {
-			if((fp = fopen(status, "r")) == NULL)
-				continue;
-			if((n=fread(buf, 1, sizeof(buf)-1, fp)) > 0) {
-				if(buf[n-1]=='\n')
+		if (save_user_arg0) {
+			strcpy(status_tail, "/cmdline");
+			n = read_to_buf(status, buf);
+			if (n > 0) {
+				if (buf[n-1]=='\n')
 					buf[--n] = 0;
 				name = buf;
-				while(n) {
-					if(((unsigned char)*name) < ' ')
+				while (n) {
+					if (((unsigned char)*name) < ' ')
 						*name = ' ';
 					name++;
 					n--;
 				}
 				*name = 0;
-				if(buf[0])
+				if (buf[0])
 					curstatus.cmd = strdup(buf);
 				/* if NULL it work true also */
 			}
-			fclose(fp);
 		}
 		return memcpy(&ret_status, &curstatus, sizeof(procps_status_t));
 	}
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/