/[baselayout]/trunk/src/env-update.c
Gentoo

Diff of /trunk/src/env-update.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 2979 Revision 2980
141 *(file + 1) >= '0' && 141 *(file + 1) >= '0' &&
142 *(file + 1) <= '9' && 142 *(file + 1) <= '9' &&
143 *(file + j - 1) != '~' && 143 *(file + j - 1) != '~' &&
144 (j < 4 || strcmp (file + j - 4, ".bak") != 0) && 144 (j < 4 || strcmp (file + j - 4, ".bak") != 0) &&
145 (j < 5 || strcmp (file + j - 5, ".core") != 0)) 145 (j < 5 || strcmp (file + j - 5, ".core") != 0))
146 entries = rc_get_config (path); 146 entries = rc_config_load (path);
147 free (path); 147 free (path);
148 148
149 STRLIST_FOREACH (entries, entry, j) { 149 STRLIST_FOREACH (entries, entry, j) {
150 char *tmpent = rc_xstrdup (entry); 150 char *tmpent = rc_xstrdup (entry);
151 char *value = tmpent; 151 char *value = tmpent;
276 } 276 }
277 free (tmpent); 277 free (tmpent);
278 } 278 }
279 fclose (fp); 279 fclose (fp);
280 280
281 ldent = rc_get_config_entry (envs, "LDPATH"); 281 ldent = rc_config_value (envs, "LDPATH");
282 282
283 if (! ldent || 283 if (! ldent ||
284 (argc > 1 && argv[1] && strcmp (argv[1], "--no-ldconfig") == 0)) 284 (argc > 1 && argv[1] && strcmp (argv[1], "--no-ldconfig") == 0))
285 { 285 {
286 rc_strlist_free (envs); 286 rc_strlist_free (envs);
296 } 296 }
297 297
298 if (ldconfig) { 298 if (ldconfig) {
299 /* Update ld.so.conf only if different */ 299 /* Update ld.so.conf only if different */
300 if (rc_exists (LDSOCONF)) { 300 if (rc_exists (LDSOCONF)) {
301 char **lines = rc_get_list (LDSOCONF); 301 char **lines = rc_config_list (LDSOCONF);
302 char *line; 302 char *line;
303 ld = false; 303 ld = false;
304 304
305 STRLIST_FOREACH (lines, line, i) 305 STRLIST_FOREACH (lines, line, i)
306 if (i > nents || strcmp (line, ldents[i - 1]) != 0) 306 if (i > nents || strcmp (line, ldents[i - 1]) != 0)

Legend:
Removed from v.2979  
changed lines
  Added in v.2980

  ViewVC Help
Powered by ViewVC 1.1.20