proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-27 07:24:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reworked not to require stmt-after-decl support, plus another to fix a

Browse Source 
bug that would arise when parsing more than 128 paths.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1879 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2009-03-20 00:01:18 +00:00
parent d038f4c148
commit 03a951e5e4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcr/lcr_ifact.c
View File

@ -167,7 +167,8 @@ static inline int lcr_lib_loaded (
return (0);
}
const char *path_list[128];
enum { PATH_LIST_SIZE = 128 };
const char *path_list[PATH_LIST_SIZE];
unsigned int path_list_entries = 0;
static void defaults_path_build (void)
@ -200,8 +201,9 @@ static void ld_library_path_build (void)
p_s = strtok_r (my_ld_library_path, ":", &ptrptr);
while (p_s != NULL) {
path_list[path_list_entries++] = strdup (p_s);
p_s = strtok_r (NULL, ":", &ptrptr);
if (p_s && path_list_entries < PATH_LIST_SIZE) {
path_list[path_list_entries++] = p_s;
}
}
free (my_ld_library_path);
@ -243,6 +245,7 @@ static int ldso_path_build (const char *path, const char *filename)
}
while (fgets (string, sizeof (string), fp)) {
char *p;
if (strlen(string) > 0)
string[strlen(string) - 1] = '\0';
if (strncmp (string, "include", strlen ("include")) == 0) {
@ -261,7 +264,9 @@ static int ldso_path_build (const char *path, const char *filename)
ldso_path_build (newpath, new_filename);
continue;
}
path_list[path_list_entries++] = strdup (string);
p = strdup (string);
if (p && path_list_entries < PATH_LIST_SIZE)
path_list[path_list_entries++] = p;
}
fclose(fp);
#endif