ViewVC Help

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

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

Comparing projects/libstatgrab/src/libstatgrab/tools.c (file contents):
Revision 1.15 by tdb, Wed Nov 19 21:56:21 2003 UTC vs.
Revision 1.26 by pajs, Tue Feb 10 16:16:22 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 25 | Line 28
28		#include <stdio.h>
29		#include <string.h>
30		#include <stdlib.h>
31	+	#include <unistd.h>
32		#include <sys/types.h>
33		#include <regex.h>
34		#ifdef ALLBSD
#	Line 50 | Line 54
54		#include <dirent.h>
55		#endif
56
57	<	#ifdef SOLARIS
57	>	#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
58		struct map{
59		char *bsd;
60		char *svr;
#	Line 60 | Line 64 | struct map{
64		typedef struct map mapping_t;
65
66		static mapping_t *mapping = NULL;
67	+	#endif
68
69	+	#ifdef SOLARIS
70		char *get_svr_from_bsd(char *bsd){
71	+	#ifdef HAVE_LIBDEVINFO_H
72		mapping_t *map_ptr;
73		for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next)
74		if(!strcmp(map_ptr->bsd, bsd)) return map_ptr->svr;
75	<
75	>	#endif
76		return bsd;
77		}
78	+	#endif
79
80	+	#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
81		void add_mapping(char *bsd, char *svr){
82		mapping_t *map_ptr;
83		mapping_t *map_end_ptr;
#	Line 77 | Line 86 | void add_mapping(char *bsd, char *svr){
86		svr = strdup(svr);
87
88		if (mapping == NULL){
80	–	printf("New malloc\n");
89		mapping = malloc(sizeof(mapping_t));
90		if (mapping == NULL) return;
91		map_ptr = mapping;
#	Line 85 | Line 93 | void add_mapping(char *bsd, char *svr){
93		/* See if its already been added */
94		for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next){
95		if( (!strcmp(map_ptr->bsd, bsd)) || (!strcmp(map_ptr->svr, svr)) ){
88	–	printf("%s matches %s\n", map_ptr->bsd, bsd);
96		return;
97		}
98		map_end_ptr = map_ptr;
#	Line 95 | Line 102 | void add_mapping(char *bsd, char *svr){
102		* new mapping_t
103		*/
104		map_end_ptr->next = malloc(sizeof(mapping_t));
98	–	printf("Second malloc\n");
105		if (map_end_ptr->next == NULL) return;
106		map_ptr = map_end_ptr->next;
107		}
108
103	–	printf("Adding %s\n", bsd);
109		map_ptr->next = NULL;
110		map_ptr->bsd = bsd;
111		map_ptr->svr = svr;
#	Line 144 | Line 149 | char *read_dir(char *disk_path){
149		return svr_name;
150		}
151		}
147	–	closedir(dirp);
152		}
153	+	closedir(dirp);
154		return NULL;
155		}
156
#	Line 162 | Line 167 | int get_alias(char *alias){
167		char *value;
168		int instance;
169		if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) {
170	<	fprintf(stderr, "di_init() failed\n");
166	<	exit(1);
170	>	return 1;
171		}
172		node = di_drv_first_node(alias, root_node);
173		while (node != DI_NODE_NIL) {
#	Line 173 | Line 177 | int get_alias(char *alias){
177		minor_name = di_minor_name(minor);
178		strcpy(tmpnode, alias);
179		sprintf(tmpnode, "%s%d", tmpnode, instance);
180	<	strcpy(file, "/devices");
181	<	strcat(file, phys_path);
182	<	strcat(file, ":");
183	<	strcat(file, minor_name);
180	>	strlcpy(file, "/devices", sizeof file);
181	>	strlcat(file, phys_path, sizeof file);
182	>	strlcat(file, ":", sizeof file);
183	>	strlcat(file, minor_name, sizeof file);
184		value = read_dir(file);
185		if (value != NULL){
186		add_mapping(tmpnode, value);
#	Line 188 | Line 192 | int get_alias(char *alias){
192		}
193		}
194		di_fini(root_node);
195	<	return (-1);
195	>	return 0;
196		}
197
198	<	void build_mapping(){
199	<	char device_name[512];
198	>
199	>	#define BIG_ENOUGH 512
200	>	int build_mapping(){
201	>	char device_name[BIG_ENOUGH];
202		int x;
203		kstat_ctl_t *kc;
204		kstat_t *ksp;
205		kstat_io_t kios;
206
207	+	char driver_list[BIG_ENOUGH][BIG_ENOUGH];
208	+	int list_entries = 0;
209	+	int found;
210	+
211		if ((kc = kstat_open()) == NULL) {
212	<	return NULL;
212	>	return;
213		}
214
215		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
#	Line 214 | Line 224 | void build_mapping(){
224		}
225		if(x == sizeof device_name) x--;
226		device_name[x] = '\0';
227	<	get_alias(device_name);
227	>
228	>	/* Check if we've not already looked it up */
229	>	found = 0;
230	>	for(x=0;x<list_entries;x++){
231	>	if (x>=BIG_ENOUGH){
232	>	/* We've got bigger than we thought was massive */
233	>	/* If we hit this.. Make big enough bigger */
234	>	return 1;
235	>	}
236	>	if( !strncmp(driver_list[x], device_name, BIG_ENOUGH)){
237	>	found = 1;
238	>	break;
239	>	}
240	>	}
241	>
242	>	if(!found){
243	>	if((get_alias(device_name)) != 0){
244	>	return 1;
245	>	}
246	>	strncpy(driver_list[x], device_name, BIG_ENOUGH);
247	>	list_entries++;
248	>	}
249		}
250		}
251
252	<	return;
252	>	return 0;
253		}
254
255		#endif
#	Line 270 | Line 301 | static long long atoll(const char *s) {
301		}
302		#endif
303
304	+	#ifndef HAVE_STRLCPY
305	+	/*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
306	+
307	+	/*
308	+	* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
309	+	*
310	+	* Permission to use, copy, modify, and distribute this software for any
311	+	* purpose with or without fee is hereby granted, provided that the above
312	+	* copyright notice and this permission notice appear in all copies.
313	+	*
314	+	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
315	+	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
316	+	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
317	+	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
318	+	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
319	+	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
320	+	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
321	+	*/
322	+
323	+	/*
324	+	* Copy src to string dst of size siz.  At most siz-1 characters
325	+	* will be copied.  Always NUL terminates (unless siz == 0).
326	+	* Returns strlen(src); if retval >= siz, truncation occurred.
327	+	*/
328	+	size_t strlcpy(char *dst, const char *src, size_t siz){
329	+	register char *d = dst;
330	+	register const char *s = src;
331	+	register size_t n = siz;
332	+
333	+	/* Copy as many bytes as will fit */
334	+	if (n != 0 && --n != 0) {
335	+	do {
336	+	if ((*d++ = *s++) == 0)
337	+	break;
338	+	} while (--n != 0);
339	+	}
340	+
341	+	/* Not enough room in dst, add NUL and traverse rest of src */
342	+	if (n == 0) {
343	+	if (siz != 0)
344	+	*d = '\0';              /* NUL-terminate dst */
345	+	while (*s++)
346	+	;
347	+	}
348	+
349	+	return(s - src - 1);    /* count does not include NUL */
350	+	}
351	+	#endif
352	+
353	+	#ifndef HAVE_STRLCAT
354	+	/*      $OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $    */
355	+
356	+	/*
357	+	* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
358	+	*
359	+	* Permission to use, copy, modify, and distribute this software for any
360	+	* purpose with or without fee is hereby granted, provided that the above
361	+	* copyright notice and this permission notice appear in all copies.
362	+	*
363	+	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
364	+	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
365	+	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
366	+	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
367	+	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
368	+	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
369	+	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
370	+	*/
371	+
372	+	/*
373	+	* Appends src to string dst of size siz (unlike strncat, siz is the
374	+	* full size of dst, not space left).  At most siz-1 characters
375	+	* will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
376	+	* Returns strlen(src) + MIN(siz, strlen(initial dst)).
377	+	* If retval >= siz, truncation occurred.
378	+	*/
379	+	size_t strlcat(char *dst, const char *src, size_t siz){
380	+	register char *d = dst;
381	+	register const char *s = src;
382	+	register size_t n = siz;
383	+	size_t dlen;
384	+
385	+	/* Find the end of dst and adjust bytes left but don't go past end */
386	+	while (n-- != 0 && *d != '\0')
387	+	d++;
388	+	dlen = d - dst;
389	+	n = siz - dlen;
390	+
391	+	if (n == 0)
392	+	return(dlen + strlen(s));
393	+	while (*s != '\0') {
394	+	if (n != 1) {
395	+	*d++ = *s;
396	+	n--;
397	+	}
398	+	s++;
399	+	}
400	+	*d = '\0';
401	+
402	+	return(dlen + (s - src));       /* count does not include NUL */
403	+	}
404	+
405	+	#endif
406	+
407		long long get_ll_match(char *line, regmatch_t *match){
408		char *ptr;
409		long long num;
#	Line 336 | Line 470 | int statgrab_init(){
470		}
471		#endif
472		#ifdef SOLARIS
473	+	/* On solaris 7, this will fail if you are not root. But, everything
474	+	* will still work, just no disk mappings. So we will ignore the exit
475	+	* status of this, and carry on merrily.
476	+	*/
477	+	#ifdef HAVE_LIBDEVINFO_H
478		build_mapping();
479		#endif
480	+	#endif
481		return 0;
482		}
483	+
484	+	int statgrab_drop_privileges() {
485	+	if (setegid(getgid()) != 0) return -1;
486	+	if (seteuid(getuid()) != 0) return -1;
487	+	return 0;
488	+	}
489	+

Diff Legend

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