emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile on Linux.

Browse Source
This commit is contained in:
Roy Marples 2008-02-19 15:51:59 +00:00
parent e1e36b2872
commit 79d40707db
2 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/librc/librc.c
View File

@ -147,6 +147,43 @@ static bool rm_dir (const char *pathname, bool top)
return (true); return (true);
} }
/* Other systems may need this at some point, but for now it's Linux only */
#ifdef __linux__
static bool file_regex (const char *file, const char *regex)
{
FILE *fp;
char *line;
regex_t re;
bool retval = false;
int result;
if (! (fp = fopen (file, "r")))
return (false);
if ((result = regcomp (&re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
fclose (fp);
line = xmalloc (sizeof (char) * BUFSIZ);
regerror (result, &re, line, BUFSIZ);
fprintf (stderr, "file_regex: %s", line);
free (line);
return (false);
}
while ((line = rc_getline (fp))) {
if (regexec (&re, line, 0, NULL, 0) == 0)
retval = true;
free (line);
if (retval)
break;
}
fclose (fp);
regfree (&re);
return (retval);
}
#endif
const char *rc_sys (void) const char *rc_sys (void)
{ {
#ifdef __FreeBSD__ #ifdef __FreeBSD__
@ -160,13 +197,9 @@ const char *rc_sys (void)
#ifdef __linux__ #ifdef __linux__
if (exists ("/proc/xen")) { if (exists ("/proc/xen")) {
if ((fp = fopen ("/proc/xen/capabilities", "r"))) { if (file_regex ("/proc/xen/capabilities", "control_d"))
fclose (fp); return (RC_SYS_XEN0);
if (file_regex ("/proc/xen/capabilities", "control_d")) return (RC_SYS_XENU);
return (RC_SYS_XEN0);
}
if (! sys[0])
return (RC_SYS_XENU);
} else if (file_regex ("/proc/cpuinfo", "UML")) } else if (file_regex ("/proc/cpuinfo", "UML"))
return (RC_SYS_UML); return (RC_SYS_UML);
else if (file_regex ("/proc/self/status", else if (file_regex ("/proc/self/status",

36
src/rc/rc-misc.c
View File

@ -235,42 +235,6 @@ char **env_filter (void)
return (env); return (env);
} }
/* Other systems may need this at some point, but for now it's Linux only */
#ifdef __linux__
static bool file_regex (const char *file, const char *regex)
{
FILE *fp;
char *line;
regex_t re;
bool retval = false;
int result;
if (! (fp = fopen (file, "r")))
return (false);
if ((result = regcomp (&re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
fclose (fp);
line = xmalloc (sizeof (char) * BUFSIZ);
regerror (result, &re, line, BUFSIZ);
fprintf (stderr, "file_regex: %s", line);
free (line);
return (false);
}
while ((line = rc_getline (fp))) {
if (regexec (&re, line, 0, NULL, 0) == 0)
retval = true;
free (line);
if (retval)
break;
}
fclose (fp);
regfree (&re);
return (retval);
}
#endif
char **env_config (void) char **env_config (void)
{ {
char **env = NULL; char **env = NULL;