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.24 by tdb, Mon Jan 19 16:49:21 2004 UTC vs.
Revision 1.27 by pajs, Tue Feb 10 16:23:07 2004 UTC

#	Line 42 | Line 42
42		#include "tools.h"
43
44		#ifdef SOLARIS
45	+	#ifdef HAVE_LIBDEVINFO_H
46		#include <libdevinfo.h>
47	+	#endif
48		#include <kstat.h>
49		#include <unistd.h>
50		#include <ctype.h>
#	Line 54 | Line 56
56		#include <dirent.h>
57		#endif
58
59	<	#ifdef SOLARIS
59	>	#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
60		struct map{
61		char *bsd;
62		char *svr;
#	Line 64 | Line 66 | struct map{
66		typedef struct map mapping_t;
67
68		static mapping_t *mapping = NULL;
69	+	#endif
70
71	+	#ifdef SOLARIS
72		char *get_svr_from_bsd(char *bsd){
73	+	#ifdef HAVE_LIBDEVINFO_H
74		mapping_t *map_ptr;
75		for(map_ptr = mapping; map_ptr != NULL; map_ptr = map_ptr->next)
76		if(!strcmp(map_ptr->bsd, bsd)) return map_ptr->svr;
77	<
77	>	#endif
78		return bsd;
79		}
80	+	#endif
81
82	+	#if defined(SOLARIS) && defined(HAVE_LIBDEVINFO_H)
83		void add_mapping(char *bsd, char *svr){
84		mapping_t *map_ptr;
85		mapping_t *map_end_ptr;
#	Line 469 | Line 476 | int statgrab_init(){
476		* will still work, just no disk mappings. So we will ignore the exit
477		* status of this, and carry on merrily.
478		*/
479	+	#ifdef HAVE_LIBDEVINFO_H
480		build_mapping();
481	+	#endif
482		#endif
483		return 0;
484		}

Diff Legend

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