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

rc.c: remove PATH_MAX references

Browse Source
This commit is contained in:
William Hubbs 2018-02-21 13:49:41 -06:00
parent c1178c8eeb
commit a6cc7f06cf
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rc/rc.c
View File

@ -336,26 +336,26 @@ set_krunlevel(const char *level)
return true; return true;
} }
static size_t static char *get_krunlevel(void)
get_krunlevel(char *buffer, int buffer_len)
{ {
char *buffer = NULL;
FILE *fp; FILE *fp;
size_t i = 0; size_t i = 0;
if (!exists(RC_KRUNLEVEL)) if (!exists(RC_KRUNLEVEL))
return 0; return NULL;
if (!(fp = fopen(RC_KRUNLEVEL, "r"))) { if (!(fp = fopen(RC_KRUNLEVEL, "r"))) {
eerror("fopen `%s': %s", RC_KRUNLEVEL, strerror(errno)); eerror("fopen `%s': %s", RC_KRUNLEVEL, strerror(errno));
return 0; return NULL;
} }
if (fgets(buffer, buffer_len, fp)) { if (getline(&buffer, &i, fp) != -1) {
i = strlen(buffer); i = strlen(buffer);
if (buffer[i - 1] == '\n') if (buffer[i - 1] == '\n')
buffer[i - 1] = 0; buffer[i - 1] = 0;
} }
fclose(fp); fclose(fp);
return i; return buffer;
} }
static void static void
@ -743,7 +743,7 @@ int main(int argc, char **argv)
RC_STRING *service; RC_STRING *service;
bool going_down = false; bool going_down = false;
int depoptions = RC_DEP_STRICT | RC_DEP_TRACE; int depoptions = RC_DEP_STRICT | RC_DEP_TRACE;
char krunlevel [PATH_MAX]; char *krunlevel = NULL;
char pidstr[10]; char pidstr[10];
int opt; int opt;
bool parallel; bool parallel;
@ -892,7 +892,8 @@ int main(int argc, char **argv)
(strcmp(newlevel, RC_LEVEL_SYSINIT) != 0 && (strcmp(newlevel, RC_LEVEL_SYSINIT) != 0 &&
strcmp(newlevel, getenv("RC_BOOTLEVEL")) != 0)) strcmp(newlevel, getenv("RC_BOOTLEVEL")) != 0))
{ {
if (get_krunlevel(krunlevel, sizeof(krunlevel))) { krunlevel = get_krunlevel();
if (krunlevel) {
newlevel = krunlevel; newlevel = krunlevel;
set_krunlevel(NULL); set_krunlevel(NULL);
} }