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

rc-misc.c: remove references to PATH_MAX

Browse Source
This commit is contained in:
William Hubbs 2018-02-20 14:22:29 -06:00
parent 8dbdabcc5e
commit 8e02406d8f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,8 @@ env_config(void)
char *npp; char *npp;
char *tok; char *tok;
const char *sys = rc_sys(); const char *sys = rc_sys();
char buffer[PATH_MAX]; char *buffer = NULL;
size_t size = 0;
/* Ensure our PATH is prefixed with the system locations first /* Ensure our PATH is prefixed with the system locations first
for a little extra security */ for a little extra security */
@ -170,8 +171,7 @@ env_config(void)
free(e); free(e);
if ((fp = fopen(RC_KRUNLEVEL, "r"))) { if ((fp = fopen(RC_KRUNLEVEL, "r"))) {
memset(buffer, 0, sizeof (buffer)); if (getline(&buffer, &size, fp) != -1) {
if (fgets(buffer, sizeof (buffer), fp)) {
l = strlen (buffer) - 1; l = strlen (buffer) - 1;
if (buffer[l] == '\n') if (buffer[l] == '\n')
buffer[l] = 0; buffer[l] = 0;
@ -181,6 +181,7 @@ env_config(void)
} else } else
setenv("RC_DEFAULTLEVEL", RC_LEVEL_DEFAULT, 1); setenv("RC_DEFAULTLEVEL", RC_LEVEL_DEFAULT, 1);
free(buffer);
if (sys) if (sys)
setenv("RC_SYS", sys, 1); setenv("RC_SYS", sys, 1);
@ -232,11 +233,12 @@ signal_setup_restart(int sig, void (*handler)(int))
int int
svc_lock(const char *applet) svc_lock(const char *applet)
{ {
char file[PATH_MAX]; char *file = NULL;
int fd; int fd;
snprintf(file, sizeof(file), RC_SVCDIR "/exclusive/%s", applet); xasprintf(&file, RC_SVCDIR "/exclusive/%s", applet);
fd = open(file, O_WRONLY | O_CREAT | O_NONBLOCK, 0664); fd = open(file, O_WRONLY | O_CREAT | O_NONBLOCK, 0664);
free(file);
if (fd == -1) if (fd == -1)
return -1; return -1;
if (flock(fd, LOCK_EX | LOCK_NB) == -1) { if (flock(fd, LOCK_EX | LOCK_NB) == -1) {
@ -250,11 +252,12 @@ svc_lock(const char *applet)
int int
svc_unlock(const char *applet, int fd) svc_unlock(const char *applet, int fd)
{ {
char file[PATH_MAX]; char *file = NULL;
snprintf(file, sizeof(file), RC_SVCDIR "/exclusive/%s", applet); xasprintf(&file, RC_SVCDIR "/exclusive/%s", applet);
close(fd); close(fd);
unlink(file); unlink(file);
free(file);
return -1; return -1;
} }
@ -358,7 +361,7 @@ RC_DEPTREE * _rc_deptree_load(int force, int *regen)
int serrno = errno; int serrno = errno;
int merrno; int merrno;
time_t t; time_t t;
char file[PATH_MAX]; char *file = NULL;
struct stat st; struct stat st;
struct utimbuf ut; struct utimbuf ut;
FILE *fp; FILE *fp;