Index: uspace/lib/libc/generic/getopt.c
===================================================================
--- uspace/lib/libc/generic/getopt.c	(revision 732bb0c5e68395d4846d2c55a85a66056a5cb76e)
+++ uspace/lib/libc/generic/getopt.c	(revision bb8dc88639470220e0add4e32e5680c52c76a207)
@@ -48,5 +48,5 @@
 int	optopt = '?';		/* character checked for validity */
 int	optreset;		/* reset getopt */
-char *optarg;		/* argument associated with option */
+const char *optarg;		/* argument associated with option */
 
 
@@ -163,5 +163,5 @@
 	const char *options;
 {
-	char *oli;				/* option letter list index */
+	const char *oli;				/* option letter list index */
 	int optchar;
 
@@ -276,5 +276,5 @@
 		optarg = NULL;
 		if (*place)			/* no white space */
-			optarg = *place;
+			optarg = place;
 		/* XXX: disable test for :: if PC? (GNU doesn't) */
 		else if (oli[1] != ':') {	/* arg not optional */
@@ -354,5 +354,6 @@
 	retval = getopt_internal(nargc, (char **)nargv, options);
 	if (retval == -2) {
-		char *current_argv, *has_equal;
+		char *current_argv;
+		const char *has_equal;
 		size_t current_argv_len;
 		int i, ambiguous, match;