uptime: Port to OpenBSD.
In OpenBSD uptime gets fetched using sysctl now.
This commit is contained in:
		
							
								
								
									
										1
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								README
									
									
									
									
									
								
							@@ -62,7 +62,6 @@ Todo
 | 
				
			|||||||
Porting to OpenBSD is the current goal before thinking about a release.
 | 
					Porting to OpenBSD is the current goal before thinking about a release.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The following functions are not portable at the moment:
 | 
					The following functions are not portable at the moment:
 | 
				
			||||||
- uptime
 | 
					 | 
				
			||||||
- ipv{4,6}
 | 
					- ipv{4,6}
 | 
				
			||||||
- ram_{free,perc,total,used}
 | 
					- ram_{free,perc,total,used}
 | 
				
			||||||
- wifi_{perc,essid}
 | 
					- wifi_{perc,essid}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,20 +1,45 @@
 | 
				
			|||||||
/* See LICENSE file for copyright and license details. */
 | 
					/* See LICENSE file for copyright and license details. */
 | 
				
			||||||
 | 
					#include <stdio.h>
 | 
				
			||||||
#ifdef __linux__
 | 
					#ifdef __linux__
 | 
				
			||||||
#include <sys/sysinfo.h>
 | 
					#include <sys/sysinfo.h>
 | 
				
			||||||
 | 
					#elif __OpenBSD__
 | 
				
			||||||
 | 
					#include <sys/sysctl.h>
 | 
				
			||||||
 | 
					#include <sys/time.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "../util.h"
 | 
					#include "../util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const char *
 | 
					const char *
 | 
				
			||||||
uptime(void)
 | 
					uptime(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
						int h;
 | 
				
			||||||
 | 
						int m;
 | 
				
			||||||
 | 
						int uptime = 0;
 | 
				
			||||||
 | 
					#ifdef __linux__
 | 
				
			||||||
	struct sysinfo info;
 | 
						struct sysinfo info;
 | 
				
			||||||
	int h = 0;
 | 
					 | 
				
			||||||
	int m = 0;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sysinfo(&info);
 | 
						sysinfo(&info);
 | 
				
			||||||
	h = info.uptime / 3600;
 | 
						uptime = info.uptime;
 | 
				
			||||||
	m = (info.uptime - h * 3600 ) / 60;
 | 
					#elif __OpenBSD__
 | 
				
			||||||
 | 
						int mib[2];
 | 
				
			||||||
 | 
						size_t size;
 | 
				
			||||||
 | 
						time_t now;
 | 
				
			||||||
 | 
						struct timeval boottime;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						time(&now);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						mib[0] = CTL_KERN;
 | 
				
			||||||
 | 
						mib[1] = KERN_BOOTTIME;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						size = sizeof(boottime);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
 | 
				
			||||||
 | 
							uptime = now - boottime.tv_sec;
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
 | 
							return NULL;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
						h = uptime / 3600;
 | 
				
			||||||
 | 
						m = (uptime - h * 3600) / 60;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return bprintf("%dh %dm", h, m);
 | 
						return bprintf("%dh %dm", h, m);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user