ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/user_stats.c

Comparing projects/libstatgrab/src/libstatgrab/user_stats.c (file contents):
Revision 1.19 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.20 by ats, Sun Apr 4 23:45:03 2004 UTC

#	Line 29 | Line 29
29		#include <stdio.h>
30		#include <string.h>
31		#include "statgrab.h"
32	+	#include "vector.h"
33		#ifdef ALLBSD
34		#include <sys/types.h>
35		#endif
#	Line 43 | Line 44
44		#include <sys/unistd.h>
45		#endif
46
46	–	#ifdef SOLARIS
47	–	#define MAX_LOGIN_NAME_SIZE 8
48	–	#endif
49	–	#if defined(LINUX) || defined(FREEBSD) || defined(DFBSD)
50	–	#define MAX_LOGIN_NAME_SIZE UT_NAMESIZE
51	–	#endif
52	–	#if defined(NETBSD) || defined(OPENBSD)
53	–	#define MAX_LOGIN_NAME_SIZE _POSIX_LOGIN_NAME_MAX
54	–	#endif
55	–	#if defined(CYGWIN)
56	–	#define MAX_LOGIN_NAME_SIZE _SC_LOGIN_NAME_MAX
57	–	#endif
58	–
59	–	#define START_VAL (5*(1+MAX_LOGIN_NAME_SIZE))
60	–
47		user_stat_t *get_user_stats(){
48	<	int num_users=0;
49	<
48	>	int num_users = 0, pos = 0, new_pos;
49	>	VECTOR_DECLARE_STATIC(name_list, char, 128, NULL, NULL);
50		static user_stat_t user_stats;
65	–	static int size_of_namelist=-1;
66	–	char *tmp;
51		#if defined(SOLARIS) || defined(LINUX) || defined(CYGWIN)
52		struct utmp *entry;
53		#endif
#	Line 72 | Line 56 | user_stat_t *get_user_stats(){
56		FILE *f;
57		#endif
58
75	–	/* First case call */
76	–	if (size_of_namelist==-1){
77	–	user_stats.name_list=malloc(START_VAL);
78	–	if(user_stats.name_list==NULL){
79	–	return NULL;
80	–	}
81	–	size_of_namelist=START_VAL;
82	–	}
83	–
84	–	/* Essentially blank the list, or give it a inital starting string */
85	–	strcpy(user_stats.name_list, "");
86	–
59		#if defined(SOLARIS) || defined(LINUX) || defined(CYGWIN)
60		setutent();
61		while((entry=getutent()) != NULL) {
62	<	if(entry->ut_type==USER_PROCESS) {
91	<	if((strlen(user_stats.name_list)+MAX_LOGIN_NAME_SIZE+2) > size_of_namelist){
92	<	tmp=user_stats.name_list;
93	<	user_stats.name_list=realloc(user_stats.name_list, 1+(size_of_namelist*2));
94	<	if(user_stats.name_list==NULL){
95	<	user_stats.name_list=tmp;
96	<	return NULL;
97	<	}
98	<	size_of_namelist=1+(size_of_namelist*2);
99	<	}
62	>	if (entry->ut_type != USER_PROCESS) continue;
63
64	<	strncat(user_stats.name_list, entry->ut_user, MAX_LOGIN_NAME_SIZE);
65	<	strcat(user_stats.name_list, " ");
66	<	num_users++;
64	>	new_pos = pos + strlen(entry->ut_user) + 1;
65	>	if (VECTOR_RESIZE(name_list, new_pos) < 0) {
66	>	return NULL;
67		}
68	+
69	+	strcpy(name_list + pos, entry->ut_user);
70	+	name_list[new_pos - 1] = ' ';
71	+	pos = new_pos;
72	+	num_users++;
73		}
74		endutent();
75		#endif
#	Line 111 | Line 79 | user_stat_t *get_user_stats(){
79		}
80		while((fread(&entry, sizeof(entry),1,f)) != 0){
81		if (entry.ut_name[0] == '\0') continue;
82	<	if((strlen(user_stats.name_list)+MAX_LOGIN_NAME_SIZE+2) > size_of_namelist){
83	<	tmp=user_stats.name_list;
84	<	user_stats.name_list=realloc(user_stats.name_list, 1+(size_of_namelist*2));
85	<	if(user_stats.name_list==NULL){
118	<	user_stats.name_list=tmp;
119	<	return NULL;
120	<	}
121	<	size_of_namelist=1+(size_of_namelist*2);
122	<
82	>
83	>	new_pos = pos + strlen(entry.ut_name) + 1;
84	>	if (VECTOR_RESIZE(name_list, new_pos) < 0) {
85	>	return NULL;
86		}
87	<	strncat(user_stats.name_list, entry.ut_name, MAX_LOGIN_NAME_SIZE);
88	<	strcat(user_stats.name_list, " ");
87	>
88	>	strcpy(name_list + pos, entry.ut_name);
89	>	name_list[new_pos - 1] = ' ';
90	>	pos = new_pos;
91		num_users++;
92		}
93		fclose(f);
94	+	#endif
95
96	<	#endif
97	<	/* We want to remove the last " " */
98	<	if(num_users!=0){
133	<	tmp=strrchr(user_stats.name_list, ' ');
134	<	if(tmp!=NULL){
135	<	*tmp='\0';
136	<	user_stats.num_entries=num_users;
137	<	}
96	>	/* Remove the extra space at the end, and append a \0. */
97	>	if (num_users != 0) {
98	>	pos--;
99		}
100	+	VECTOR_RESIZE(name_list, pos + 1);
101	+	name_list[pos] = '\0';
102
103	+	user_stats.num_entries = num_users;
104	+	user_stats.name_list = name_list;
105		return &user_stats;
141	–
106		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines