Add --no-ldconfig option to env-update to match portage.

ChangeLog

@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+  27 Jun 2007; Roy Marples <uberlord@gentoo.org>:
+
+    Add --no-ldconfig option to env-update to match portage.
+
   26 Jun 2007; Roy Marples <uberlord@gentoo.org>:
 
     --nocolor works again, #181011 thanks to Daniel Drake.

src/env-update.c

@@ -8,7 +8,10 @@
 
 */
 
+#define APPLET "env-update"
+
 #include <errno.h>
+#include <getopt.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -58,6 +61,14 @@ static const char *space_separated[] = {
 
 static char *applet = NULL;
 
+#define getoptstring "hL"
+static struct option longopts[] = {
+	{ "help",           0, NULL, 'h'},
+	{ "no-ldconfig",    0, NULL, 'L'},
+	{ NULL,             0, NULL, 0}
+};
+#include "_usage.c"
+
 int main (int argc, char **argv)
 {
 	char **files = rc_ls_dir (NULL, ENVDIR, 0);
@@ -75,9 +86,24 @@ int main (int argc, char **argv)
 	char *entry;
 	char **mycolons = NULL;
 	char **myspaces = NULL;
+	int opt;
+	bool ldconfig = true;
 	
 	applet = argv[0];
 
+	while ((opt = getopt_long (argc, argv, getoptstring,
+							   longopts, (int *) 0)) != -1)
+	{
+		switch (opt) {
+			case 'L':
+				ldconfig = false;
+				break;
+			case 'h':
+				usage (EXIT_SUCCESS);
+			default:
+				usage (EXIT_FAILURE);
+		}
+	}
 	if (! files)
 		eerrorx ("%s: no files in " ENVDIR " to process", applet);
 
@@ -230,6 +256,7 @@ int main (int argc, char **argv)
 		nents++;
 	}
 
+	if (ldconfig) {
 		/* Update ld.so.conf only if different */
 		if (rc_exists (LDSOCONF)) {
 			char **lines = rc_get_list (NULL, LDSOCONF);
@@ -250,7 +277,8 @@ int main (int argc, char **argv)
 			int retval = 0;
 
 			if ((fp = fopen (LDSOCONF, "w")) == NULL)
-			eerrorx ("%s: fopen `%s': %s", applet, LDSOCONF, strerror (errno));
+				eerrorx ("%s: fopen `%s': %s", applet, LDSOCONF,
+						 strerror (errno));
 			fprintf (fp, LDNOTICE);
 			STRLIST_FOREACH (ldents, ldent, i)
 				fprintf (fp, "%s\n", ldent);
@@ -265,6 +293,7 @@ int main (int argc, char **argv)
 #endif
 			eend (retval, NULL);
 		}
+	}
 
 	rc_strlist_free (ldents);
 	rc_strlist_free (envs);