Attachment #275696 for bug #394312

View | Details | Raw Unified | Return to bug 394312
Collapse All | Expand All

Lines 192-198 Link Here

(-)orig//meminfo.c (-1 / +4 lines)
192	available[MEM_FREE]=available[MEM_USED]=1;	192	available[MEM_FREE]=available[MEM_USED]=1;
193	else	193	else
194	fprintf(stderr,"ProcMeter(%s): Expected 'MemTotal' line in '/proc/meminfo'.\n",__FILE__);	194	fprintf(stderr,"ProcMeter(%s): Expected 'MemTotal' line in '/proc/meminfo'.\n",__FILE__);
195	fgets(line,80,f); /* MemShared */	195	// fgets(line,80,f); /* MemShared */
196	if(fgets(line,80,f) && sscanf(line,"Buffers: %llu",&mem_buff)==1)	196	if(fgets(line,80,f) && sscanf(line,"Buffers: %llu",&mem_buff)==1)
197	available[MEM_BUFF]=1;	197	available[MEM_BUFF]=1;
198	else	198	else
Lines 201-206 Link Here
201	available[MEM_CACHE]=1;	201	available[MEM_CACHE]=1;
202	else	202	else
203	fprintf(stderr,"ProcMeter(%s): Expected 'Cached' line in '/proc/meminfo'.\n",__FILE__);	203	fprintf(stderr,"ProcMeter(%s): Expected 'Cached' line in '/proc/meminfo'.\n",__FILE__);
		204	fgets(line,80,f); /* SwapCached */
		205	fgets(line,80,f); /* Active */
		206	fgets(line,80,f); /* Inactive */
204	if(fgets(line,80,f) && sscanf(line,"SwapTotal: %llu",&swap_tot)==1 &&	207	if(fgets(line,80,f) && sscanf(line,"SwapTotal: %llu",&swap_tot)==1 &&
205	fgets(line,80,f) && sscanf(line,"SwapFree: %llu",&swap_free)==1)	208	fgets(line,80,f) && sscanf(line,"SwapFree: %llu",&swap_free)==1)
206	available[SWAP_FREE]=available[SWAP_USED]=1;	209	available[SWAP_FREE]=available[SWAP_USED]=1;

Lines 33-39 Link Here

(-)orig//stat-disk.c (-2 / +2 lines)
33	#define N_OUTPUTS 3	33	#define N_OUTPUTS 3
34		34
35	/+ The length of the buffer for reading in lines. +/	35	/+ The length of the buffer for reading in lines. +/
36	#define BUFFLEN 2048	36	#define BUFFLEN 2048*10
37		37
38	/* The interface information. */	38	/* The interface information. */
39		39
Lines 222-228 Link Here
222	fprintf(stderr,"ProcMeter(%s): Could not open '/proc/stat'.\n",__FILE__);	222	fprintf(stderr,"ProcMeter(%s): Could not open '/proc/stat'.\n",__FILE__);
223	else	223	else
224	{	224	{
225	l=fgets(line,256,f); /* cpu */	225	l=fgets(line,BUFFLEN,f); /* cpu */
226	if(!l)	226	if(!l)
227	fprintf(stderr,"ProcMeter(%s): Could not read '/proc/stat'.\n",__FILE__);	227	fprintf(stderr,"ProcMeter(%s): Could not read '/proc/stat'.\n",__FILE__);
228	else	228	else

Lines 39-45 Link Here

(-)orig//stat.c (-1 / +1 lines)
39	#define N_OUTPUTS 16	39	#define N_OUTPUTS 16
40		40
41	/+ The length of the buffer for reading in lines. +/	41	/+ The length of the buffer for reading in lines. +/
42	#define BUFFLEN 2048	42	#define BUFFLEN 2048*10
43		43
44	/* The interface information. */	44	/* The interface information. */
45		45




    if(!fgets(line,256,f))
       fprintf(stderr,"ProcMeter(%s): Could not read '/proc/net/wireless'.\n",__FILE__);
    else
       if(strcmp(line,"Inter-| sta-|   Quality        |   Discarded packets               | Missed | WE\n"))
          fprintf(stderr,"ProcMeter(%s): Unexpected header line 1 in '/proc/net/wireless'.\n",__FILE__);
       else
         {
          fgets(line,256,f);
          if(strcmp(line," face | tus | link level noise |  nwid  crypt   frag  retry   misc | beacon | 22\n"))
             fprintf(stderr,"ProcMeter(%s): Unexpected header line 2 in '/proc/net/wireless'.\n",__FILE__);
          else
            {

Return to bug 394312

Lines 120-131 Link Here

(-)orig//wireless.c (-2 / +2 lines)
120	if(!fgets(line,256,f))	120	if(!fgets(line,256,f))
121	fprintf(stderr,"ProcMeter(%s): Could not read '/proc/net/wireless'.\n",__FILE__);	121	fprintf(stderr,"ProcMeter(%s): Could not read '/proc/net/wireless'.\n",__FILE__);
122	else	122	else
123	if(strcmp(line,"Inter-\| sta-\| Quality \| Discarded packets \| Missed\n"))	123	if(strcmp(line,"Inter-\| sta-\| Quality \| Discarded packets \| Missed \| WE\n"))
124	fprintf(stderr,"ProcMeter(%s): Unexpected header line 1 in '/proc/net/wireless'.\n",__FILE__);	124	fprintf(stderr,"ProcMeter(%s): Unexpected header line 1 in '/proc/net/wireless'.\n",__FILE__);
125	else	125	else
126	{	126	{
127	fgets(line,256,f);	127	fgets(line,256,f);
128	if(strcmp(line," face \| tus \| link level noise \| nwid crypt frag retry misc \| beacon\n"))	128	if(strcmp(line," face \| tus \| link level noise \| nwid crypt frag retry misc \| beacon \| 22\n"))
129	fprintf(stderr,"ProcMeter(%s): Unexpected header line 2 in '/proc/net/wireless'.\n",__FILE__);	129	fprintf(stderr,"ProcMeter(%s): Unexpected header line 2 in '/proc/net/wireless'.\n",__FILE__);
130	else	130	else
131	{	131	{